tags 441747 + patch thank you
Hi, Here is an NMU that seems to fix this issue for me, as well as building with gcc-4.3 and handling the nostrip option. Thanks, Barry deFreese
diff -u soundtouch-1.3.0/debian/changelog soundtouch-1.3.0/debian/changelog --- soundtouch-1.3.0/debian/changelog +++ soundtouch-1.3.0/debian/changelog @@ -1,3 +1,15 @@ +soundtouch (1.3.0-2.2) unstable; urgency=low + + * Non-maintainer upload. + * Build multiple times in a row. (Closes: #444542, #441747). + + Adjust DEB_AUTO_UPDATE_*. + + Add DEB_AC_AUX_DIR. + * 07_gcc43.patch - Build with gcc-4.3. (Closes: #455171). + + Thanks to Cyril Brulebois for the patch. + * 08_nostrip.patch - Stop LD from stripping. (Closes: #438038). + + -- Barry deFreese <[EMAIL PROTECTED]> Mon, 10 Mar 2008 00:55:24 -0400 + soundtouch (1.3.0-2.1) unstable; urgency=low * NMU as part of the GCC 4.1 transition. diff -u soundtouch-1.3.0/debian/rules soundtouch-1.3.0/debian/rules --- soundtouch-1.3.0/debian/rules +++ soundtouch-1.3.0/debian/rules @@ -3,12 +3,13 @@ DEB_TAR_SRCDIR := SoundTouch-1.3.0 include /usr/share/cdbs/1/rules/tarball.mk +include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -include /usr/share/cdbs/1/rules/debhelper.mk -DEB_AUTO_UPDATE_LIBTOOL := pre +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/config DEB_AUTO_UPDATE_ACLOCAL := 1.7 +DEB_AUTO_UPDATE_LIBTOOL := pre DEB_AUTO_UPDATE_AUTOCONF := 2.50 DEB_DH_MAKESHLIBS_ARGS := -V only in patch2: unchanged: --- soundtouch-1.3.0.orig/debian/patches/07_gcc43.patch +++ soundtouch-1.3.0/debian/patches/07_gcc43.patch @@ -0,0 +1,11 @@ +diff -Nur soundtouch-1.3.0/build-tree/SoundTouch-1.3.0/source/example/SoundStretch/WavFile.cpp soundtouch-1.3.0.new/build-tree/SoundTouch-1.3.0/source/example/SoundStretch/WavFile.cpp +--- SoundTouch-1.3.0/source/example/SoundStretch/WavFile.cpp 2004-10-30 11:10:16.000000000 -0400 ++++ SoundTouch-1.3.0/source/example/SoundStretch/WavFile.cpp 2008-03-10 11:14:37.000000000 -0400 +@@ -48,6 +48,7 @@ + #include <stdio.h> + #include <stdexcept> + #include <string> ++#include <cstring> + #include <assert.h> + #include <limits.h> + only in patch2: unchanged: --- soundtouch-1.3.0.orig/debian/patches/08_nostrip.patch +++ soundtouch-1.3.0/debian/patches/08_nostrip.patch @@ -0,0 +1,105 @@ +diff -Nur soundtouch-1.3.0/build-tree/SoundTouch-1.3.0/include/Makefile.in soundtouch-1.3.0.new/build-tree/SoundTouch-1.3.0/include/Makefile.in +--- SoundTouch-1.3.0/include/Makefile.in 2005-02-06 07:21:59.000000000 -0500 ++++ SoundTouch-1.3.0/include/Makefile.in 2008-03-10 14:38:03.000000000 -0400 +@@ -304,7 +304,7 @@ + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG= \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + mostlyclean-generic: +diff -Nur soundtouch-1.3.0/build-tree/SoundTouch-1.3.0/Makefile.in soundtouch-1.3.0.new/build-tree/SoundTouch-1.3.0/Makefile.in +--- SoundTouch-1.3.0/Makefile.in 2005-02-06 07:21:59.000000000 -0500 ++++ SoundTouch-1.3.0/Makefile.in 2008-03-10 14:38:03.000000000 -0400 +@@ -570,7 +570,7 @@ + installcheck: installcheck-recursive + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG= \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + mostlyclean-generic: +diff -Nur soundtouch-1.3.0/build-tree/SoundTouch-1.3.0/source/example/bpm/Makefile.in soundtouch-1.3.0.new/build-tree/SoundTouch-1.3.0/source/example/bpm/Makefile.in +--- SoundTouch-1.3.0/source/example/bpm/Makefile.in 2005-02-06 07:22:00.000000000 -0500 ++++ SoundTouch-1.3.0/source/example/bpm/Makefile.in 2008-03-10 14:38:03.000000000 -0400 +@@ -378,7 +378,7 @@ + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG= \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + mostlyclean-generic: +diff -Nur soundtouch-1.3.0/build-tree/SoundTouch-1.3.0/source/example/Makefile.in soundtouch-1.3.0.new/build-tree/SoundTouch-1.3.0/source/example/Makefile.in +--- SoundTouch-1.3.0/source/example/Makefile.in 2005-02-06 07:22:00.000000000 -0500 ++++ SoundTouch-1.3.0/source/example/Makefile.in 2008-03-10 14:38:03.000000000 -0400 +@@ -371,7 +371,7 @@ + installcheck: installcheck-recursive + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG= \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + mostlyclean-generic: +diff -Nur soundtouch-1.3.0/build-tree/SoundTouch-1.3.0/source/example/SoundStretch/Makefile.am soundtouch-1.3.0.new/build-tree/SoundTouch-1.3.0/source/example/SoundStretch/Makefile.am +--- SoundTouch-1.3.0/source/example/SoundStretch/Makefile.am 2008-03-10 14:38:02.000000000 -0400 ++++ SoundTouch-1.3.0/source/example/SoundStretch/Makefile.am 2008-03-10 14:38:22.000000000 -0400 +@@ -44,7 +44,7 @@ + soundstretch_LDADD=../../SoundTouch/libSoundTouch.la ../bpm/libBPM.la -lm + + ## linker flags +-soundstretch_LDFLAGS=-s ++soundstretch_LDFLAGS= + + ## additional compiler flags + soundstretch_CXXFLAGS=-O2 -I../bpm +diff -Nur soundtouch-1.3.0/build-tree/SoundTouch-1.3.0/source/example/SoundStretch/Makefile.in soundtouch-1.3.0.new/build-tree/SoundTouch-1.3.0/source/example/SoundStretch/Makefile.in +--- SoundTouch-1.3.0/source/example/SoundStretch/Makefile.in 2005-02-06 07:22:00.000000000 -0500 ++++ SoundTouch-1.3.0/source/example/SoundStretch/Makefile.in 2008-03-10 14:38:03.000000000 -0400 +@@ -182,7 +182,7 @@ + EXTRA_DIST = soundstretch.dsp soundstretch.dsw + soundstretch_SOURCES = main.cpp RunParameters.cpp WavFile.cpp + soundstretch_LDADD = ../../SoundTouch/libSoundTouch.la ../bpm/libBPM.la -lm +-soundstretch_LDFLAGS = -s ++soundstretch_LDFLAGS = + soundstretch_CXXFLAGS = -O3 -I../bpm + all: all-am + +@@ -457,7 +457,7 @@ + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG= \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + mostlyclean-generic: +diff -Nur soundtouch-1.3.0/build-tree/SoundTouch-1.3.0/source/Makefile.in soundtouch-1.3.0.new/build-tree/SoundTouch-1.3.0/source/Makefile.in +--- SoundTouch-1.3.0/source/Makefile.in 2005-02-06 07:21:59.000000000 -0500 ++++ SoundTouch-1.3.0/source/Makefile.in 2008-03-10 14:38:03.000000000 -0400 +@@ -371,7 +371,7 @@ + installcheck: installcheck-recursive + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG= \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + mostlyclean-generic: +diff -Nur soundtouch-1.3.0/build-tree/SoundTouch-1.3.0/source/SoundTouch/Makefile.in soundtouch-1.3.0.new/build-tree/SoundTouch-1.3.0/source/SoundTouch/Makefile.in +--- SoundTouch-1.3.0/source/SoundTouch/Makefile.in 2005-02-06 07:21:59.000000000 -0500 ++++ SoundTouch-1.3.0/source/SoundTouch/Makefile.in 2008-03-10 14:38:03.000000000 -0400 +@@ -394,7 +394,7 @@ + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG= \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + mostlyclean-generic:
