From 3f5f7158bffa2b79476108b70ce5a90fdbf5a5f1 Mon Sep 17 00:00:00 2001 From: John Wright Date: Wed, 28 Dec 2011 16:55:40 -0800 Subject: [PATCH] Update packaging for new upstream version - Rebase patches, dropping the jackd2 patch - Update build dependencies --- debian/changelog | 8 ++++++++ debian/control | 2 +- debian/patches/0001-include-cstdlib.patch | 24 ++++++++++++++++++++++++ debian/patches/include-cstdlib.patch | 15 --------------- debian/patches/jackd2.patch | 18 ------------------ debian/patches/series | 3 +-- debian/rules | 8 ++++---- 7 files changed, 38 insertions(+), 40 deletions(-) create mode 100644 debian/patches/0001-include-cstdlib.patch delete mode 100644 debian/patches/include-cstdlib.patch delete mode 100644 debian/patches/jackd2.patch diff --git a/debian/changelog b/debian/changelog index 052c2ed..af3b04f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +fmit (0.99.2-1) UNRELEASED; urgency=low + + * New upstream version + - Drop jackd2 patch (fixed upstream) + - Now builds against Qt4 (Closes: #604517) + + -- John Wright Wed, 28 Dec 2011 16:54:54 -0800 + fmit (0.97.7-3) unstable; urgency=low * Change Build-Depends on fftw3-dev to libfftw3-dev, to avoid depending diff --git a/debian/control b/debian/control index c8abc7c..577517d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: fmit Section: sound Priority: optional Maintainer: John Wright -Build-Depends: debhelper (>= 7.0.50), autotools-dev, libqt3-mt-dev, libfftw3-dev, freeglut3-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libjack-dev +Build-Depends: debhelper (>= 7.0.50), cmake, libqt4-dev, libqt4-opengl-dev, libfftw3-dev, freeglut3-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libjack-dev, libxmu-dev, libxi-dev Standards-Version: 3.8.4 Homepage: http://home.gna.org/fmit/ Vcs-Git: git://git.johnwright.org/git/fmit.git diff --git a/debian/patches/0001-include-cstdlib.patch b/debian/patches/0001-include-cstdlib.patch new file mode 100644 index 0000000..844db1a --- /dev/null +++ b/debian/patches/0001-include-cstdlib.patch @@ -0,0 +1,24 @@ +From: Cyril Brulebois . +Date: Wed, 28 Dec 2011 16:49:34 -0800 +Subject: Fix FTBFS on GNU/kFreeBSD + +Add a include (for exit) to src/main.cc. + +Closes: #542540 +--- + src/main.cpp | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/src/main.cpp b/src/main.cpp +index c841ef4..b3f662a 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -21,6 +21,7 @@ + + #include + #include ++#include + using namespace std; + #include + #include +-- diff --git a/debian/patches/include-cstdlib.patch b/debian/patches/include-cstdlib.patch deleted file mode 100644 index 2ec7a01..0000000 --- a/debian/patches/include-cstdlib.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fix FTBFS on GNU/kFreeBSD (Closes: #542540): - -Add a include (for exit) to src/main.cc. Patch from -Cyril Brulebois . - ---- fmit-0.97.7.orig/src/main.cpp -+++ fmit-0.97.7/src/main.cpp -@@ -20,6 +20,7 @@ - #include "config.h" - - #include -+#include - using namespace std; - #include - #include diff --git a/debian/patches/jackd2.patch b/debian/patches/jackd2.patch deleted file mode 100644 index ea60374..0000000 --- a/debian/patches/jackd2.patch +++ /dev/null @@ -1,18 +0,0 @@ -The use of jack_error_callback in current fmit code is... erm, useless, -as it just says "Use the default", which is also used if nothing is -specified. - -Patch from Adrian Knoth . - -diff --git a/src/CaptureThread.cpp b/src/CaptureThread.cpp -index 5c6f86b..6eae124 100644 ---- a/src/CaptureThread.cpp -+++ b/src/CaptureThread.cpp -@@ -877,7 +877,6 @@ void CaptureThreadImplJACK::capture_init() - - jack_set_process_callback(m_jack_client, JackProcess, (void*)this); - jack_on_shutdown(m_jack_client, JackShutdown, (void*)this); -- jack_set_error_function(jack_error_callback); - jack_set_sample_rate_callback(m_jack_client, JackSampleRate, (void*)this); - - int err=0; diff --git a/debian/patches/series b/debian/patches/series index 3fdfb3a..42e8c76 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -include-cstdlib.patch -jackd2.patch +0001-include-cstdlib.patch diff --git a/debian/rules b/debian/rules index c7ce458..7a2162a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,17 +1,17 @@ #!/usr/bin/make -f # Disable Alsa on non-Linux architectures -ifneq (,$(findstring $(DEB_HOST_ARCH_OS), kfreebsd hurd)) - DEB_CONFIGURE_ALSA = --disable-alsa +ifneq (linux,$(DEB_HOST_ARCH_OS)) + DEB_CONFIGURE_ALSA = -DSOUNDSYSTEM_USE_ALSA=OFF else - DEB_CONFIGURE_ALSA = --enable-alsa + DEB_CONFIGURE_ALSA = -DSOUNDSYSTEM_USE_ALSA=ON endif %: dh $@ override_dh_auto_configure: - dh_auto_configure -- --with-Qt-dir=/usr/share/qt3 $(DEB_CONFIGURE_ALSA) + dh_auto_configure -- $(DEB_CONFIGURE_ALSA) override_dh_auto_build: # This file gets regenerated. Make sure we can end up with the -- 1.7.10.4