tell the user to report the bug against libwebkit-1.0-2 if they reproduce it in the...

diff --git a/debian/changelog b/debian/changelog
index dec3b2f61b5c5d25ee4343863b9d4086c5efa1c3..62df1cfc80370a2f26ae5e83d9bf6ebbe5f5a8e9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,12 @@ midori (0.2.2-1) UNRELEASED; urgency=low
     - Ctrl-u in urlbar with emacs key binding theme works (Closes: #538327)
   * move libjs-mootools to Recommends, it's not required (Closes:
     #547584)
+  * tell the user to report the bug against libwebkit-1.0-2 if they
+    reproduce it in the Webkit test browser. Figure out the package name
+    and the path to GtkLauncher automagically during build. (Closes:
+    #562501)
 
- -- Ryan Niebur <ryan@debian.org>  Thu, 24 Dec 2009 17:24:00 -0800
+ -- Ryan Niebur <ryan@debian.org>  Thu, 24 Dec 2009 17:35:45 -0800
 
 midori (0.2.0-1) unstable; urgency=low
 

diff --git a/debian/clean b/debian/clean
index d95aab58d3c46be5aacde42a398142d11b16948a..672575712a84f5a6ec3a298de648d36e0853e2ea 100644 (file)
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1,3 @@
 midori/midori-debian.h
 debian/midori.postinst
+debian/presubj

diff --git a/debian/presubj b/debian/presubj
deleted file mode 100644 (file)
index a4e3e92..0000000
--- a/debian/presubj
+++ /dev/null
@@ -1,5 +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, /usr/lib/webkit-1.0/libexec/GtkLauncher.
-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/presubj.in b/debian/presubj.in
new file mode 100644 (file)
index 0000000..a2eb277
--- /dev/null
+++ b/debian/presubj.in
@@ -0,0 +1,7 @@
+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 5871b0853792bf0d2df4d800b7a8617238ce9079..44ea79ee2ea4a126dac6cfec3d38f0b0f0289ec7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
 
 CMD=$(shell echo $@ | sed 's/override_//')
 
+LIBWEBKIT_PKG=$(shell dpkg-query -p libwebkit-dev | grep Depends | sed -r 's/.*(libwebkit[^ ]+).*/\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 "$$?"))
@@ -19,6 +21,12 @@ override_dh_quilt_patch:
 #WAF=/usr/bin/waf
 WAF=./waf
 
+debian/presubj: debian/presubj.in
+       sed -e "s,%LIBWEBKIT_PKG%,$(LIBWEBKIT_PKG),g" -e "s,%GTKLAUNCHER%,$(GTKLAUNCHER),g" $@.in > $@
+
+override_dh_install: debian/presubj
+       $(CMD)
+
 override_dh_auto_clean:
        $(WAF) --nocache distclean
        rm -rf _build_