[SCM] lame/master: Build with dh-autoreconf.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Jul 18 08:09:50 UTC 2014


The following commit has been merged in the master branch:
commit 548dc97aa93aef6b5b6e78ab80559850aff38a1d
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jul 18 09:09:24 2014 +0100

    Build with dh-autoreconf.
    
    Closes: #755111

diff --git a/debian/patches/ansi2knr2devnull.patch b/debian/patches/ansi2knr2devnull.patch
new file mode 100644
index 0000000..c427345
--- /dev/null
+++ b/debian/patches/ansi2knr2devnull.patch
@@ -0,0 +1,43 @@
+Description: Patch out remaining ansi2knr.
+Author: Dimitri John Ledkov <xnox at ubuntu.com>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=755111
+--- a/configure.in
++++ b/configure.in
+@@ -78,7 +78,6 @@
+ fi
+ 
+ dnl more automake stuff
+-AM_C_PROTOTYPES
+ 
+ AC_CHECK_HEADER(dmalloc.h)
+ if test "${ac_cv_header_dmalloc_h}" = "yes"; then
+--- a/doc/man/Makefile.am
++++ b/doc/man/Makefile.am
+@@ -1,6 +1,6 @@
+ ## $Id: Makefile.am,v 1.1 2000/10/22 11:39:44 aleidinger Exp $
+ 
+-AUTOMAKE_OPTIONS = foreign ansi2knr
++AUTOMAKE_OPTIONS = foreign
+ 
+ man_MANS = lame.1
+ EXTRA_DIST = ${man_MANS}
+--- a/libmp3lame/i386/Makefile.am
++++ b/libmp3lame/i386/Makefile.am
+@@ -1,6 +1,6 @@
+ ## $Id: Makefile.am,v 1.26 2011/04/04 09:42:34 aleidinger Exp $
+ 
+-AUTOMAKE_OPTIONS = foreign $(top_srcdir)/ansi2knr
++AUTOMAKE_OPTIONS = foreign
+ 
+ DEFS = @DEFS@ @CONFIG_DEFS@
+ 
+--- a/doc/html/Makefile.am
++++ b/doc/html/Makefile.am
+@@ -1,6 +1,6 @@
+ ## $Id: Makefile.am,v 1.7 2010/09/30 20:58:40 jaz001 Exp $
+ 
+-AUTOMAKE_OPTIONS = foreign ansi2knr
++AUTOMAKE_OPTIONS = foreign
+ 
+ docdir = $(datadir)/doc
+ pkgdocdir = $(docdir)/$(PACKAGE)
diff --git a/debian/patches/series b/debian/patches/series
index fb10f5f..babda2e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 07-field-width-fix.patch
 parallel-builds-fix.patch
 unbreak-ftbfs-gcc4.4.patch
+ansi2knr2devnull.patch
diff --git a/debian/rules b/debian/rules
index d930248..4985ff8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ ifeq (,$(CFLAGS))
 endif
 
 %:
-	dh $@ --parallel
+	dh $@ --parallel --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- \

-- 
lame packaging



More information about the pkg-multimedia-commits mailing list