102
100
+ ./TuxGuitar-oss/jni/libtuxguitar-oss-jni.so \
103
101
+ ./TuxGuitar-fluidsynth/tuxguitar-fluidsynth.jar \
104
102
+ ./TuxGuitar-fluidsynth/jni/libtuxguitar-fluidsynth-jni.so \
103
+ ./TuxGuitar-jack/tuxguitar-jack.jar \
104
+ ./TuxGuitar-jack/jni/libtuxguitar-jack-jni.so \
107
107
+out_windows?=TuxGuitar-winmm/tuxguitar-winmm.jar
110
+ ./TuxGuitar-CoreAudio/tuxguitar-coreaudio.jar \
111
+ ./TuxGuitar-AudioUnit/tuguitar-audiounit.jar \
112
+ ./TuxGuitar-carbon-integration/tuxguitar-carbon-integration.jar \
113
+ ./TuxGuitar-cocoa-integration/tuxguitar-cocoa-integration.jar \
109
+out_macos?=TuxGuitar-CoreAudio/tuxguitar-coreaudio.jar
116
111
+#all?=${out_java} out_${JNI_OS} ${out_jsa} ${out_sun} # TODO
117
112
+all?=${out_java} ${out_${JNI_OS}} ${out_jsa}
272
267
+ svn co ${scmroot} $@
274
269
+#eof "$Id: Makefile,v 1.19 2008/04/17 20:06:22 rzr Exp $"
270
diff --git a/debian/changelog b/debian/changelog
271
index a727678..5a8af19 100644
272
diff --git a/debian/patches/01-tuxguitar-rzr.patch b/debian/patches/01-tuxguitar-rzr.patch
273
index 792a6b5..8011558 100644
274
diff --git a/misc/tuxguitar.sh b/misc/tuxguitar.sh
275
index b796d4a..4faf3a6 100644
275
276
--- a/misc/tuxguitar.sh
276
277
+++ b/misc/tuxguitar.sh
277
@@ -93,6 +93,8 @@ mozilla_guess_()
280
#@Description: Wrapper script for starting java application tuxguitar
281
###############################################################################
284
[ ! -z $DEBUG ] && set -e
285
[ ! -z $DEBUG ] && set -x
287
@@ -41,16 +41,16 @@ java_guess_()
288
t="/opt/sun-jdk-1.6.0.04/"
289
[ -d "$t" ] && d="$t"
291
-if [ -r /etc/debian_version ]; then
292
- t="/usr/lib/jvm/java-gcj/jre/bin/../../"
293
- [ -d "$t" ] && d="$t"
294
- t="/usr/lib/jvm/java-1.5.0-sun/jre/bin/../../"
295
- [ -d "$t" ] && d="$t"
296
- t="/usr/lib/jvm/java-6-sun/jre/bin/../../"
297
- [ -d "$t" ] && d="$t"
298
- t="/usr/lib/jvm/java-6-openjdk/jre/bin/../../"
299
- [ -d "$t" ] && d="$t"
301
+ if [ -r /etc/debian_version ]; then
302
+ t="/usr/lib/jvm/java-gcj/jre/bin/../../"
303
+ [ -d "$t" ] && d="$t"
304
+ t="/usr/lib/jvm/java-1.5.0-sun/jre/bin/../../"
305
+ [ -d "$t" ] && d="$t"
306
+ t="/usr/lib/jvm/java-6-sun/jre/bin/../../"
307
+ [ -d "$t" ] && d="$t"
308
+ t="/usr/lib/jvm/java-6-openjdk/jre/bin/../../"
309
+ [ -d "$t" ] && d="$t"
312
[ -d "$d" ] && echo "$d"
314
@@ -91,36 +91,49 @@ mozilla_guess_()
278
315
test -r "$t/libxpcom.so" && d="$t"
279
t="/usr/lib/xulrunner-1.9.1"
316
t="/usr/lib/xulrunner-1.9"
280
317
test -r "$t/libxpcom.so" && d="$t"
281
318
+ t="/usr/lib/xulrunner-`xulrunner-1.9.1 --gre-version`"
282
319
+ test -r "$t/libxpcom.so" && d="$t"
320
+ t="/usr/lib/xulrunner-1.9.1"
321
+ test -r "$t/libxpcom.so" && d="$t"
329
+ t="/etc/default/${PACKAGE}/env.sh"
330
+ [ -r "$t" ] && source "$t"
332
+ t="/etc/${PACKAGE}/env.sh"
333
+ [ -r "$t" ] && source "$t"
336
- [ -z ${JAVA_HOME} ] && t=$(java_guess_) && [ -d "$t" ] && JAVA_HOME=$t
337
+ [ -z ${JAVA_HOME} ] && t=$(java_guess_) && [ -d "$t" ] && JAVA_HOME="$t"
338
if [ -d "${JAVA_HOME}" ] ; then
340
- JAVA=${JAVA:=${JAVA_HOME}/jre/bin/java}
341
+ JAVA="${JAVA:=${JAVA_HOME}/jre/bin/java}"
342
[ -x ${JAVA} ] && export JAVA
350
- [ -z ${MOZILLA_FIVE_HOME} ] && t=$(mozilla_guess_) && [ -d "$t" ] && MOZILLA_FIVE_HOME=$t
351
+ [ -z ${MOZILLA_FIVE_HOME} ] \
352
+ && t=$(mozilla_guess_) && [ -d "$t" ] && MOZILLA_FIVE_HOME=$t
353
if [ -d "$MOZILLA_FIVE_HOME" ] ; then
354
export MOZILLA_FIVE_HOME
355
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
356
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME"
358
- echo '$MOZILLA_FIVE_HOME not valid : check doc shipped w/ tuxguitar'
359
+ echo '$MOZILLA_FIVE_HOME not valid : check doc shipped w/ tuxguitar'
362
[ ! -z ${DEBUG} ] && echo "# MOZILLA_FIVE_HOME=${MOZILLA_FIVE_HOME}"
363
[ ! -z ${DEBUG} ] && echo "# JAVA_HOME=${JAVA_HOME}"}
369
local PACKAGE=${PACKAGE:=tuxguitar}
370
@@ -140,11 +153,11 @@ tuxguitar_()
371
[ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t
373
JAVA_FLAGS=${JAVA_FLAGS:="-Xms128m -Xmx128m"}
376
- -Djava.library.path=${PACKAGE_LIB} \
377
- -D${PACKAGE}.share.path=/usr/share/${PACKAGE} \
378
- -cp ${CLASSPATH}:${PACKAGE_CLASSPATH}"
379
+ JAVA_FLAGS=" ${JAVA_FLAGS} \
380
+ -Djava.library.path=${PACKAGE_LIB} \
381
+ -D${PACKAGE}.share.path=/usr/share/${PACKAGE} \
382
+ -cp ${CLASSPATH}:${PACKAGE_CLASSPATH} \
385
[ -z "$1" ] && arg="/usr/share/tuxguitar/tuxguitar.tg"
387
@@ -155,6 +168,7 @@ ${JAVA_FLAGS} \