Use dh --with quilt.

diff --git a/control b/control
index 61391600e1eecdfc717d0ad0c4aa94fb84bf5cbf..45cf45652cdd9944b5c6c1d0e80df309977df19a 100644 (file)
--- 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, po-debconf
+Build-Depends: debhelper (>= 7.0.50), byacc, flex, hardening-wrapper, liblockfile-dev, libssl-dev, pmake, quilt (>= 0.46-7), po-debconf
 Standards-Version: 3.8.2
 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 0e8291882e20bde2166a6af8512b3d72638e4356..4b266e361727e9527e7bb9035f1611890b3ae554 100755 (executable)
--- a/rules
+++ b/rules
@@ -2,8 +2,6 @@
 # -*- makefile -*-
 # Debian build rules for dma, the DragonFly mail agent
 
-include /usr/share/quilt/quilt.make
-
 PACKAGE=       dma
 VERSION = `sed -e 's/^[^ ]\+ (\([^)]\+\)).*/\1/; 1q' debian/changelog`
 VERSION_UP = `sed -e 's/^[^ ]\+ (0\.0\.\([^)-]\+\).*/\1/; 1q' debian/changelog | tr . -`
@@ -27,14 +25,11 @@ 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}/
 
-override_dh_auto_configure:    ${QUILT_STAMPFN}
-
 override_dh_auto_build:
        pmake
 
 override_dh_auto_clean:
        pmake clean
-       $(MAKE) -f debian/rules unpatch
 
 override_dh_auto_install:
        pmake DESTDIR=$(CURDIR)/debian/$(PACKAGE) BINDIR=/usr/sbin install
@@ -44,4 +39,4 @@ override_dh_fixperms:
        dh_fixperms -Xusr/sbin/dma -Xvar/spool/dma
 
 %:
-       dh $@
+       dh --with quilt $@