Hi, I intend to NMU these, here is the changelog entry:
aubio (0.3.2-4.1) unstable; urgency=low * Non-maintainer upload. * Fix FTBFS with binutils-gold (Closes: #553930). * Conditionally enable ALSA depending on whether building on Linux; patch from Steven McDonald (Closes: #619802). * Explicitly set packaging format by putting '1.0' into the debian/source/format file. -- Alessio Treglia <ales...@debian.org> Fri, 29 Apr 2011 15:32:33 +0200 If you have no objections, I'll upload aubio 0.3.2-4.1 to DELAYED-5 within few hours. The NMU diff is attached. Regards, -- Alessio Treglia | www.alessiotreglia.com Debian Developer | ales...@debian.org Ubuntu Core Developer | quadris...@ubuntu.com 0FEC 59A5 E18E E04F 6D40 593B 45D4 8C7C DCFC 3FD0
diffstat for aubio_0.3.2-4 aubio_0.3.2-4.1 aubio-0.3.2/debian/changelog | 11 +++++++++++ aubio-0.3.2/debian/patches/series | 1 + aubio-0.3.2/debian/rules | 12 ++++++++++-- debian/patches/02_binutils_gold.patch | 31 +++++++++++++++++++++++++++++++ debian/source/format | 1 + 5 files changed, 54 insertions(+), 2 deletions(-) diff -u aubio-0.3.2/debian/changelog aubio-0.3.2/debian/changelog --- aubio-0.3.2/debian/changelog +++ aubio-0.3.2/debian/changelog @@ -1,3 +1,14 @@ +aubio (0.3.2-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with binutils-gold (Closes: #553930). + * Conditionally enable ALSA depending on whether building on Linux; + patch from Steven McDonald (Closes: #619802). + * Explicitly set packaging format by putting '1.0' into the + debian/source/format file. + + -- Alessio Treglia <ales...@debian.org> Fri, 29 Apr 2011 15:32:33 +0200 + aubio (0.3.2-4) unstable; urgency=low * Fix building of architecture dependent packages diff -u aubio-0.3.2/debian/rules aubio-0.3.2/debian/rules --- aubio-0.3.2/debian/rules +++ aubio-0.3.2/debian/rules @@ -4,13 +4,21 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +ifeq (linux-gnu,$(DEB_HOST_GNU_SYSTEM)) + DEB_CONFIGURE_ALSA := --enable-alsa +else + DEB_CONFIGURE_ALSA := --disable-alsa +endif + %: dh --with quilt,python-support $@ override_dh_auto_configure: dh_auto_configure -- \ - --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ - --enable-alsa --enable-jack --enable-fftw3 --disable-lash + ${DEB_CONFIGURE_ALSA} \ + --enable-jack \ + --enable-fftw3 \ + --disable-lash binary: binary-arch binary-indep dh binary diff -u aubio-0.3.2/debian/patches/series aubio-0.3.2/debian/patches/series --- aubio-0.3.2/debian/patches/series +++ aubio-0.3.2/debian/patches/series @@ -2,0 +3 @@ +02_binutils_gold.patch only in patch2: unchanged: --- aubio-0.3.2.orig/debian/source/format +++ aubio-0.3.2/debian/source/format @@ -0,0 +1 @@ +1.0 only in patch2: unchanged: --- aubio-0.3.2.orig/debian/patches/02_binutils_gold.patch +++ aubio-0.3.2/debian/patches/02_binutils_gold.patch @@ -0,0 +1,31 @@ +Description: Fix build failure with ld --no-add-needed. +Origin: Ubuntu +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=553930 +Forwarded: no +--- + examples/Makefile.am | 2 +- + examples/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- aubio-0.3.2.orig/examples/Makefile.am ++++ aubio-0.3.2/examples/Makefile.am +@@ -4,7 +4,7 @@ endif + + # global flags + AM_CFLAGS = -DAUBIO_PREFIX=\"$(prefix)\" -I$(top_srcdir)/src -I$(top_srcdir)/ext @AUBIO_CFLAGS@ @LASH_CFLAGS@ @FFTWLIB_CFLAGS@ +-AM_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/ext -laubioext -laubio @LASH_LIBS@ ++AM_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/ext -laubioext -laubio @LASH_LIBS@ -lm + + # add your programs to this list + bin_PROGRAMS = \ +--- aubio-0.3.2.orig/examples/Makefile.in ++++ aubio-0.3.2/examples/Makefile.in +@@ -239,7 +239,7 @@ target_alias = @target_alias@ + + # global flags + AM_CFLAGS = -DAUBIO_PREFIX=\"$(prefix)\" -I$(top_srcdir)/src -I$(top_srcdir)/ext @AUBIO_CFLAGS@ @LASH_CFLAGS@ @FFTWLIB_CFLAGS@ +-AM_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/ext -laubioext -laubio @LASH_LIBS@ ++AM_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/ext -laubioext -laubio @LASH_LIBS@ -lm + EXTRA_DIST = utils.h + + # optionally add sources file for these programs