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

[Julien Valroff]

The following commit has been merged in the debian branch:
commit 0465351532f1750e91c650d3d1d54a3900c06161
Author: Julien Valroff <julien at kirya.net>
Date:   Mon Oct 10 20:17:33 2011 +0200

    Restore original upstream files and add a patch to apply the changes

diff --git a/debian/changelog b/debian/changelog
index a19877b..7e667e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ aimage (3.2.5-1) unstable; urgency=low
   * Switch to 3.0 (quilt) source package format
   * Bump debhelper compat to 8
   * Fix DEP-5 copyright syntax 
+  * Restore original upstream files and add a patch to apply the changes 
 
- -- Julien Valroff <julien at debian.org>  Mon, 10 Oct 2011 20:01:21 +0200
+ -- Julien Valroff <julien at debian.org>  Mon, 10 Oct 2011 20:16:56 +0200
 
 aimage (3.2.4-1) unstable; urgency=low
 
diff --git a/debian/patches/001_fix-ftbfs.diff b/debian/patches/001_fix-ftbfs.diff
new file mode 100644
index 0000000..e26a5aa
--- /dev/null
+++ b/debian/patches/001_fix-ftbfs.diff
@@ -0,0 +1,34 @@
+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/patches/series b/debian/patches/series
new file mode 100644
index 0000000..988b22d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+001_fix-ftbfs.diff

-- 
debian-forensics/aimage