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

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2009-11-08 15:58:13 +0000 (Sun, 08 Nov 2009)
New Revision: 3115

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


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2009-11-08 15:56:27 UTC (rev 3114)
+++ trunk/samba/debian/changelog	2009-11-08 15:58:13 UTC (rev 3115)
@@ -1,11 +1,17 @@
-samba (2:3.4.3-1) UNRELEASED; urgency=low
+samba (2:3.4.3-2) UNRELEASED; urgency=low
 
+  * Switch to source format 3.0 (quilt)
+
+ -- Christian Perrier <bubulle at debian.org>  Sun, 08 Nov 2009 15:04:24 +0100
+
+samba (2:3.4.3-1) unstable; urgency=low
+
   * New upstream release. This fixes the following bugs:
     - Do not attempt to update /etc/mtab if it is
       a symbolic link. Closes: #408394
   * Bump Standards-Version to 3.8.3 (checked)
 
- -- Christian Perrier <bubulle at debian.org>  Sat, 31 Oct 2009 12:56:41 +0100
+ -- Christian Perrier <bubulle at debian.org>  Sat, 31 Oct 2009 14:32:07 +0100
 
 samba (2:3.4.2-1) unstable; urgency=high
 

Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control	2009-11-08 15:56:27 UTC (rev 3114)
+++ trunk/samba/debian/control	2009-11-08 15:58:13 UTC (rev 3115)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 6.0.0), libpam0g-dev, libreadline-dev,
 	libcups2-dev | libcupsys2-dev,
 	libacl1-dev  [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
-	libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, quilt, uuid-dev,
+	libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, uuid-dev,
 	libtalloc-dev (>= 1.2.0~git20080616),
 	libcap2-dev  [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
 	libkeyutils-dev  [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2009-11-08 15:56:27 UTC (rev 3114)
+++ trunk/samba/debian/rules	2009-11-08 15:58:13 UTC (rev 3115)
@@ -21,8 +21,6 @@
   CFLAGS += -O2
 endif
 
-include /usr/share/quilt/quilt.make
-
 DESTDIR=`pwd`/debian/tmp
 
 conf_args = \
@@ -86,8 +84,7 @@
   conf_args += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-configure: patch configure-stamp
-configure-stamp:
+configure:
 	dh_testdir
 
 	if [ -f debian/config.cache ]; then \
@@ -108,9 +105,7 @@
 
 	touch build-stamp
 
-clean:	clean-patched unpatch
-
-clean-patched: 
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -275,4 +270,4 @@
 	       -e "s/libcap2-dev\( ([^)]\+)\)* \[[^]]\+\]/libcap2-dev \1 [`type-handling any linux-gnu`]/g" \
 		debian/control
 
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch update-archs
+.PHONY: build clean binary-indep binary-arch binary install configure update-archs

Added: trunk/samba/debian/source/format
===================================================================
--- trunk/samba/debian/source/format	                        (rev 0)
+++ trunk/samba/debian/source/format	2009-11-08 15:58:13 UTC (rev 3115)
@@ -0,0 +1 @@
+3.0 (quilt)