[Forensics-changes] [SCM] debian-forensics/aimage branch, debian, updated. debian/3.2.4-1-5-gc5bb015

[Daniel T Chen]

The following commit has been merged in the debian branch:
commit c5bb015edecb22fe7f9c929cb3e7113c2d33f1fc
Author: Daniel T Chen <crimsun at ubuntu.com>
Date:   Wed Aug 24 17:36:08 2011 -0400

    Add patch from Steve Langasek (#637818)

diff --git a/Makefile.am b/Makefile.am
index b52c829..99552b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,5 @@
 SUBDIRS = src
 
-ACLOCAL_AMFLAGS = -I m4
-
 RELEASE_USER = simsong@
 RELEASE_HOST = www.afflib.org
 RELEASE_DIR  = afflib.org/
diff --git a/configure.ac b/configure.ac
index 4191e7f..30d4081 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,8 +13,6 @@ AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_INSTALL
 
-AC_CONFIG_MACRO_DIR([m4])
-
 AC_CONFIG_FILES([Makefile src/Makefile])
 AC_CONFIG_FILES([aimage.spec])
 AM_CONFIG_HEADER([config.h])
@@ -56,7 +54,7 @@ AC_ARG_ENABLE(noopt, AC_HELP_STRING([--enable-noopt], [Drop -O C flags]))
 AC_CHECK_HEADERS([openssl/md5.h openssl/sha.h openssl/aes.h openssl/rsa.h openssl/rand.h]) 
 AC_CHECK_LIB([crypto],[MD5_Update],,AC_MSG_ERROR([OpenSSL required for AFFLIB]))
 # Optional libraries
-AC_CHECK_LIB([ssl],[ssl3_new],,AC_MSG_ERROR([OpenSSL library 'libssl-dev' not installed; cannot continue.]))
+AC_CHECK_LIB([ssl],[OpenSSL_add_all_digests],,AC_MSG_ERROR([OpenSSL library 'libssl-dev' not installed; cannot continue.]))
 AC_CHECK_LIB([ncurses],[initscr],, AC_MSG_RESULT([ncurses not installed]))
 AC_CHECK_LIB([readline],[readline],, AC_MSG_RESULT([readline not installed]))
 AC_CHECK_HEADERS([readline/readline.h]) 
diff --git a/debian/changelog b/debian/changelog
index 6977e42..9d1d65f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+aimage (3.2.5-1) UNRELEASED; urgency=low
+
+  * New upstream release (Closes: #618087).
+  * Apply patch from Steve Langasek fixing FTBFS because of an erroneous
+    autoconf check (Closes: #637818). Thanks, Steve!
+    - Adjust debian/{control,rules} for dh-autoreconf.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Wed, 24 Aug 2011 12:54:39 -0400
+
 aimage (3.2.4-1) unstable; urgency=low
 
   * Initial release (Closes: #573262).
diff --git a/debian/control b/debian/control
index aeabe75..3ca087b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Christophe Monniez <christophe.monniez at fccu.be>
 Build-Depends: debhelper (>= 7.4.15~), autotools-dev, libafflib-dev,
- libssl-dev, libncurses5-dev, libreadline-dev, zlib1g-dev
+ libssl-dev, libncurses5-dev, libreadline-dev, zlib1g-dev,
+ dh-autoreconf
 Standards-Version: 3.9.1
 Homepage: http://www.afflib.org/
 Vcs-Browser: http://git.debian.org/?p=forensics/aimage.git
diff --git a/debian/rules b/debian/rules
index 000210b..bbe198d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-	dh ${@}
+	dh ${@} --with autoreconf

-- 
debian-forensics/aimage