Merge branch 'wip'

diff --cc debian/changelog
index 29296bf0804bb70759744edade10afab035ff31f,d89c2cfdae313a65487863728188e7a281a8545d..81fef4afd9ef5c827f7eb250af706924d9f625d0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,21 +1,32 @@@
+ midori (0.4.6-1) UNRELEASED; urgency=low
+ 
+   * New upstream release.
+   * Apply patch from Colin Watson to improve conffile handling, using new
+     debhelper features.                                         closes: #659773
+   * debian/control:
+     - update standards version to 3.9.3.
+     - update homepage address.
+   * debian/midori.maintscript:
+     - handle the /etc/xdg/midori/extensions/libadblock.so removal there.
+                                                                 closes: #660303
+   * debian/patches:
+     - force-ssl-cert-verification added, set ssl-strict to TRUE so connections
+       are not done if the ssl certificate can't be trusted.
+   * debian/compat bumped to 9.
+ 
+  -- Yves-Alexis Perez <corsac@debian.org>  Tue, 15 May 2012 23:31:12 +0200
+ 
 +midori (0.4.3+dfsg-0.1) unstable; urgency=low
 +
 +  * Non-maintainer upload
 +  * Repack to extract waf script (Closes: 645191)
 +  * debian/waf-unpack
 +    - add to describe how to extract waf script
 +  * debian/rules
 +    - add get-orig-source target
 +
 + -- Koichi Akabe <vbkaisetsu@gmail.com>  Sat, 24 Nov 2012 17:33:35 +0900
 +
  midori (0.4.3-1) unstable; urgency=low
  
    * New upstream release.

diff --cc debian/rules
index 86235e17127df40fdc41946f720a51fa18427b9a,1c82c045e069a969aa87167e6c849c1129d67cf3..259b7558f3ad4b94201f36a57862235d280ff441
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -23,23 -23,17 +23,32 @@@ endi
  %:
        dh $@
  
 -WAF=./waf
 +upstream_version ?= $(shell dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)(\+dfsg)?.*$$/\1/p')
 +dfsg_version = $(upstream_version)+dfsg
 +upstream_pkg = "midori"
 +pkg = $(shell dpkg-parsechangelog | sed -ne 's/^Source: //p')
 +
 +get-orig-source:
 +      uscan --rename --download-current-version --destdir=.
 +      tar -xjf $(pkg)_$(upstream_version).orig.tar.bz2
 +      rm -f $(pkg)_$(upstream_version).orig.tar.bz2
 +      mv $(upstream_pkg)-$(upstream_version) $(pkg)_$(dfsg_version).orig
 +      $(CURDIR)/debian/waf-unpack $(pkg)_$(dfsg_version).orig
 +      rm $(pkg)_$(dfsg_version).orig/waf
 +      tar -cjf $(CURDIR)/../$(pkg)_$(dfsg_version).orig.tar.bz2 $(pkg)_$(dfsg_version).orig
 +      rm -r $(pkg)_$(dfsg_version).orig
 +
 +WAF=WAFDIR=waf-modules ./waf-unpacked
  
+ #$(WAF): waf
+ #     # rebuild the waf script
+ #     sed < waf -e '1,/^#==>$$/ d' -e '/^#<==$$/ d' | tr -d '\n' | sed -e 's/.//' -e 's/#[*]/\n/g' -e 's/#%/\r/g' > waf.orig.tar.bz2
+ #     (sed -n < waf -e '1,/^#==>$$/ p'; echo REPLACED BY ENCODED TAR.BZ2; sed -n < waf -e '/^#<==$$/ p') > waf.hdr
+ #     (sed -n < waf.hdr -e '1,/^#==>$$/ p'; printf '#'; perl -pe < waf.orig.tar.bz2 's/\n/#*/g; s/\r/#%/g;'; echo; sed -n < waf.hdr  -e '/^#<==$$/ p') > waf.regen
+ #     chmod 755 waf.regen
+ #     # ensure both scripts are the same
+ #     cmp waf waf.regen && (rm waf.hdr waf.orig.tar.bz2)
+ 
  debian/presubj: debian/presubj.in
        @echo "presubj parameters:"
        @echo "Replacing %LIBWEBKIT_PKG% with $(LIBWEBKIT_PKG)"