Remove unused library dependencies

diff --git a/debian/changelog b/debian/changelog
index af3b04f..35d711e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ fmit (0.99.2-1) UNRELEASED; urgency=low
   * New upstream version
     - Drop jackd2 patch (fixed upstream)
     - Now builds against Qt4 (Closes: #604517)
+  * Remove unused library dependencies
 
  -- John Wright <jsw@debian.org>  Wed, 28 Dec 2011 16:54:54 -0800
 

diff --git a/debian/control b/debian/control
index 577517d..3454790 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: fmit
 Section: sound
 Priority: optional
 Maintainer: John Wright <jsw@debian.org>
-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
+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
 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-Fix-FTBFS-on-GNU-kFreeBSD.patch b/debian/patches/0001-Fix-FTBFS-on-GNU-kFreeBSD.patch
new file mode 100644 (file)
index 0000000..a39f169
--- /dev/null
+++ b/debian/patches/0001-Fix-FTBFS-on-GNU-kFreeBSD.patch
@@ -0,0 +1,24 @@
+From: Cyril Brulebois <kibi@debian.org>
+Date: Wed, 28 Dec 2011 16:49:34 -0800
+Subject: Fix FTBFS on GNU/kFreeBSD
+
+Add a <cstdlib> 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 <stdlib.h>
+ #include <iostream>
++#include <cstdlib>
+ using namespace std;
+ #include <signal.h>
+ #include <qapplication.h>
+-- 

diff --git a/debian/patches/0001-include-cstdlib.patch b/debian/patches/0001-include-cstdlib.patch
deleted file mode 100644 (file)
index 844db1a..0000000
--- a/debian/patches/0001-include-cstdlib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Cyril Brulebois <kibi@debian.org>.
-Date: Wed, 28 Dec 2011 16:49:34 -0800
-Subject: Fix FTBFS on GNU/kFreeBSD
-
-Add a <cstdlib> 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 <stdlib.h>
- #include <iostream>
-+#include <cstdlib>
- using namespace std;
- #include <signal.h>
- #include <qapplication.h>
--- 

diff --git a/debian/patches/0002-Remove-unused-library-dependencies.patch b/debian/patches/0002-Remove-unused-library-dependencies.patch
new file mode 100644 (file)
index 0000000..bd6e1a4
--- /dev/null
+++ b/debian/patches/0002-Remove-unused-library-dependencies.patch
@@ -0,0 +1,22 @@
+From: John Wright <john@johnwright.org>
+Date: Thu, 29 Dec 2011 00:36:58 -0800
+Subject: Remove unused library dependencies
+
+---
+ src/CMakeLists.txt |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 7a4acd7..8dd37e6 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -53,7 +53,7 @@ ADD_EXECUTABLE(fmit ${fmit_UI_H} ${fmit_SRCS_MOC} ${fmit_SRCS} ${fmit_RESOURCES}
+ TARGET_LINK_LIBRARIES(fmit
+     CppAddons Music
+     fmit_modules
+-    ${QT_LIBRARIES} ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${FFTW3_LIBRARIES}
++    ${QT_LIBRARIES} ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${FFTW3_LIBRARIES}
+     ${ALSA_LIBRARIES}
+     ${PORTAUDIO_LIBRARIES}
+     ${JACK_LIBRARIES}
+-- 

diff --git a/debian/patches/series b/debian/patches/series
index 42e8c76..26169a5 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-0001-include-cstdlib.patch
+0001-Fix-FTBFS-on-GNU-kFreeBSD.patch
+0002-Remove-unused-library-dependencies.patch