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

[Leo Iannacone]

le fails to build, looking for ncuresesw that now are installed with multiarch support.

New patch agaist acinclude.m4 and and run dh-autreconf

[Jamie Strandboge (jdstrand)]

This looks good to me and I am in the process of uploading it. Have you submitted this to Debian? If not, please use 'submittodebian'. Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-12-28 18:20:08 +0000
+++ debian/changelog	2012-02-27 20:52:19 +0000
@@ -1,3 +1,11 @@
+le (1.14.3-1ubuntu1) precise; urgency=low
+
+  * Fix ftbfs with ncurses in multiarch (LP: #935217, closes: #651705):
+    + new patch against acinclude.m4
+    + build with dh-autoreconf
+
+ -- Leo Iannacone <[e-mail]>  Mon, 27 Feb 2012 21:37:58 +0100
+
 le (1.14.3-1) unstable; urgency=low
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2009-12-28 18:20:08 +0000
+++ debian/control	2012-02-27 20:52:19 +0000
@@ -1,8 +1,9 @@
 Source: le
 Section: editors
 Priority: optional
-Maintainer: Raphael Geissert <[e-mail]>
-Build-Depends: debhelper (>= 6.0.0), autotools-dev, libncursesw5-dev, quilt, cdbs
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Raphael Geissert <[e-mail]>
+Build-Depends: debhelper (>= 6.0.0), autotools-dev, libncursesw5-dev, quilt, cdbs, dh-autoreconf
 Standards-Version: 3.8.3
 Homepage: http://freshmeat.net/projects/leeditor/
 

=== added file 'debian/patches/fix-ftbfs-with-multiarch.patch'
--- debian/patches/fix-ftbfs-with-multiarch.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-ftbfs-with-multiarch.patch	2012-02-27 20:52:19 +0000
@@ -0,0 +1,19 @@
+Description: Fix ftbfs while looking for ncurses in multiarch
+Author: Leo Iannacone <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/935217
+Bug-Debian: http://bugs.debian.org/651705
+
+---
+ acinclude.m4 |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- le.orig/acinclude.m4
++++ le/acinclude.m4
+@@ -48,6 +48,7 @@ AC_DEFUN([LE_PATH_CURSES_DIRECT],
+ for ac_dir0 in `echo "$ac_curses_includes" | sed -e 's:include:lib:' -e 's:/ncurses$::'` \
+     /usr/lib              \
+     /usr/local/lib        \
++    /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH` \
+     ; \
+ do
+  for ac_dir in ${ac_dir0}64 ${ac_dir0}; do

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-12-28 18:20:08 +0000
+++ debian/patches/series	2012-02-27 20:52:19 +0000
@@ -1,3 +1,4 @@
 debian-changelog-dist-allow-dash.patch
 fix-html-in-php-syntax-delimiter.patch
 extend-sql-syntax.patch
+fix-ftbfs-with-multiarch.patch

=== modified file 'debian/rules'
--- debian/rules	2009-05-05 23:28:56 +0000
+++ debian/rules	2012-02-27 20:52:19 +0000
@@ -11,3 +11,4 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk