From d72521fd639e21d42f75dcfdaf16f1a421b3d714 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Mon, 10 Oct 2011 07:37:45 +0200 Subject: [PATCH] drop libjs-mootools * debian/control: - drop libjs-mootools from depends, it's not needed anymore. --- debian/changelog | 2 + debian/control | 2 +- debian/patches/0001-Fix-for-Bug-819688.patch | 42 -------------------- 3 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 debian/patches/0001-Fix-for-Bug-819688.patch diff --git a/debian/changelog b/debian/changelog index e483f2d0..44243cb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ midori (0.4.1-1) UNRELEASED; urgency=low * New upstream release. * debian/patches: - 0001-Fix-for-Bug-819688 dropped, included upstream. + * debian/control: + - drop libjs-mootools from depends, it's not needed anymore. -- Yves-Alexis Perez Mon, 10 Oct 2011 07:33:54 +0200 diff --git a/debian/control b/debian/control index 43f564f4..fb99087d 100644 --- a/debian/control +++ b/debian/control @@ -38,7 +38,7 @@ Vcs-Browser: http://git.debian.org/?p=collab-maint/midori.git;a=summary Package: midori Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11, libjs-mootools +Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11 Recommends: gnome-icon-theme Provides: www-browser # For http://bugs.debian.org/522436 (missing symbols): diff --git a/debian/patches/0001-Fix-for-Bug-819688.patch b/debian/patches/0001-Fix-for-Bug-819688.patch deleted file mode 100644 index ba929128..00000000 --- a/debian/patches/0001-Fix-for-Bug-819688.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b81370bd81f782836bbabdcca4cf7cb219ed53cf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20St=C3=B6sel?= -Date: Mon, 5 Sep 2011 18:02:42 +0200 -Subject: [PATCH] Fix for Bug #819688 - ---- - midori/midori-panel.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/midori/midori-panel.c b/midori/midori-panel.c -index a7abc81..5d6dad0 100644 ---- a/midori/midori-panel.c -+++ b/midori/midori-panel.c -@@ -13,6 +13,8 @@ - - #include "midori-view.h" - -+#include "midori-browser.h" -+ - #include "marshal.h" - #include "sokoke.h" - -@@ -588,6 +590,7 @@ static void - midori_panel_viewable_destroy_cb (GtkWidget* viewable, - MidoriPanel* panel) - { -+ MidoriBrowser* browser = midori_browser_get_for_widget ( GTK_WIDGET (panel)); - gint n_pages; - gchar* action_name; - GtkAction* action; -@@ -601,7 +604,7 @@ midori_panel_viewable_destroy_cb (GtkWidget* viewable, - viewable, midori_panel_viewable_destroy_cb, panel); - - n_pages = midori_panel_get_n_pages (panel); -- if (n_pages > 0) -+ if (n_pages > 0 && browser && !g_object_get_data (G_OBJECT (browser), "midori-browser-destroyed")) - midori_panel_set_current_page (panel, (n_pages-1 > i) ? i : n_pages - 1); - - action_name = g_strconcat ("PanelPage", --- -1.7.6.1 - -- 2.39.5