Use quilt for future changes to upstream

diff --git a/debian/README.source b/debian/README.source
new file mode 100644 (file)
index 0000000..0936828
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,4 @@
+Changes to upstream source are organised as a quilt patch series.
+
+Run debian/rules patch to apply all patches and debian/rules unpatch
+to remove them.  See the quilt documentation for more information.

diff --git a/debian/changelog b/debian/changelog
index 71fcd8860042eaf733ee6a5d972530e0d2163640..fb7436e4897f7a449cea13bf3a3482bd2eed6677 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ap-utils (1.5-1) UNRELEASED; urgency=low
   * Install Ukrainian README file as README.uk and English as README -
     closes: #291898
     - Convert both files from KOI8-U to UTF-8 encoding
   * Install Ukrainian README file as README.uk and English as README -
     closes: #291898
     - Convert both files from KOI8-U to UTF-8 encoding

+  * Use quilt for patches

 
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 19 Apr 2009 03:01:50 +0100
 
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 19 Apr 2009 03:01:50 +0100
 

diff --git a/debian/control b/debian/control
index b49cb00cd13ebec60aa74fe5aec171294ca83e12..978eb20a61c6cc2dbba01bd365d4597f8301fc4c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ap-utils
 Section: net
 Priority: optional
 Maintainer: Ben Hutchings <ben@decadent.org.uk>
 Section: net
 Priority: optional
 Maintainer: Ben Hutchings <ben@decadent.org.uk>

-Build-Depends: debhelper (>= 7), libncurses5-dev, autotools-dev
+Build-Depends: debhelper (>= 7), libncurses5-dev, autotools-dev, quilt

 Standards-Version: 3.6.1.0
 
 Package: ap-utils
 Standards-Version: 3.6.1.0
 
 Package: ap-utils

diff --git a/debian/rules b/debian/rules
index fc9e72d81319c465b8cf3d43d64fa79e29f3977c..0284e8d75b82e6adbd05d98c4ad619965545fe97 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,10 @@ export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 confflags += --host $(DEB_BUILD_GNU_TYPE) --build $(DEB_HOST_GNU_TYPE)
 
 
 confflags += --host $(DEB_BUILD_GNU_TYPE) --build $(DEB_HOST_GNU_TYPE)
 

+include /usr/share/quilt/quilt.make
+

 build: build-stamp
 build: build-stamp

-build-stamp:
+build-stamp: $(QUILT_STAMPFN)

        dh_testdir
        cp -f /usr/share/misc/config.sub config.sub
        cp -f /usr/share/misc/config.guess config.guess
        dh_testdir
        cp -f /usr/share/misc/config.sub config.sub
        cp -f /usr/share/misc/config.guess config.guess


@@ -17,7 +19,7 @@ build-stamp:
        $(MAKE)
        touch build-stamp
 
        $(MAKE)
        touch build-stamp
 

-clean:
+clean: unpatch

        dh_testdir
        dh_testroot
        rm -f build-stamp config.sub config.guess
        dh_testdir
        dh_testroot
        rm -f build-stamp config.sub config.guess