[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#768458: unblock: midori/0.4.3+dfsg-0.2



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package midori

The version in unstable contains a single RC bug fix.

Closes: 759959
Changes:
 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)

debdiff against midori/0.4.3+dfsg-0.1 is attached. midori was
removed from testing due to bug #759959, so please unblock so
that jessie can have midori.

unblock midori/0.4.3+dfsg-0.2

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
armhf
arm64

Kernel: Linux 3.16-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_GB.UTF-8)
Shell: /bin/sh linked to /bin/dash
diffstat for midori-0.4.3+dfsg midori-0.4.3+dfsg

 changelog      |    8 ++++++++
 midori.install |    1 -
 presubj.in     |    7 -------
 rules          |   14 --------------
 4 files changed, 8 insertions(+), 22 deletions(-)

diff -Nru midori-0.4.3+dfsg/debian/changelog midori-0.4.3+dfsg/debian/changelog
--- midori-0.4.3+dfsg/debian/changelog	2012-11-24 08:34:26.000000000 +0000
+++ midori-0.4.3+dfsg/debian/changelog	2014-11-06 14:04:10.000000000 +0000
@@ -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 -Nru midori-0.4.3+dfsg/debian/midori.install midori-0.4.3+dfsg/debian/midori.install
--- midori-0.4.3+dfsg/debian/midori.install	2011-12-18 13:47:40.000000000 +0000
+++ midori-0.4.3+dfsg/debian/midori.install	2014-11-06 13:00:03.000000000 +0000
@@ -1,2 +1 @@
 debian/tmp/*
-debian/presubj /usr/share/bug/midori/
diff -Nru midori-0.4.3+dfsg/debian/presubj.in midori-0.4.3+dfsg/debian/presubj.in
--- midori-0.4.3+dfsg/debian/presubj.in	2011-12-18 13:47:40.000000000 +0000
+++ midori-0.4.3+dfsg/debian/presubj.in	1970-01-01 01:00:00.000000000 +0100
@@ -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 -Nru midori-0.4.3+dfsg/debian/rules midori-0.4.3+dfsg/debian/rules
--- midori-0.4.3+dfsg/debian/rules	2012-11-24 00:45:06.000000000 +0000
+++ midori-0.4.3+dfsg/debian/rules	2014-11-06 12:59:10.000000000 +0000
@@ -12,8 +12,6 @@
 
 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 @@
 
 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_

Reply to: