* Non-maintainer upload.

* debian/patches:
  - 0001-Only-no-adblock-if-main-frame-in-provisional-state added, fix
    adblock extension.                                        closes: #611682
* debian/rules:
  - remove .lock-script in clean target.

diff --git a/debian/changelog b/debian/changelog
index 6dfd55a6bc325fbd41e7abdf19b119ce56168a1e..76578e02a4b7eda3bee02c10024b797e03c2d1b1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+midori (0.3.0-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches:
+    - 0001-Only-no-adblock-if-main-frame-in-provisional-state added, fix
+      adblock extension.                                        closes: #611682
+  * debian/rules:
+    - remove .lock-script in clean target.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Wed, 02 Feb 2011 10:14:47 +0100
+
 midori (0.3.0-1.1) unstable; urgency=low
 
   * Non-maintainer upload.

diff --git a/debian/patches/0001-Only-no-adblock-if-main-frame-in-provisional-state.patch b/debian/patches/0001-Only-no-adblock-if-main-frame-in-provisional-state.patch
new file mode 100644 (file)
index 0000000..f1cafcc
--- /dev/null
+++ b/debian/patches/0001-Only-no-adblock-if-main-frame-in-provisional-state.patch
@@ -0,0 +1,26 @@
+From 90e11d3713f68fece0b28cc2a1bda3dde8aa3303 Mon Sep 17 00:00:00 2001
+From: Christian Dywan <christian@twotoasts.de>
+Date: Tue, 1 Feb 2011 01:52:39 +0100
+Subject: [PATCH] Only no adblock if main frame in provisional state
+
+---
+ extensions/adblock.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/extensions/adblock.c b/extensions/adblock.c
+index 6ae7adc..ff08b67 100644
+--- a/extensions/adblock.c
++++ b/extensions/adblock.c
+@@ -753,7 +753,8 @@ adblock_resource_request_starting_cb (WebKitWebView*         web_view,
+     const char *page_uri;
+ 
+     /* Never filter the main page itself */
+-    if (web_frame == webkit_web_view_get_main_frame (web_view))
++    if (web_frame == webkit_web_view_get_main_frame (web_view)
++     && webkit_web_frame_get_load_status (web_frame) == WEBKIT_LOAD_PROVISIONAL)
+         return;
+ 
+     req_uri = webkit_network_request_get_uri (request);
+-- 
+1.7.2.3
+

diff --git a/debian/patches/series b/debian/patches/series
index 5367257f30a59fcc1e88dd37ed150700a839a778..aaca60cdcd3cd7a8e4ed071a3480bad1c8d72f97 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 add-debian-searches
+0001-Only-no-adblock-if-main-frame-in-provisional-state.patch

diff --git a/debian/rules b/debian/rules
index f1baac3d5faddda32236e8c0198dc83199a692b5..e4f9c03965ef4429f60d20b528e579057487c2dc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,7 @@ override_dh_auto_clean:
        $(WAF) --nocache distclean
        rm -rf _build_
        rm -rf .waf*
+       rm -rf .lock-wscript
 
 override_dh_auto_configure:
        $(WAF) --nocache configure --prefix /usr