Control: tag -1 + patch

Hi Christoph,

Martin Michlmayr wrote:
> > libtool: Version mismatch error.  This is libtool 2.4.6 Debian-2.4.6-0.1, 
> > but the
> > libtool: definition of this LT_INIT comes from libtool 2.4.2.
> > libtool: You should recreate aclocal.m4 with macros from libtool 2.4.6 
> > Debian-2.4.6-0.1
> > libtool: and run autoconf again.
> > Makefile:441: recipe for target 'libsdate.lo' failed
> > make[2]: *** [libsdate.lo] Error 63

Reason for this seems that "--with autoreconf" only runs autoreconf in
the root directory, but not in the subdirectory "fake".

So the following patch suffices to fix the FTBFS for me:

diff -Nru sdate-0.4/debian/rules sdate-0.4+nmu1/debian/rules
--- sdate-0.4/debian/rules      2014-04-25 10:42:03.000000000 +0200
+++ sdate-0.4+nmu1/debian/rules 2016-09-09 23:10:42.000000000 +0200
@@ -14,6 +14,7 @@
 override_dh_auto_configure:
        mkdir obj objfake
        cd obj && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr 
--mandir=/usr/share/man --libdir=/usr/lib/libsdate
+       cd fake && autoreconf -f
        cd objfake && CFLAGS="$(CFLAGS)" ../fake/configure --prefix=/usr 
--mandir=/usr/share/man
 
 override_dh_auto_build:

dh_autoreconf can't be called twice, hence I had to call autoreconf
manually. So this doesn't clean up any changes autoreconf made, and
hence, if I build the package twice in a row, I get a larger diff:

 config.h.in      |  119 --
 debian/rules     |    1 
 fake/Makefile.in |   54 -
 fake/aclocal.m4  | 2741 +++++++++++++++++++++++++++++++------------------------
 fake/configure   | 2080 +++++++++++++++++++++++++----------------

So I actually recommend to also remove config.h.in, fake/Makefile.in,
fake/aclocal.m4, and fake/configure in the clean target, too.

Accordingly that diffstat looks much more sane:

 config.h.in      |  119 
 debian/rules     |    3 
 fake/Makefile.in |  811 ---
 fake/aclocal.m4  | 9788 -------------------------------------
 fake/configure   |14453 -------------------------------------------------------

Also the source package became much smaller:

-rw-r--r-- 1 abe abe 225702 Apr 25  2014 ../sdate_0.4.tar.gz
-rw-r--r-- 1 abe abe  35152 Sep  9 23:45 ../sdate_0.4+nmu1.tar.gz

So the full patch for that is:

diff -Nru sdate-0.4/debian/rules sdate-0.4+nmu1/debian/rules
--- sdate-0.4/debian/rules      2014-04-25 10:42:03.000000000 +0200
+++ sdate-0.4+nmu1/debian/rules 2016-09-09 23:10:42.000000000 +0200
@@ -14,6 +14,7 @@
 override_dh_auto_configure:
        mkdir obj objfake
        cd obj && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr 
--mandir=/usr/share/man --libdir=/usr/lib/libsdate
+       cd fake && autoreconf -f
        cd objfake && CFLAGS="$(CFLAGS)" ../fake/configure --prefix=/usr 
--mandir=/usr/share/man
 
 override_dh_auto_build:
@@ -24,7 +25,7 @@
        cd obj && $(MAKE) check
 
 override_dh_clean:
-       rm -rf build-stamp .deps obj objfake autom4te.cache
+       rm -rf build-stamp .deps obj objfake autom4te.cache config.h.in 
fake/Makefile.in fake/aclocal.m4 fake/configure
        dh_clean
 
 override_dh_auto_install:

I'll try to make up an NMU for this. Since this package is marked
LowThresholdNMU and since I know that you won't be mad at me, I'll
upload it as soon as I got a proper NMU. :-) Will post the full
debdiff afterwards.

                Regards, Axel
-- 
 ,''`.  |  Axel Beckert <a...@debian.org>, http://people.debian.org/~abe/
: :' :  |  Debian Developer, ftp.ch.debian.org Admin
`. `'   |  4096R: 2517 B724 C5F6 CA99 5329  6E61 2FF9 CD59 6126 16B5
  `-    |  1024D: F067 EA27 26B9 C3FC 1486  202E C09E 1D89 9593 0EDE

Attachment: signature.asc
Description: Digital signature

Reply via email to