[Pkg-shadow-commits] sid/debian control,1.3,1.4 changelog,1.41,1.42 rules,1.11,1.12

[Martin Quinson]

Update of /cvsroot/pkg-shadow/sid/debian
In directory haydn:/tmp/cvs-serv2404

Modified Files:
	control changelog rules 
Log Message:
Switching to quilt. Hello, modernity

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/changelog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- changelog	11 May 2005 11:32:52 -0000	1.41
+++ changelog	11 May 2005 15:06:02 -0000	1.42
@@ -7,6 +7,7 @@
       Closes: #249372
     - Cleanup passwd debconf stuff as md5 passwords are assumed since
       1:4.0.3-19 and the resolution of #223664.
+    - Switching from dpatch to quilt. 
   * Debian specific programs fixes:
     - NONE
   * Upstream bugs not fixed in upstream releases or CVS:

Index: rules
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/rules,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- rules	11 May 2005 11:22:28 -0000	1.11
+++ rules	11 May 2005 15:06:02 -0000	1.12
@@ -22,7 +22,7 @@
 
 export DH_COMPAT=3
 
-include /usr/share/dpatch/dpatch.make
+#include /usr/share/dpatch/dpatch.make
 
 # The autotools target adds forced build-time dependencies on
 # autotools-dev (for /usr/share/misc/config.*) and devscripts (for dch)
@@ -146,3 +146,31 @@
 binary: binary-indep binary-arch
 
 .PHONY: autotools build clean checkroot binary-indep binary-arch patch unpatch
+
+
+
+####
+#### The following is the exact content of /usr/share/quilt/quilt.make
+#### but this file was added only in "quilt (<= 0.40)", which is not in sarge.
+#### If we do build-dep on this version one day, we could remplace this by:
+####    include /usr/share/quilt/quilt.make
+#### But I prefer to keep buildable in sarge for now.
+####
+
+# QUILT_STAMPFN: stamp file to use
+QUILT_STAMPFN	?= stamp-patched
+
+# QUILT_PATCH_DIR: where the patches live
+QUILT_PATCH_DIR ?= debian/patches
+
+patch: $(QUILT_STAMPFN)
+$(QUILT_STAMPFN):
+	# quilt exits with 2 as return when there was nothing to do. 
+	# That's not an error here (but it's usefull to break loops in crude scripts)
+	QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt push -a || test $$? = 2
+	touch debian/$(QUILT_STAMPFN)
+
+unpatch:
+	QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt pop -a -R || test $$? = 2 
+	rm -rf .pc debian/$(QUILT_STAMPFN)
+

Index: control
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/control,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- control	11 May 2005 11:22:28 -0000	1.3
+++ control	11 May 2005 15:06:02 -0000	1.4
@@ -4,8 +4,7 @@
 Maintainer: Shadow package maintainers <pkg-shadow-devel@lists.alioth.debian.org>
 Standards-Version: 3.6.1.1
 Uploaders: Christian Perrier <bubulle@debian.org>, Sam Hartman <hartmans@debian.org>
-Build-Depends: autoconf, automake1.7, libtool, bzip2, gettext, libpam0g-dev, texinfo, file, debhelper (>= 4.1.16), po-debconf, libpam-runtime (>= 0.76-14),dpatch
-
+Build-Depends: autoconf, automake1.7, libtool, bzip2, gettext, libpam0g-dev, texinfo, file, debhelper (>= 4.1.16), po-debconf, libpam-runtime (>= 0.76-14),quilt
 Package: passwd
 Architecture: any
 Depends: ${shlibs:Depends}, ${loginpam}