r12097 - in packages/trunk/netrek-client-cow/debian: . patches source

Peter Pentchev roam-guest at alioth.debian.org
Mon Apr 11 11:02:13 UTC 2011


Author: roam-guest
Date: 2011-04-11 11:02:04 +0000 (Mon, 11 Apr 2011)
New Revision: 12097

Added:
   packages/trunk/netrek-client-cow/debian/patches/002-make-reallyclean.patch
   packages/trunk/netrek-client-cow/debian/source/
   packages/trunk/netrek-client-cow/debian/source/format
Modified:
   packages/trunk/netrek-client-cow/debian/changelog
   packages/trunk/netrek-client-cow/debian/control
   packages/trunk/netrek-client-cow/debian/patches/series
   packages/trunk/netrek-client-cow/debian/rules
Log:
Convert to the 3.0 (quilt) format and clean up after the build.

Modified: packages/trunk/netrek-client-cow/debian/changelog
===================================================================
--- packages/trunk/netrek-client-cow/debian/changelog	2011-04-11 00:45:03 UTC (rev 12096)
+++ packages/trunk/netrek-client-cow/debian/changelog	2011-04-11 11:02:04 UTC (rev 12097)
@@ -11,8 +11,11 @@
   [ Peter Pentchev ]
   * Add the 001-configure-gmp-version patch to fix the check for
     libgmp versions larger than 1.  Closes: #620528
-    - to accomplish this, move the "quilt push" snippet before
-      the configure script invocation
+  * Convert to the 3.0 (quilt) source format:
+    - add the 002-make-reallyclean patch to really clean up after
+      the build.
+    - drop the build dependency on quilt
+    - drop the quilt invocations from the rules file
 
  -- Peter Pentchev <roam at ringlet.net>  Fri, 08 Apr 2011 16:06:48 +0300
 

Modified: packages/trunk/netrek-client-cow/debian/control
===================================================================
--- packages/trunk/netrek-client-cow/debian/control	2011-04-11 00:45:03 UTC (rev 12096)
+++ packages/trunk/netrek-client-cow/debian/control	2011-04-11 11:02:04 UTC (rev 12097)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 7), quilt, autotools-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libgmp3-dev, libxt-dev, libxxf86vm-dev, libimlib2-dev
+Build-Depends: debhelper (>= 7), autotools-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libgmp3-dev, libxt-dev, libxxf86vm-dev, libimlib2-dev
 Standards-Version: 3.8.3
 Homepage: http://www.netrek.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/netrek-client-cow/

Added: packages/trunk/netrek-client-cow/debian/patches/002-make-reallyclean.patch
===================================================================
--- packages/trunk/netrek-client-cow/debian/patches/002-make-reallyclean.patch	                        (rev 0)
+++ packages/trunk/netrek-client-cow/debian/patches/002-make-reallyclean.patch	2011-04-11 11:02:04 UTC (rev 12097)
@@ -0,0 +1,28 @@
+Description: Really clean up after the build.
+Forwarded: no
+Author: Peter Pentchev <roam at ringlet.net>
+Last-Update: 2011-04-08
+
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -2,7 +2,7 @@
+ #  No editables below this point.                                      #
+ ########################################################################
+ 
+-include key.mk
++-include key.mk
+ 
+ KEYGOD = clientkeys at clientkeys.netrek.org
+ MAIL   = mail
+@@ -47,7 +47,8 @@
+ reallyclean: clean
+ 	rm -f netrek-client-cow randomize mkkey rsa_box*.c name mkcflags \
+ 	config.h system.mk config.status config.log config.cache key.mail \
+-	null netrek.shared lib*
++	null netrek.shared lib* cflags.c key.cow.linux* key.mk \
++	po/Makefile po/Makefile.in
+ 
+ distclean: clean reallyclean
+ 

Modified: packages/trunk/netrek-client-cow/debian/patches/series
===================================================================
--- packages/trunk/netrek-client-cow/debian/patches/series	2011-04-11 00:45:03 UTC (rev 12096)
+++ packages/trunk/netrek-client-cow/debian/patches/series	2011-04-11 11:02:04 UTC (rev 12097)
@@ -1 +1,2 @@
 001-configure-gmp-version.patch
+002-make-reallyclean.patch

Modified: packages/trunk/netrek-client-cow/debian/rules
===================================================================
--- packages/trunk/netrek-client-cow/debian/rules	2011-04-11 00:45:03 UTC (rev 12096)
+++ packages/trunk/netrek-client-cow/debian/rules	2011-04-11 11:02:04 UTC (rev 12097)
@@ -18,7 +18,6 @@
 
 config.status: configure
 	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	# Add here commands to configure the package.
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
@@ -48,12 +47,11 @@
 clean: 
 	dh_testdir
 	dh_testroot
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 
 	rm -f build-stamp 
 
 	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || [ ! -f key.mk ] ||  $(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f config.sub config.guess
 
 	dh_clean 

Added: packages/trunk/netrek-client-cow/debian/source/format
===================================================================
--- packages/trunk/netrek-client-cow/debian/source/format	                        (rev 0)
+++ packages/trunk/netrek-client-cow/debian/source/format	2011-04-11 11:02:04 UTC (rev 12097)
@@ -0,0 +1 @@
+3.0 (quilt)




More information about the Pkg-games-commits mailing list