Adding quilt

diff --git a/debian/changelog b/debian/changelog
index 49ee52f867a12eda36b20b551278d934dd9de8d9..c5c174d3cb997f0227d91bf9f95d1adb6b63243f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,9 +14,13 @@ rrdtool (1.2.26-1) unstable; urgency=low
         * Building ruby modules now (Closes: #453304).
         * Change the Python binary package to conform with the Python policy,
           using python-support.
-        * Bump Standards Version to 3.7.3
+        * Bump Standards Version to 3.7.3.
+        * Using and depending on quilt to handle patches.
+    - debian/watch:
+        * File redone to meet version 3 of uscan and to work again, using the
+          new location of the upstream source.
 
- -- Bernd Zeimetz <bzed@debian.org>  Wed, 06 Feb 2008 17:24:40 +0100
+ -- Bernd Zeimetz <bzed@debian.org>  Sat, 09 Feb 2008 21:47:40 +0100
 
 rrdtool (1.2.19-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index b47390dcb9b431edf112b1208626f0b8d1660444..1b3fbe7273aa7cd73799e1f4c7f9858afa218185 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian RRDtool Team <rrdtool@ml.snow-crash.org>
 Uploaders: Alexander Wirt <formorer@debian.org>, Bernd Zeimetz <bzed@debian.org>
 Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 5.0.38), groff, autotools-dev,
+Build-Depends: debhelper (>= 5.0.38), groff, autotools-dev, quilt,
  zlib1g-dev, libpng12-dev, libart-2.0-dev, libfreetype6-dev,
  tcl-dev,
  perl (>= 5.8.0),

diff --git a/debian/rules b/debian/rules
index 72619979bac326c5e620253f68caf00ade9df668..7561da1e2b24de274bbe0dc1ceaceff52b76635b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+#we use quilt
+include /usr/share/quilt/quilt.make
+
 
 #library versions
 LIB_version := $(shell grep '^librrd_la_LDFLAGS' src/Makefile.am | \
@@ -57,7 +60,7 @@ endif
 LDFLAGS="-Wl,-z,defs"
 
 configure: config.status
-config.status:
+config.status: $(QUILT_STAMPFN)
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
        cp -f /usr/share/misc/config.sub config.sub
@@ -89,7 +92,8 @@ build-python%: build-arch-stamp
 build-indep: build-indep-stamp
 build-indep-stamp: config.status
 
-clean: $(PY_VERS:%=clean-python%)
+clean: clean-patched
+clean-patched: unpatch $(PY_VERS:%=clean-python%)
        dh_testdir
        dh_testroot
        #sanity check if debian/control lists the right package name
@@ -115,7 +119,7 @@ endif
 
        dh_clean
 
-clean-python%:
+clean-python%: unpatch
        set -e ;\
         cd bindings/python ;\
         python$* setup.py clean
@@ -201,4 +205,4 @@ binary: binary-arch binary-indep
 .PHONY: build clean configure \
         binary-indep binary-arch binary \
         install install-arch \
-        install-python% clean-python%
+        install-python% clean-python% unpatch