[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 2e23a000fdb18108f26905fed0a0de6743614506
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:34 2008 +0100

    Revert "Remove dpatch dependency - we keep the code in a patch system."
    
    This reverts commit 126e2b982fed58d155cc32aefbb2325038d534c8.

diff --git a/debian/changelog b/debian/changelog
index 7c9c3fc..24b06d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-clamav (0.93~dfsg-2) unstable; urgency=low
-
-  * Remove dpatch dependency - we keep the code in a patch system.
-
- -- Stephen Gran <sgran at debian.org>  Tue, 29 Apr 2008 01:44:41 +0100
-
 clamav (0.93~dfsg-1) unstable; urgency=low
 
   * New upstream release (closes: #476450, #477278)
diff --git a/debian/control b/debian/control
index 4fe10a4..17e3583 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: Stephen Gran <sgran at debian.org>
 Uploaders: Thomas Lamy <Thomas.Lamy at in-online.net>
-Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>=5.0), po-debconf, zlib1g-dev (>=1:1.1.4), libbz2-dev, libmilter-dev, libgmp3-dev, libwrap0-dev, perl, bc
+Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>=5.0), po-debconf, zlib1g-dev (>=1:1.1.4), libbz2-dev, libmilter-dev, libgmp3-dev, libwrap0-dev, dpatch, perl, bc
 Standards-Version: 3.7.3
 
 Package: clamav-base
diff --git a/debian/rules b/debian/rules
index 6b3ce8c..ad05285 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ else
 	DEBUG_OPTS += --enable-debug
 endif
 
-config.status: configure
+config.status: patch-stamp configure
 	dh_testdir
 	egrep '^#[[:alpha:]]' etc/clamd.conf | sed -e 's/^#//' | awk '{print $$1}' | while read opt; do \
 	  if ! grep -q "$${opt}" debian/clamav-base.postinst.in ; then \
@@ -71,7 +71,17 @@ endif
 	perl -pe 's~#COMMON-FUNCTIONS#~qx{cat debian/common_functions}~eg' < debian/clamav-freshclam.postinst.in > debian/clamav-freshclam.postinst
 	touch build-arch-stamp
 
-clean:
+patch: patch-stamp
+patch-stamp:
+	dpatch apply-all -v
+	touch patch-stamp
+
+unpatch: 
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
+
+clean: clean-patched unpatch
+clean-patched:
 	debconf-updatepo
 	dh_testdir 
 	dh_testroot 

-- 
Debian repository for ClamAV