From c8c273404dddeb99c7f99cb82fd4aa9490c4ef4f Mon Sep 17 00:00:00 2001 From: Ryan Niebur Date: Thu, 24 Dec 2009 17:35:51 -0800 Subject: [PATCH] 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) --- debian/changelog | 6 +++++- debian/clean | 1 + debian/presubj | 5 ----- debian/presubj.in | 7 +++++++ debian/rules | 8 ++++++++ 5 files changed, 21 insertions(+), 6 deletions(-) delete mode 100644 debian/presubj create mode 100644 debian/presubj.in diff --git a/debian/changelog b/debian/changelog index dec3b2f6..62df1cfc 100644 --- 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 Thu, 24 Dec 2009 17:24:00 -0800 + -- Ryan Niebur 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 d95aab58..67257571 100644 --- 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 index a4e3e927..00000000 --- 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 index 00000000..a2eb2774 --- /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 5871b085..44ea79ee 100755 --- 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_ -- 2.39.5