[med-svn] r8573 - in trunk/packages/libg2/tags: . 0.72-2.1

[Andreas Tille]

Author: tille
Date: 2011-11-15 17:27:09 +0000 (Tue, 15 Nov 2011)
New Revision: 8573

Added:
   trunk/packages/libg2/tags/0.72-2.1/
Modified:
   trunk/packages/libg2/tags/0.72-2.1/changelog
   trunk/packages/libg2/tags/0.72-2.1/control
   trunk/packages/libg2/tags/0.72-2.1/rules
Log:
Commit NMU changes


Modified: trunk/packages/libg2/tags/0.72-2.1/changelog
===================================================================
--- trunk/packages/libg2/tags/0.72-2/changelog	2011-11-14 08:24:25 UTC (rev 8554)
+++ trunk/packages/libg2/tags/0.72-2.1/changelog	2011-11-15 17:27:09 UTC (rev 8573)
@@ -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 <odyx at 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

Modified: trunk/packages/libg2/tags/0.72-2.1/control
===================================================================
--- trunk/packages/libg2/tags/0.72-2/control	2011-11-14 08:24:25 UTC (rev 8554)
+++ trunk/packages/libg2/tags/0.72-2.1/control	2011-11-15 17:27:09 UTC (rev 8573)
@@ -3,7 +3,7 @@
 Maintainer:  Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at 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

Modified: trunk/packages/libg2/tags/0.72-2.1/rules
===================================================================
--- trunk/packages/libg2/tags/0.72-2/rules	2011-11-14 08:24:25 UTC (rev 8554)
+++ trunk/packages/libg2/tags/0.72-2.1/rules	2011-11-15 17:27:09 UTC (rev 8573)
@@ -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