Control: tag -1 patch
On Mon, Jun 03, 2013 at 10:09:15AM -0700, Daniel Schepler wrote:
> debian/rules build
> dh_testdir
> aclocal
> aclocal: warning: autoconf input should be named 'configure.ac', not
> 'configure.in'
> autoheader
> automake --foreign
> automake: warning: autoconf input should be named 'configure.ac', not
> 'configure.in'
> automake: warning: autoconf input should be named 'configure.ac', not
> 'configure.in'
> parallel-tests: error: required file './test-driver' not found
> parallel-tests: 'automake --add-missing' can install 'test-driver'
> make: *** [configure-stamp] Error 1
> dpkg-buildpackage: error: debian/rules build gave error exit status 2
Using dh-autoreconf is probably the simplest and most robust way to fix
this. (Indeed, my experience is that dh-autoreconf improves nearly all
packages using the autotools.) Patch follows.
* Use dh-autoreconf rather than a fragile and incorrect sequence of
individual commands (closes: #710931).
diff -Nru patchutils-0.3.2/debian/control patchutils-0.3.2/debian/control
--- patchutils-0.3.2/debian/control 2012-01-16 11:35:24.000000000 +0000
+++ patchutils-0.3.2/debian/control 2013-06-17 13:41:25.000000000 +0100
@@ -2,9 +2,9 @@
Section: text
Priority: optional
Maintainer: Christoph Berg <[email protected]>
-# automake because we patch Makefile.am
+# dh-autoreconf because we patch Makefile.am
# rpm includes gendiff
-Build-Depends: debhelper (>= 7), xmlto, automake, rpm
+Build-Depends: debhelper (>= 7), xmlto, dh-autoreconf, rpm
Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/collab-maint/patchutils.git
Vcs-Browser: https://alioth.debian.org/anonscm/git/collab-maint/patchutils.git
diff -Nru patchutils-0.3.2/debian/rules patchutils-0.3.2/debian/rules
--- patchutils-0.3.2/debian/rules 2011-02-12 13:15:01.000000000 +0000
+++ patchutils-0.3.2/debian/rules 2013-06-17 13:40:24.000000000 +0100
@@ -20,10 +20,7 @@
configure: configure-stamp
configure-stamp:
dh_testdir
- aclocal
- autoheader
- automake --foreign
- autoconf
+ dh_autoreconf
CFLAGS="$(CFLAGS)" ./configure $(CONFFLAGS) --prefix=/usr
--mandir=\$${prefix}/share/man
touch configure-stamp
@@ -40,7 +37,8 @@
dh_testroot
rm -f build-stamp configure-stamp
[ ! -f Makefile ] || $(MAKE) distclean
- dh_clean aclocal.m4 configure config.h.in Makefile.in doc/*.1 doc/*.6
+ dh_autoreconf_clean
+ dh_clean doc/*.1 doc/*.6
install: build-stamp
dh_testdir
Thanks,
--
Colin Watson [[email protected]]
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
