From: Peter Pentchev <roam@ringlet.net>
Date: Wed, 9 Dec 2009 17:26:44 +0000 (+0000)
Subject: Switch to the 3.0 (quilt) source format:
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c02e3a2f284898f207d06d7decc74673b4d8d54b;p=people%2Fms%2Fdma.git

Switch to the 3.0 (quilt) source format:
- drop the quilt dependency
- remove --with quilt from the dh(1) invocations
- remove the "patch" and "unpatch" targets
- remove README.source
---

diff --git a/README.source b/README.source
deleted file mode 100644
index a80805b..0000000
--- a/README.source
+++ /dev/null
@@ -1,17 +0,0 @@
-The dma package uses quilt to maintain local changes to
-the dma 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.
diff --git a/changelog b/changelog
index 63e6488..40bb738 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,7 @@ dma (0.0.2009.07.17-3) unstable; urgency=low
     Closes: #544664
   * Install the /usr/bin/mailq and /usr/bin/newaliases symlinks.
     Closes: #558421
+  * Switch to the 3.0 (quilt) source format.
 
  -- Peter Pentchev <roam@ringlet.net>  Wed, 04 Nov 2009 14:09:45 +0200
 
diff --git a/control b/control
index 55a7a5e..b65fc14 100644
--- a/control
+++ b/control
@@ -2,7 +2,7 @@ Source: dma
 Section: mail
 Priority: optional
 Maintainer: Peter Pentchev <roam@ringlet.net>
-Build-Depends: debhelper (>= 7.0.50), byacc, flex, hardening-wrapper, liblockfile-dev, libssl-dev, pmake, quilt (>= 0.46-7), po-debconf
+Build-Depends: debhelper (>= 7.0.50), byacc, flex, hardening-wrapper, liblockfile-dev, libssl-dev, pmake, po-debconf
 Standards-Version: 3.8.3
 Homepage: http://devel.ringlet.net/mail/dma/
 Vcs-Svn: http://svn.ringlet.net/svn/ringlet/mail/dma/trunk/dma-pkg/debian/
diff --git a/rules b/rules
index a6ed15c..cb342ba 100755
--- a/rules
+++ b/rules
@@ -7,8 +7,6 @@ VERSION = `sed -e 's/^[^ ]\+ (\([^)]\+\)).*/\1/; 1q' debian/changelog`
 VERSION_UP = `sed -e 's/^[^ ]\+ (0\.0\.\([^)-]\+\).*/\1/; 1q' debian/changelog | tr . -`
 VERSION_ADD ?= -debian-01
 
-QUILTMK = /usr/share/quilt/quilt.make
-
 ifneq (,$(filter werror,$(DEB_BUILD_OPTIONS)))
 	CFLAGS+=	-Werror
 endif
@@ -27,12 +25,6 @@ diffsrc:
 	-diff -urN -x .svn debian/ ../svn/${PACKAGE}/tags/${PACKAGE}-${VERSION}${VERSION_ADD}/
 	-diff -urN -x .svn -x debian -x .pc -I'\$$Ringlet.*\$$' ./ ../svn/${PACKAGE}/tags/${PACKAGE}-dfly-${VERSION_UP}/
 
-patch:
-	$(MAKE) -f $(QUILTMK) patch
-
-unpatch:
-	$(MAKE) -f $(QUILTMK) unpatch
-
 override_dh_auto_build:
 	pmake
 
@@ -47,4 +39,4 @@ override_dh_fixperms:
 	dh_fixperms -Xusr/sbin/dma -Xvar/spool/dma -Xetc/dma
 
 %:
-	dh --with quilt $@
+	dh $@
diff --git a/source/format b/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/source/format
@@ -0,0 +1 @@
+3.0 (quilt)