Bug#748639: p7zip: diff for NMU version 9.20.1~dfsg.1-4.1

2014-05-29 Thread Olly Betts
tags 748639 + patch
thanks

Mohammed Adnène Trojette adn+...@diwi.org  writes:
 If you want to NMU, please proceed not to lose time!

Thanks - I've just uploaded an NMU for p7zip.  The nmudiff is attached.

Cheers,
Olly
diff -u p7zip-9.20.1~dfsg.1/debian/changelog p7zip-9.20.1~dfsg.1/debian/changelog
--- p7zip-9.20.1~dfsg.1/debian/changelog
+++ p7zip-9.20.1~dfsg.1/debian/changelog
@@ -1,3 +1,11 @@
+p7zip (9.20.1~dfsg.1-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Stop building unpackaged 7zG binary and eliminate dependency on
+libwxgtk2.8-dev.  (Closes: #748639)
+
+ -- Olly Betts o...@survex.com  Mon, 19 May 2014 17:39:26 +1200
+
 p7zip (9.20.1~dfsg.1-4) unstable; urgency=low
 
   * Acknowledge NMU. Thanks to Gregor Herrmann.
diff -u p7zip-9.20.1~dfsg.1/debian/control p7zip-9.20.1~dfsg.1/debian/control
--- p7zip-9.20.1~dfsg.1/debian/control
+++ p7zip-9.20.1~dfsg.1/debian/control
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Mohammed Adnène Trojette adn+...@diwi.org
-Build-Depends: debhelper (= 7), quilt, wx2.8-headers, libwxgtk2.8-dev (= 2.8.12.1-4), dpkg-dev (= 1.16.0)
+Build-Depends: debhelper (= 7), quilt, dpkg-dev (= 1.16.0)
 Standards-Version: 3.9.2
 Homepage: http://p7zip.sourceforge.net/
 
diff -u p7zip-9.20.1~dfsg.1/debian/rules p7zip-9.20.1~dfsg.1/debian/rules
--- p7zip-9.20.1~dfsg.1/debian/rules
+++ p7zip-9.20.1~dfsg.1/debian/rules
@@ -17,7 +17,7 @@
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	cp makefile.machine makefile.machine.bak
 	cp makefile.linux_any_cpu_gcc_4.X makefile.machine
-	$(MAKE) all4
+	$(MAKE) all3
 	cp makefile.machine.bak makefile.machine
 
 	touch build-stamp


Bug#748639: p7zip: diff for NMU version 9.20.1~dfsg.1-4.1

2014-05-29 Thread Mohammed Adnène Trojette
On Thu, May 29, 2014, Olly Betts wrote:
 Thanks - I've just uploaded an NMU for p7zip.  The nmudiff is attached.

Thank _you_.

-- 
Adnène


-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org