From: Andres Salomon <dilinger@debian.org>
Date: Sun, 28 Jun 2015 03:52:24 +0000 (-0700)
Subject: Merge branch 'nmu-0.2'
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;p=midori

Merge branch 'nmu-0.2'

Conflicts:
	debian/changelog
	debian/rules
---

597a50019bceeca112f5cdcebdee21b23208a4a2
diff --cc debian/changelog
index 30e4947d,b0180289..f03ec4c3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,31 -1,11 +1,39 @@@
 +midori (0.5.2+dfsg-1) UNRELEASED; urgency=low
 +
 +  [ Yves-Alexis Perez ]
 +  * New upstream release.
 +  * Apply patch from Colin Watson to improve conffile handling, using new
 +    debhelper features.                                         closes: #659773
 +  * debian/control:
 +    - update standards version to 3.9.3.
 +    - update homepage address.
 +    - remove myself from uploaders.
 +  * debian/midori.maintscript:
 +    - handle the /etc/xdg/midori/extensions/libadblock.so removal there.
 +                                                                closes: #660303
 +  * debian/patches:
 +    - force-ssl-cert-verification added, set ssl-strict to TRUE so connections
 +      are not done if the ssl certificate can't be trusted.
 +  * debian/compat bumped to 9.
 +
 +  [ Ryan Niebur ]
 +  * new upstream version, including the waf unpack changes made thanks
 +    to the NMU by Koichi Akabe
 +    - refreshed patches
 +    - add new Build-Dep on libzeitgeist-dev
 +  * Improve dh_auto_clean target in d/rules to handle some leftover
 +    files from quilt and waf
 +
 + -- Ryan Niebur <ryan@debian.org>  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 <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 --cc debian/rules
index 77f4eb63,15aba00d..bc57e275
--- a/debian/rules
+++ b/debian/rules
@@@ -40,32 -38,9 +38,20 @@@ get-orig-source
  
  WAF=WAFDIR=waf-modules ./waf-unpacked
  
 +#$(WAF): waf
 +#	# rebuild the waf script
 +#	sed < waf -e '1,/^#==>$$/ d' -e '/^#<==$$/ d' | tr -d '\n' | sed -e 's/.//' -e 's/#[*]/\n/g' -e 's/#%/\r/g' > waf.orig.tar.bz2
 +#	(sed -n < waf -e '1,/^#==>$$/ p'; echo REPLACED BY ENCODED TAR.BZ2; sed -n < waf -e '/^#<==$$/ p') > waf.hdr
 +#	(sed -n < waf.hdr -e '1,/^#==>$$/ p'; printf '#'; perl -pe < waf.orig.tar.bz2 's/\n/#*/g; s/\r/#%/g;'; echo; sed -n < waf.hdr  -e '/^#<==$$/ p') > waf.regen
 +#	chmod 755 waf.regen
 +#	# 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
  	$(WAF) --nocache distclean
 -	rm -rf _build_
 +	rm -rf _build_ _build
  	rm -rf .waf*
  	rm -rf .lock-wscript
  	rm -rf `find waf-modules -name "*.pyc"`