[pkg-horde] [SCM] Debian Horde Packages repository: horde3 package branch, debian-lenny, updated. a3873329efa3ed5797678626638afbb2bb4f48d0

[Gregory Colpart]

The following commit has been merged in the debian-lenny branch:
commit 776c6cc45704d4fad0a4b4f0efa5d391f800cea0
Author: Gregory Colpart <gcolpart at ioakim2.evolix.net>
Date:   Sun Sep 20 18:00:20 2009 +0200

    Add patch stuff

diff --git a/debian/changelog b/debian/changelog
index 92ab0ba..0342afc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+horde3 (3.2.2+debian0-3) stable-security; urgency=high
+
+  * Add patch stuff on debian/rules to have clean security patches.
+
+ -- Gregory Colpart <reg at debian.org>  Sun, 20 Sep 2009 18:21:44 +0200
+
 horde3 (3.2.2+debian0-2) unstable; urgency=high
 
   * Add informations in README.Debian about test.php files: these files should
diff --git a/debian/rules b/debian/rules
index 347c30f..b5068ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,22 @@
 
 # List all Files and directories here that should not be copied to
 # /usr/share/horde3
-COPY_EXCLUDE=^(\{arch\}|COPYING|README|po|scripts|config|debian|docs|build-stamp|configure-stamp)$
+COPY_EXCLUDE=^(\{arch\}|COPYING|README|po|scripts|config|debian|docs|build-stamp|configure-stamp|patch-stamp)$
 
-configure: configure-stamp
+patch: patch-stamp
+patch-stamp:
+	dh_testdir
+	set -e; test -e patch-stamp || \
+	    for i in `ls -1 debian/patches/*.patch || :`; do patch -p1 <$$i > /dev/null; done
+	touch $@
+
+unpatch:
+	dh_testdir
+	set -e; ! test -e patch-stamp || \
+	    for i in `ls -1r debian/patches/*.patch || :`; do patch -p1 -R <$$i > /dev/null; done
+	rm -f patch-stamp
+
+configure: configure-stamp patch
 configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
@@ -16,11 +29,11 @@ configure-stamp:
 
 build: check-external-libs build-stamp
 
-build-stamp: configure-stamp 
+build-stamp: configure
 	dh_testdir
 	touch build-stamp
 
-clean:
+clean:  unpatch
 	dh_testdir
 	dh_testroot
 	dh_clean build-stamp configure-stamp
@@ -202,4 +215,4 @@ check-external-libs:
         fi
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: patch unpatch build clean binary-indep binary-arch binary install configure

-- 
Debian Horde Packages repository: horde3 package