tags 622424 + patch pending tags 628945 + patch pending tags 628949 + patch pending thanks
Dear maintainer, I've prepared an NMU for muse (versioned as 0.8.1a-7.2) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards. -- .''`. : :' : Luca Falavigna <[email protected]> `. `' `-
diff -u muse-0.8.1a/debian/rules muse-0.8.1a/debian/rules --- muse-0.8.1a/debian/rules +++ muse-0.8.1a/debian/rules @@ -10,7 +10,7 @@ CFLAGS += -O2 endif -muse_confflags = --disable-qttest --disable-suid-build --enable-lash +muse_confflags = --disable-qttest --disable-suid-build muse_confflags += --prefix=/usr export QTDIR=/usr/share/qt3 @@ -54,9 +54,7 @@ build-stamp: patch-stamp configure-stamp dh_testdir - # Override bogus output of 'pkg-config --libs lash-1.0' that wants to - # force an rpath on us. - $(MAKE) LASH_LIBS=-llash + $(MAKE) touch build-stamp @@ -89,6 +87,7 @@ dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/muse + find $(CURDIR)/debian/muse -name '*.la' -delete # Build architecture-independent files here. binary-indep: build install diff -u muse-0.8.1a/debian/control muse-0.8.1a/debian/control --- muse-0.8.1a/debian/control +++ muse-0.8.1a/debian/control @@ -2,7 +2,7 @@ Section: sound Priority: optional Maintainer: Daniel Kobras <[email protected]> -Build-Depends: debhelper (>= 7), libqt3-mt-dev, libasound2-dev, libsndfile1-dev, libjack-dev, libfluidsynth-dev (>> 1.0.3-5), libsamplerate0-dev, liblash-dev, uuid-dev, dpatch, autotools-dev +Build-Depends: debhelper (>= 7), libqt3-mt-dev, libasound2-dev, libsndfile1-dev, libjack-dev, libfluidsynth-dev (>> 1.0.3-5), libsamplerate0-dev, uuid-dev, dpatch, autotools-dev Standards-Version: 3.7.3 Package: muse diff -u muse-0.8.1a/debian/changelog muse-0.8.1a/debian/changelog --- muse-0.8.1a/debian/changelog +++ muse-0.8.1a/debian/changelog @@ -1,3 +1,21 @@ +muse (0.8.1a-7.2) unstable; urgency=low + + * Non-maintainer upload. + + [ Alessio Treglia ] + * debian/control, debian/rules: + - Drop LASH support (Closes: #628945). + * debian/rules: + - Do not ship *.la file (Closes: #622424). + * debian/patches/30_gcc46.dpatch: + - Fix FTBFS with gcc-4.6 (Closes: #628949) + + [ Luca Falavigna ] + * debian/patches/30_whole-archive.dpatch: + - Handle --whole-archive as a linker flag. + + -- Luca Falavigna <[email protected]> Sat, 18 Jun 2011 12:45:40 +0200 + muse (0.8.1a-7.1) unstable; urgency=high * Non-maintainer upload. diff -u muse-0.8.1a/debian/patches/00list muse-0.8.1a/debian/patches/00list --- muse-0.8.1a/debian/patches/00list +++ muse-0.8.1a/debian/patches/00list @@ -7,0 +8,2 @@ +30_gcc46.dpatch +30_whole-archive.dpatch only in patch2: unchanged: --- muse-0.8.1a.orig/debian/patches/30_whole-archive.dpatch +++ muse-0.8.1a/debian/patches/30_whole-archive.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_whole-archive.dpatch by Luca Falavigna <[email protected]> +## DP: Handle --whole-archive as a linker flag + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' muse-0.8.1a~/muse/widgets/Makefile.am muse-0.8.1a/muse/widgets/Makefile.am +--- muse-0.8.1a~/muse/widgets/Makefile.am 2004-05-03 22:47:03.000000000 +0200 ++++ muse-0.8.1a/muse/widgets/Makefile.am 2011-06-18 12:45:10.165745290 +0200 +@@ -178,8 +178,8 @@ + checkbox.non-libtool.cpp moc_checkbox.non-libtool.cpp \ + combobox.non-libtool.cpp moc_combobox.non-libtool.cpp + +-musewidgetsplugin_so_LDFLAGS = --whole-archive -fno-exceptions -shared \ +- -Wl,-soname,libmusewidgetsplugin.so.1 $(QT_LIBS) -lasound ++musewidgetsplugin_so_LDFLAGS = -Wl,--whole-archive -fno-exceptions -shared \ ++ -Wl,-soname,libmusewidgetsplugin.so.1 $(QT_LIBS) -lasound -Wl,--no-whole-archive + + musewidgetsplug.o: musewidgetsplug.cpp + $(CXXCOMPILE) -fPIC -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_PLUGIN -c musewidgetsplug.cpp +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' muse-0.8.1a~/muse/widgets/Makefile.in muse-0.8.1a/muse/widgets/Makefile.in +--- muse-0.8.1a~/muse/widgets/Makefile.in 2006-03-27 19:09:42.000000000 +0200 ++++ muse-0.8.1a/muse/widgets/Makefile.in 2011-06-18 12:45:21.937745250 +0200 +@@ -587,8 +587,8 @@ + checkbox.non-libtool.cpp moc_checkbox.non-libtool.cpp \ + combobox.non-libtool.cpp moc_combobox.non-libtool.cpp + +-musewidgetsplugin_so_LDFLAGS = --whole-archive -fno-exceptions -shared \ +- -Wl,-soname,libmusewidgetsplugin.so.1 $(QT_LIBS) -lasound ++musewidgetsplugin_so_LDFLAGS = -Wl,--whole-archive -fno-exceptions -shared \ ++ -Wl,-soname,libmusewidgetsplugin.so.1 $(QT_LIBS) -lasound -Wl,--no-whole-archive + + EXTRA_DIST = ctrlcombo.cw + CLEANFILES = \ only in patch2: unchanged: --- muse-0.8.1a.orig/debian/patches/30_gcc46.dpatch +++ muse-0.8.1a/debian/patches/30_gcc46.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_gcc46.dpatch by Alessio Treglia <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Description: Fix FTBFS with GCC 4.6 +## DP: Author: Alessio Treglia <[email protected]> +## DP: Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628949 +## DP: Forwarded: no + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' muse-0.8.1a~/muse/memory.h muse-0.8.1a/muse/memory.h +--- muse-0.8.1a~/muse/memory.h 2011-06-02 16:40:01.682892186 +0200 ++++ muse-0.8.1a/muse/memory.h 2011-06-02 16:40:01.832892186 +0200 +@@ -12,6 +12,7 @@ + #include <cstdlib> + #include <stdio.h> + #include <map> ++#include <cstddef> + + // most of the following code is based on examples + // from Bjarne Stroustrup: "Die C++ Programmiersprache"
signature.asc
Description: OpenPGP digital signature
