Import Debian patch 0.4.3+dfsg-0.2

diff --git a/debian/changelog b/debian/changelog
index 29296bf0804bb70759744edade10afab035ff31f..b0180289d0986f104ba32443b3356d0b5f38ad3b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+midori (0.4.3+dfsg-0.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop debian/presubj.in as the webkit text browser
+    GtkLauncher is no longer packaged. (Closes: #759959)
+
+ -- Neil Williams <codehelp@debian.org>  Thu, 06 Nov 2014 14:04:07 +0000
+
 midori (0.4.3+dfsg-0.1) unstable; urgency=low
 
   * Non-maintainer upload

diff --git a/debian/midori.install b/debian/midori.install
index c2f31ab01a660af9637beaf8f6b5d24c069412e9..dd95e40e8caa1eb65804906fdc03e0b24b3a4b39 100644 (file)
--- a/debian/midori.install
+++ b/debian/midori.install
@@ -1,2 +1 @@
 debian/tmp/*
-debian/presubj /usr/share/bug/midori/

diff --git a/debian/presubj.in b/debian/presubj.in
deleted file mode 100644 (file)
index a2eb277..0000000
--- a/debian/presubj.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Sometimes a problem in Midori is caused by a bug in the rendering
-engine, Webkit.  Please take a moment to try to reproduce bugs with
-the Webkit test browser, %GTKLAUNCHER%.
-If you are able to reproduce your bug in the Webkit test browser,
-report the bug against %LIBWEBKIT_PKG% instead. You may also wish
-to see if your bug has already been reported as a webkit bug:
-http://bugs.debian.org/src:webkit

diff --git a/debian/rules b/debian/rules
index 86235e17127df40fdc41946f720a51fa18427b9a..15aba00d8ad702a18c329bd857a555ce0814779c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,6 @@ export DEB_BUILD_HARDENING=1
 
 CMD=$(shell echo $@ | sed 's/override_//')
 
-LIBWEBKIT_PKG=$(shell dpkg-query -p libwebkitgtk-dev | grep Depends | sed -r 's/.*(libwebkitgtk[^ ]+).*/\1/')
-GTKLAUNCHER=$(shell dpkg-query -L $(LIBWEBKIT_PKG) | grep GtkLauncher)
 DISTRO=$(shell lsb_release -is)
 CONFIG_FILE=debian/config/$(DISTRO).h
 ifneq (0, $(shell test -e $(CONFIG_FILE); echo "$$?"))
@@ -40,18 +38,6 @@ get-orig-source:
 
 WAF=WAFDIR=waf-modules ./waf-unpacked
 
-debian/presubj: debian/presubj.in
-       @echo "presubj parameters:"
-       @echo "Replacing %LIBWEBKIT_PKG% with $(LIBWEBKIT_PKG)"
-       @echo "Replacing %GTKLAUNCHER% with $(GTKLAUNCHER)"
-       test -f "/var/lib/dpkg/info/$(LIBWEBKIT_PKG).list"
-       test -f "$(GTKLAUNCHER)"
-       test -n "$(GTKLAUNCHER)"
-       sed -e "s,%LIBWEBKIT_PKG%,$(LIBWEBKIT_PKG),g" -e "s,%GTKLAUNCHER%,$(GTKLAUNCHER),g" $@.in > $@
-
-override_dh_install: debian/presubj
-       $(CMD) --fail-missing
-
 override_dh_auto_clean:
        $(WAF) --nocache distclean
        rm -rf _build_