[Pkg-clamav-commits] [libclamunrar] 07/09: autoreconf

[Sebastian A. Siewior]

This is an automated email from the git hooks/post-receive script.

bigeasy-guest pushed a commit to branch unstable
in repository libclamunrar.

commit c75ce7e59be777531f812bf8e5c95e7b0306c138
Author: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
Date:   Sat Apr 26 00:43:48 2014 +0200

    autoreconf
    
    Signed-off-by: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
---
 debian/changelog |  1 +
 debian/control   |  2 +-
 debian/rules     | 15 ++++++++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 59bd65f..7361274 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libclamunrar (0.98.1-1) UNRELEASED; urgency=low
   * New upstream version
   * redo rules files to something smaller like we do have in the clamav
     package.
+  * Do autoreconf before configure (closes: #727917).
 
  -- Sebastian Andrzej Siewior <sebastian at breakpoint.cc>  Fri, 25 Apr 2014 22:43:53 +0200
 
diff --git a/debian/control b/debian/control
index 14730af..7daa9e6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: extra
 Section: non-free/libs
 Maintainer: ClamAV Team <pkg-clamav-devel at lists.alioth.debian.org>
 Uploaders: Michael Tautschnig <mt at debian.org>, Stephen Gran <sgran at debian.org>
-Build-Depends: debhelper (>= 8), autotools-dev, zlib1g-dev, libbz2-dev, faketime
+Build-Depends: debhelper (>= 8), autotools-dev, zlib1g-dev, libbz2-dev, dh-autoreconf, automake1.11, faketime
 Standards-Version: 3.9.1
 Homepage: http://www.clamav.net/
 XS-Autobuild: yes
diff --git a/debian/rules b/debian/rules
index 37af9a7..c8531f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,12 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
+# Use automake 1.11 due to bug in automake-1.14.
+# see: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16375
+# TODO: Remove this, when the bug is fixed.
+export AUTOMAKE = automake-1.11
+export ACLOCAL = aclocal-1.11
+
 # Get the date of the latest changelog entry.
 # This is used to make the build more binary reproducible.
 DAT  = $(shell dpkg-parsechangelog | grep Date: | sed s/Date:\ //)
@@ -9,8 +15,15 @@ DATE = $(shell faketime "$(DAT)" date -u +"%Y-%m-%d %H:%M:%S")
 # NO_FAKE_STAT is necessary in order not to confuse make.
 FT=NO_FAKE_STAT="true" faketime -f -m "$(DATE)"
 
+# The autotools in squeeze (Debian 6) are too old, so don't use autoreconf.
+ifeq ($(shell cut -c1 /etc/debian_version),6)
+AUTORECONF =
+else
+AUTORECONF = --with autoreconf
+endif
+
 %:
-	dh $@ --parallel
+	dh $@ --parallel $(AUTORECONF)
 
 override_dh_auto_configure:
 	$(FT) dh_auto_configure -- \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-clamav/libclamunrar.git