[Pkg-samba-maint] r3713 - in trunk/ctdb/debian: . source

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2011-03-22 20:36:24 +0000 (Tue, 22 Mar 2011)
New Revision: 3713

Added:
   trunk/ctdb/debian/source/
   trunk/ctdb/debian/source/format
Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/control
   trunk/ctdb/debian/rules
Log:
Switch to dpkg-source 3.0 (quilt) format

Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2011-03-22 19:47:46 UTC (rev 3712)
+++ trunk/ctdb/debian/changelog	2011-03-22 20:36:24 UTC (rev 3713)
@@ -8,8 +8,9 @@
     - removed 70-nfstickle-sysconfig.diff, fixed upstream
     - removed 71-correct-nice_service.diff, merged upstream
   * debian/watch, debian/uupdate-wrapper: use new upstream git url
+  * Switch to dpkg-source 3.0 (quilt) format
 
- -- Mathieu Parent <sathieu at debian.org>  Tue, 22 Mar 2011 20:47:00 +0100
+ -- Mathieu Parent <sathieu at debian.org>  Tue, 22 Mar 2011 21:06:12 +0100
 
 ctdb (1.0.112-12-1) unstable; urgency=low
 

Modified: trunk/ctdb/debian/control
===================================================================
--- trunk/ctdb/debian/control	2011-03-22 19:47:46 UTC (rev 3712)
+++ trunk/ctdb/debian/control	2011-03-22 20:36:24 UTC (rev 3713)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
 Uploaders: Mathieu Parent <sathieu at debian.org>
-Build-Depends: debhelper (>= 5), quilt (>= 0.40), libpopt-dev, libpcap-dev [hurd-i386]
+Build-Depends: debhelper (>= 5), libpopt-dev, libpcap-dev [hurd-i386]
 Homepage: http://ctdb.samba.org/
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/pkg-samba/trunk/ctdb/

Modified: trunk/ctdb/debian/rules
===================================================================
--- trunk/ctdb/debian/rules	2011-03-22 19:47:46 UTC (rev 3712)
+++ trunk/ctdb/debian/rules	2011-03-22 20:36:24 UTC (rev 3713)
@@ -24,8 +24,6 @@
   CFLAGS += -O2
 endif
 
-include /usr/share/quilt/quilt.make
-
 DESTDIR=$(CURDIR)/debian/ctdb
 
 conf_args = \
@@ -35,26 +33,25 @@
 		--localstatedir=/var/lib \
 		--with-logdir=/var/log/ctdb
 
-configure: patch configure-stamp
+configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	CFLAGS="$(CFLAGS)" ./configure $(conf_args)
-	touch configure-stamp
+	touch $@
 
 #Architecture 
 build: check-external-libs build-arch build-indep
 
 build-arch: build-arch-stamp
-build-arch-stamp: patch configure-stamp
+build-arch-stamp: configure-stamp
 	[ ! -f Makefile ] || $(MAKE)
+	touch $@
 
 build-indep: build-indep-stamp
-build-indep-stamp: patch configure-stamp
+build-indep-stamp: configure-stamp
 	touch $@
 
-clean:	clean-patched unpatch
-
-clean-patched:
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp configure-stamp
@@ -137,4 +134,4 @@
 	      exit 1; \
         fi
 
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure

Added: trunk/ctdb/debian/source/format
===================================================================
--- trunk/ctdb/debian/source/format	                        (rev 0)
+++ trunk/ctdb/debian/source/format	2011-03-22 20:36:24 UTC (rev 3713)
@@ -0,0 +1 @@
+3.0 (quilt)