Import Debian patch 0.4.3+dfsg-0.2

This commit is contained in:
Andres Salomon 2015-06-27 20:26:39 -07:00
parent a9def3c602
commit ab72120436
4 changed files with 8 additions and 22 deletions

8
debian/changelog vendored
View file

@ -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 midori (0.4.3+dfsg-0.1) unstable; urgency=low
* Non-maintainer upload * Non-maintainer upload

View file

@ -1,2 +1 @@
debian/tmp/* debian/tmp/*
debian/presubj /usr/share/bug/midori/

7
debian/presubj.in vendored
View file

@ -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

14
debian/rules vendored
View file

@ -12,8 +12,6 @@ export DEB_BUILD_HARDENING=1
CMD=$(shell echo $@ | sed 's/override_//') 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) DISTRO=$(shell lsb_release -is)
CONFIG_FILE=debian/config/$(DISTRO).h CONFIG_FILE=debian/config/$(DISTRO).h
ifneq (0, $(shell test -e $(CONFIG_FILE); echo "$$?")) ifneq (0, $(shell test -e $(CONFIG_FILE); echo "$$?"))
@ -40,18 +38,6 @@ get-orig-source:
WAF=WAFDIR=waf-modules ./waf-unpacked 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: override_dh_auto_clean:
$(WAF) --nocache distclean $(WAF) --nocache distclean
rm -rf _build_ rm -rf _build_