[debian-edu-commits] debian-edu/pkg-team/ 01/03: New patch find-fluid.patch to find the fluid binary in unstable.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository lmms.

commit 4d409236269bed2437db25c885ad1b0dfa1eae3d
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Sep 19 21:46:45 2015 +0200

    New patch find-fluid.patch to find the fluid binary in unstable.
---
 debian/patches/find-fluid.patch | 23 +++++++++++++++++++++++
 debian/patches/series           |  1 +
 2 files changed, 24 insertions(+)

diff --git a/debian/patches/find-fluid.patch b/debian/patches/find-fluid.patch
new file mode 100644
index 0000000..731db68
--- /dev/null
+++ b/debian/patches/find-fluid.patch
@@ -0,0 +1,23 @@
+Description: Adjust build system to find the fluid binary
+ For some strange reason, the fluid binary is found in Jessie, but
+ not in Sid 2015-09-19, and this patch adjust the build system to find
+ fluid in both places.
+Author: Petter Reinholdtsen <pere at hungry.com>
+Forwarded: no
+Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
+Last-Update: 2015-09-19
+
+Index: lmms/plugins/zynaddsubfx/CMakeLists.txt
+===================================================================
+--- lmms.orig/plugins/zynaddsubfx/CMakeLists.txt	2015-09-19 18:41:02.000000000 +0000
++++ lmms/plugins/zynaddsubfx/CMakeLists.txt	2015-09-19 18:42:46.244653842 +0000
+@@ -36,6 +36,9 @@
+ 
+ IF(MINGW_PREFIX)
+ 	SET(FLTK_FLUID_EXECUTABLE "${MINGW_PREFIX}/bin/fluid")
++ELSE()
++	SET(FLTK_FLUID_EXECUTABLE "/usr/bin/fluid")
++	# find_program( FLTK_FLUID_EXECUTABLE fluid)
+ ENDIF()
+ 
+ IF(NOT EXISTS ${FLTK_FLUID_EXECUTABLE})
diff --git a/debian/patches/series b/debian/patches/series
index ed51ee0..807af4c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 desktop-argument.patch
+find-fluid.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/lmms.git