Merge lp:~l3on/ubuntu/precise/haskell-augeas/fix-ftbfs into lp:ubuntu/precise/haskell-augeas

[Leo Iannacone]

Patch configure.ac to fix FTBFS with augeas 0.10.

Run dh-autoreconf to regenerate configure at build time.

Also added libxml2-dev as build-dep.

[Luke Yelavich (themuso)]

Thanks for your work, uploaded.

review: Approve

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2011-06-18 10:37:31 +0000
+++ .pc/applied-patches	2012-02-21 00:59:16 +0000
@@ -1,1 +1,2 @@
 no-tests.patch
+fix-ftbfs-with-augeas-0.10.patch

=== modified file 'configure.ac'
--- configure.ac	2011-06-18 10:37:31 +0000
+++ configure.ac	2012-02-21 00:59:16 +0000
@@ -11,7 +11,7 @@
 
 
 if test "x${has_augeas_init}" = "xyes" ; then
-   AC_CHECK_HEADERS([augeas.h],[],[has_augeas_h=no])
+    PKG_CHECK_MODULES(augeas,[augeas],has_augeas_h=yes,has_augeas_h=no)
 else
    AC_MSG_ERROR([Unable to find aug_init in an augeas library.])
 fi

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-01 14:10:43 +0000
+++ debian/changelog	2012-02-21 00:59:16 +0000
@@ -1,3 +1,13 @@
+haskell-augeas (0.4.0-1ubuntu1) precise; urgency=low
+
+  * Fix FTBFS with augeas 0.10 (LP: #935164):
+    + new patch using PKG_CHECK_MODULES in configure.ac to check
+      augeas header files.
+    + debian/control: add dh-autoreconf and libxml-2.0 as build-dep.
+    + debian/rules: include autoreconf cdbs rules.
+
+ -- Leo Iannacone <[e-mail]>  Sun, 19 Feb 2012 20:28:08 +0100
+
 haskell-augeas (0.4.0-1build1) precise; urgency=low
 
   * No-change rebuild for new GHC ABIs

=== modified file 'debian/control'
--- debian/control	2011-06-18 10:37:31 +0000
+++ debian/control	2012-02-21 00:59:16 +0000
@@ -1,14 +1,17 @@
 Source: haskell-augeas
 Section: haskell
 Priority: extra
-Maintainer: Debian Haskell Group <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Haskell Group <[e-mail]>
 Uploaders: Joachim Breitner <[e-mail]>
 Build-Depends: debhelper (>= 7)
   , cdbs
+  , dh-autoreconf
   , haskell-devscripts (>= 0.7)
   , ghc
   , ghc-prof
   , libaugeas-dev
+  , libxml2-dev
   , pkg-config
 Build-Depends-Indep: ghc-doc
 Standards-Version: 3.9.1

=== added file 'debian/patches/fix-ftbfs-with-augeas-0.10.patch'
--- debian/patches/fix-ftbfs-with-augeas-0.10.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-ftbfs-with-augeas-0.10.patch	2012-02-21 00:59:16 +0000
@@ -0,0 +1,20 @@
+Description: Use PKG_CHECK_MODULES instead of AC_CHECK_HEADERS to 
+ fix FTBFS with augeas 0.10 that has header not compilable.
+Author: Leo Iannacone <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/935164
+
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- haskell-augeas.orig/configure.ac
++++ haskell-augeas/configure.ac
+@@ -11,7 +11,7 @@ AC_SEARCH_LIBS([aug_init],[augeas],[has_
+ 
+ 
+ if test "x${has_augeas_init}" = "xyes" ; then
+-   AC_CHECK_HEADERS([augeas.h],[],[has_augeas_h=no])
++    PKG_CHECK_MODULES(augeas,[augeas],has_augeas_h=yes,has_augeas_h=no)
+ else
+    AC_MSG_ERROR([Unable to find aug_init in an augeas library.])
+ fi

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-06-18 10:37:31 +0000
+++ debian/patches/series	2012-02-21 00:59:16 +0000
@@ -1,1 +1,2 @@
 no-tests.patch
+fix-ftbfs-with-augeas-0.10.patch

=== modified file 'debian/rules'
--- debian/rules	2011-06-18 10:37:31 +0000
+++ debian/rules	2012-02-21 00:59:16 +0000
@@ -6,5 +6,6 @@
 clean::
 	make clean
 
+include /usr/share/cdbs/1/rules/autoreconf.mk 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk