[debian-edu-commits] debian-edu/pkg-team/ 01/01: Replace find-fluid.patch with one from upstream.

[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 1fe23fdbc73ad676e56182263a4823477fc8bd73
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Sep 19 22:35:26 2015 +0200

    Replace find-fluid.patch with one from upstream.
    
    Git-Dch: ignore
---
 debian/patches/find-fluid.patch | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/debian/patches/find-fluid.patch b/debian/patches/find-fluid.patch
index 731db68..b94f707 100644
--- a/debian/patches/find-fluid.patch
+++ b/debian/patches/find-fluid.patch
@@ -1,23 +1,27 @@
 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
+ fluid in both places.  The patch was fetched from upstream git, commit
+ cfbd53fb504e6366aedfd365ef1d53644f1aefa3.
+Author: Tres Finocchiaro
+Forwarded: not-needed
 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)
+--- lmms.orig/plugins/zynaddsubfx/CMakeLists.txt	2015-09-19 22:28:25.791189157 +0200
++++ lmms/plugins/zynaddsubfx/CMakeLists.txt	2015-09-19 22:29:12.707441124 +0200
+@@ -39,7 +39,11 @@
  ENDIF()
  
  IF(NOT EXISTS ${FLTK_FLUID_EXECUTABLE})
+-	MESSAGE(FATAL_ERROR "Please install the fluid binary which is part of FLTK.")
++	# Try to detect full path anyway
++	EXECUTE_PROCESS(COMMAND which fluid OUTPUT_VARIABLE FLTK_FLUID_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE)
++	IF(NOT EXISTS ${FLTK_FLUID_EXECUTABLE})
++		MESSAGE(FATAL_ERROR "Please install the fluid binary which is part of FLTK.")
++	ENDIF()
+ ENDIF()
+ 
+ INCLUDE_DIRECTORIES("${FLTK_INCLUDE_DIR}"

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