r11642 - in packages/branches/xdigger/lenny/debian: . source

[Peter Pentchev]

Author: roam-guest
Date: 2011-01-07 14:38:50 +0000 (Fri, 07 Jan 2011)
New Revision: 11642

Added:
   packages/branches/xdigger/lenny/debian/README.source
Modified:
   packages/branches/xdigger/lenny/debian/changelog
   packages/branches/xdigger/lenny/debian/control
   packages/branches/xdigger/lenny/debian/rules
   packages/branches/xdigger/lenny/debian/source/format
Log:
Switch back to the 1.0 source format since the stable release managers
are indeed unlikely to allow a 3.0 (quilt) transition:
- restore the use of quilt
- use the patch and unpatch targets in a way that is a bit safer
- add a README.source file

Pointed out by:	Ansgar Burchardt (ansgar@)


Added: packages/branches/xdigger/lenny/debian/README.source
===================================================================
--- packages/branches/xdigger/lenny/debian/README.source	                        (rev 0)
+++ packages/branches/xdigger/lenny/debian/README.source	2011-01-07 14:38:50 UTC (rev 11642)
@@ -0,0 +1,17 @@
+The xdigger package uses quilt to maintain local changes to
+the xdigger distribution.  The Debian-specific patches are maintained
+in the debian/patches/ directory.
+
+To apply all the patches, preparing the source for building, use:
+  debian/rules patch
+
+To revert the patches, preparing to build a source package, use:
+  debian/rules unpatch
+
+You do not need to manually execute these targets when building
+the package; they are part of the debian/rules target chain.
+
+For more information on the quilt integration with Debian packages,
+as well as editing, adding or removing patches, please see
+the quilt documentation; in recent versions of the Debian package of
+quilt, start at the /usr/share/doc/quilt/README.source file.

Modified: packages/branches/xdigger/lenny/debian/changelog
===================================================================
--- packages/branches/xdigger/lenny/debian/changelog	2011-01-07 14:15:51 UTC (rev 11641)
+++ packages/branches/xdigger/lenny/debian/changelog	2011-01-07 14:38:50 UTC (rev 11642)
@@ -1,11 +1,12 @@
 xdigger (1.0.10-13+lenny1) UNRELEASED; urgency=low
 
   * Team upload.
-  * Convert to the 3.0 (quilt) source format.
   * Add the buffers patch to guard against lots of buffer overflows,
     including the one reported in the BTS.  Closes: #609096
   * Add DEP 3 descriptive headers to the rest of the patches.
   * Add misc:Depends to the binary package.
+  * Use the quilt patch/unpatch targets in a bit more robust way and
+    add a README.source file describing the use of quilt.
 
  -- Peter Pentchev <roam at ringlet.net>  Fri, 07 Jan 2011 14:02:47 +0200
 

Modified: packages/branches/xdigger/lenny/debian/control
===================================================================
--- packages/branches/xdigger/lenny/debian/control	2011-01-07 14:15:51 UTC (rev 11641)
+++ packages/branches/xdigger/lenny/debian/control	2011-01-07 14:38:50 UTC (rev 11642)
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Barry deFreese <bddebian at comcast.net>, Ansgar Burchardt <ansgar at 43-1.org>
 Standards-Version: 3.8.0
-Build-Depends: debhelper (>=5), xutils-dev, libx11-dev, x11proto-core-dev, libxext-dev
+Build-Depends: debhelper (>=5), xutils-dev, libx11-dev, x11proto-core-dev, libxext-dev, quilt
 Homepage: http://www.ibiblio.org/pub/Linux/games/arcade/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/xdigger/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/xdigger/?op=log

Modified: packages/branches/xdigger/lenny/debian/rules
===================================================================
--- packages/branches/xdigger/lenny/debian/rules	2011-01-07 14:15:51 UTC (rev 11641)
+++ packages/branches/xdigger/lenny/debian/rules	2011-01-07 14:38:50 UTC (rev 11642)
@@ -2,6 +2,7 @@
 # debian/rules file for the Debian GNU/Linux xdigger package
 # Copyright 1997-99 by Hartmut Koptein <koptein at debian.org>
 
+include /usr/share/quilt/quilt.make
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -13,7 +14,7 @@
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
 	xmkmf -a
@@ -36,6 +37,7 @@
 	rm -f build-stamp configure-stamp
 
 	$(MAKE) distclean
+	$(MAKE) -f debian/rules unpatch
 
 	dh_clean
 

Modified: packages/branches/xdigger/lenny/debian/source/format
===================================================================
--- packages/branches/xdigger/lenny/debian/source/format	2011-01-07 14:15:51 UTC (rev 11641)
+++ packages/branches/xdigger/lenny/debian/source/format	2011-01-07 14:38:50 UTC (rev 11642)
@@ -1 +1 @@
-3.0 (quilt)
+1.0