tags 643478 + patch
thanks

Dear maintainer,

I've prepared an NMU for g2 (versioned as 0.72-2.1), uploaded in DELAYED/0 as
per DevRef ยง5.11.1.

The diff is attached to this message.

Regards, 

OdyX
diff -Nru g2-0.72/debian/changelog g2-0.72/debian/changelog
--- g2-0.72/debian/changelog	2011-02-23 22:17:54.000000000 +0100
+++ g2-0.72/debian/changelog	2011-11-15 17:00:07.000000000 +0100
@@ -1,3 +1,13 @@
+g2 (0.72-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Don't mix source format 3.0 (quilt) and manual usage of quilt:
+    - Drop manual quilt calls from debian/rules;
+    - Drop superfluous quilt Build-Depends.
+    Closes: #643478
+
+ -- Didier Raboud <o...@debian.org>  Tue, 15 Nov 2011 16:59:33 +0100
+
 g2 (0.72-2) unstable; urgency=low
 
   * Took over package in Debian Med team maintenance
diff -Nru g2-0.72/debian/control g2-0.72/debian/control
--- g2-0.72/debian/control	2011-02-23 08:48:56.000000000 +0100
+++ g2-0.72/debian/control	2011-11-15 16:59:17.000000000 +0100
@@ -3,7 +3,7 @@
 Maintainer:  Debian Med Packaging Team <debian-med-packag...@lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <ti...@debian.org>
-Build-Depends: debhelper (>= 7), quilt, autotools-dev, autoconf, libtool, libx11-dev, chrpath,
+Build-Depends: debhelper (>= 7), autotools-dev, autoconf, libtool, libx11-dev, chrpath,
  libgd2-noxpm-dev | libgd2-xpm-dev | libgd2-dev | libgd-dev (>> 1.6.1), xutils-dev
 Standards-Version: 3.9.1
 Section: libs
diff -Nru g2-0.72/debian/rules g2-0.72/debian/rules
--- g2-0.72/debian/rules	2011-02-23 18:14:14.000000000 +0100
+++ g2-0.72/debian/rules	2011-11-15 16:59:30.000000000 +0100
@@ -32,8 +32,6 @@
 config.status:
 	dh_testdir
 
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-
 	dh_autotools-dev_updateconfig
 	# do also save configure which is changed here to be able to restore it afterwards in the clean target
 	cp -a configure configure.dh-orig
@@ -68,7 +66,6 @@
 	if [ -f configure.dh-orig ] ; then mv configure.dh-orig configure ; fi
 	dh_autotools-dev_restoreconfig
 	dh_clean
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	rm -f ltmain.sh
 	rm -rf .pc
 

Reply via email to