Bug#790649: FTBFS: Program 'makeinfo' version >= 5 is required.

2015-07-07 Thread Samuel Thibault
Control: tags -1 + pending

Hello,

Martin Michlmayr, le Tue 30 Jun 2015 12:39:53 -0400, a écrit :
> I sent the following upstream, which is at leat a better upstream fix.

Thanks!

Samuel


-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Processed: Re: Bug#790649: FTBFS: Program 'makeinfo' version >= 5 is required.

2015-07-07 Thread Debian Bug Tracking System
Processing control commands:

> tags -1 + pending
Bug #790649 [liblouis] FTBFS: Program 'makeinfo' version >= 5 is required.
Added tag(s) pending.

-- 
790649: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790649
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#790649: FTBFS: Program 'makeinfo' version >= 5 is required.

2015-06-30 Thread Martin Michlmayr
* Cyril Brulebois  [2015-06-30 18:03]:
> The following patch does the trick. If we really want to keep the
> version check (we already had texinfo 5 in stable, but not in
> oldstable), having a versioned build-dep on texinfo should be a
> better idea?

I sent the following upstream, which is at leat a better upstream fix.

commit a8375daa8e2d1f1eca334c6add5dd2ffc5bcde01
Author: Martin Michlmayr 
Date:   Tue Jun 30 12:38:11 2015 -0400

Update configure.ac to reconize texi2any

makeinfo, which is nowadays provided by texi2any, reports texi2any as
of version 6.0.

diff --git a/configure.ac b/configure.ac
index 10a5efe..13041bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,7 +89,7 @@ if test x"${MAKEINFO_FOUND}" = xyes
 then
   MAKEINFO_VERSION_REQ=5
   AC_MSG_CHECKING([for makeinfo version >= $MAKEINFO_VERSION_REQ])
-  MAKEINFO_VERSION=`makeinfo --version | sed -ne 's/^makeinfo .* 
\([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*$/\1/p'`
+  MAKEINFO_VERSION=`makeinfo --version | sed -ne 's/^\(makeinfo\|texi2any\) .* 
\([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*$/\2/p'`
   if test x$MAKEINFO_VERSION = x -o 0$MAKEINFO_VERSION -lt 
$MAKEINFO_VERSION_REQ
   then
 AC_MSG_RESULT([no])

-- 
Martin Michlmayr
Linux for HP Helion OpenStack, Hewlett-Packard


-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#790649: FTBFS: Program 'makeinfo' version >= 5 is required.

2015-06-30 Thread Cyril Brulebois
Control: tag -1 patch

Martin Michlmayr  (2015-06-30):
> Package: liblouis
> Version: 2.6.2-1
> Severity: serious
> 
> liblouis fails to build in unstable.
> 
> configure checks that makeinfo is >= 5 and it looks for "^makeinfo" in
> the output, but this is "texi2any" now.
> 
> % makeinfo --version
> texi2any (GNU texinfo) 6.0
> 
> vs:
> 
> configure:
>   MAKEINFO_VERSION=`makeinfo --version | sed -ne 's/^makeinfo .* 
> \([0-9][0-9]*\)\.[0-9][0-9]*$/\1/p'`
> 
> > sbuild (Debian sbuild) 0.64.1 (13 Oct 2013) on m400-c3n1.hlinux.usa.hp.com
> ...
> > checking for a sed that does not truncate output... (cached) /bin/sed
> > checking for makeinfo... yes
> > checking for makeinfo version >= 5... no
> > configure: error: Program 'makeinfo' version >= 5 is required.
> > debian/rules:27: recipe for target 'configure-stamp' failed
> > make: *** [configure-stamp] Error 1

Hi,

The following patch does the trick. If we really want to keep the
version check (we already had texinfo 5 in stable, but not in
oldstable), having a versioned build-dep on texinfo should be a
better idea?

Mraw,
KiBi.
From 251d1c16797b543c585af9d4c805b6cb0db32e36 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois 
Date: Tue, 30 Jun 2015 17:59:21 +0200
Subject: [PATCH] Drop the makeinfo version check in configure.ac (Closes:
 #790649).

Post-processing makeinfo's output no longer works with texinfo 6.
---
 configure.ac | 13 +
 debian/changelog |  7 +++
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index ea4d208..3b3dfde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,19 +93,8 @@ AM_CONDITIONAL([HAVE_HELP2MAN], [test x$HELP2MAN = xhelp2man])
 # Check for makeinfo version >= 5, required for building documentation.
 AC_PROG_SED
 AC_CHECK_PROG([MAKEINFO_FOUND], [makeinfo], [yes])
-if test x"${MAKEINFO_FOUND}" = xyes
+if test x"${MAKEINFO_FOUND}" != xyes
 then
-  MAKEINFO_VERSION_REQ=5
-  AC_MSG_CHECKING([for makeinfo version >= $MAKEINFO_VERSION_REQ])
-  MAKEINFO_VERSION=`makeinfo --version | sed -ne 's/^makeinfo .* \([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*$/\1/p'`
-  if test x$MAKEINFO_VERSION = x -o 0$MAKEINFO_VERSION -lt $MAKEINFO_VERSION_REQ
-  then
-AC_MSG_RESULT([no])
-AC_MSG_ERROR([Program 'makeinfo' version >= $MAKEINFO_VERSION_REQ is required.])
-  else
-AC_MSG_RESULT([yes])
-  fi
-else
   AC_MSG_ERROR([Missing program 'makeinfo', please install.)])
 fi
 
diff --git a/debian/changelog b/debian/changelog
index f623422..fecf507 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+liblouis (2.6.2-2) UNRELEASED; urgency=medium
+
+  * Drop the makeinfo version check in configure.ac; post-processing
+makeinfo's output no longer works with texinfo 6 (Closes: #790649).
+
+ -- Cyril Brulebois   Tue, 30 Jun 2015 17:57:21 +0200
+
 liblouis (2.6.2-1) unstable; urgency=medium
 
   * New upstream release.
-- 
2.1.4



signature.asc
Description: Digital signature


Processed: Re: Bug#790649: FTBFS: Program 'makeinfo' version >= 5 is required.

2015-06-30 Thread Debian Bug Tracking System
Processing control commands:

> tag -1 patch
Bug #790649 [liblouis] FTBFS: Program 'makeinfo' version >= 5 is required.
Added tag(s) patch.

-- 
790649: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790649
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#790649: FTBFS: Program 'makeinfo' version >= 5 is required.

2015-06-30 Thread Martin Michlmayr
Package: liblouis
Version: 2.6.2-1
Severity: serious

liblouis fails to build in unstable.

configure checks that makeinfo is >= 5 and it looks for "^makeinfo" in
the output, but this is "texi2any" now.

% makeinfo --version
texi2any (GNU texinfo) 6.0

vs:

configure:
  MAKEINFO_VERSION=`makeinfo --version | sed -ne 's/^makeinfo .* 
\([0-9][0-9]*\)\.[0-9][0-9]*$/\1/p'`

> sbuild (Debian sbuild) 0.64.1 (13 Oct 2013) on m400-c3n1.hlinux.usa.hp.com
...
> checking for a sed that does not truncate output... (cached) /bin/sed
> checking for makeinfo... yes
> checking for makeinfo version >= 5... no
> configure: error: Program 'makeinfo' version >= 5 is required.
> debian/rules:27: recipe for target 'configure-stamp' failed
> make: *** [configure-stamp] Error 1

-- 
Martin Michlmayr
Linux for HP Helion OpenStack, Hewlett-Packard


-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org