From 98eaaebb6d9f76c15bc43360778f9ec2d79630a7 Mon Sep 17 00:00:00 2001 From: Bernd Zeimetz Date: Sat, 9 Feb 2008 21:52:25 +0100 Subject: [PATCH] Adding quilt --- debian/changelog | 8 ++++++-- debian/control | 2 +- debian/rules | 12 ++++++++---- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 49ee52f..c5c174d 100644 --- 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 Wed, 06 Feb 2008 17:24:40 +0100 + -- Bernd Zeimetz 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 b47390d..1b3fbe7 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian RRDtool Team Uploaders: Alexander Wirt , Bernd Zeimetz 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 7261997..7561da1 100755 --- 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 -- 2.30.2