diff --git a/debian/changelog b/debian/changelog index 30e4947d..f03ec4c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,14 @@ midori (0.5.2+dfsg-1) UNRELEASED; urgency=low -- Ryan Niebur Wed, 23 Oct 2013 21:04:40 -0700 +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 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 c2f31ab0..dd95e40e 100644 --- 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 index a2eb2774..00000000 --- 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 77f4eb63..bc57e275 100755 --- 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 "$$?")) @@ -49,18 +47,6 @@ WAF=WAFDIR=waf-modules ./waf-unpacked # # 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)" - @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: ! which quilt >/dev/null || ! test -d .pc || quilt pop -a rm -fr .pc