[tuxguitar] 01/03: drop dependency on xulrunner; clean up tuxguitar.sh
Tony Mancill
tmancill at moszumanska.debian.org
Thu Jun 19 04:32:24 UTC 2014
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository tuxguitar.
commit 30da5e1c20a0ed69b1fab7beed3c8c432f06d523
Author: tony mancill <tmancill at debian.org>
Date: Wed Jun 18 21:13:51 2014 -0700
drop dependency on xulrunner; clean up tuxguitar.sh
---
debian/control | 1 -
debian/patches/05-drop_xulrunner.patch | 146 +++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 11 +--
4 files changed, 148 insertions(+), 11 deletions(-)
diff --git a/debian/control b/debian/control
index c7d2b97..2f6653c 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,6 @@ Depends: default-jre | java2-runtime,
libswt-gtk-3-java,
libswt-cairo-gtk-3-jni,
libswt-webkit-gtk-3-jni,
- ${xulrunner:Depends},
${misc:Depends}
Recommends: tuxguitar-alsa (= ${source:Version}), tuxguitar-oss (= ${source:Version})
Suggests: tuxguitar-jsa (= ${source:Version}), lilypond
diff --git a/debian/patches/05-drop_xulrunner.patch b/debian/patches/05-drop_xulrunner.patch
new file mode 100644
index 0000000..7f49d47
--- /dev/null
+++ b/debian/patches/05-drop_xulrunner.patch
@@ -0,0 +1,146 @@
+--- a/misc/tuxguitar.sh
++++ b/misc/tuxguitar.sh
+@@ -8,110 +8,22 @@
+ [ ! -z $DEBUG ] && set -e
+ [ ! -z $DEBUG ] && set -x
+
+-#/// guess JAVA_HOME if undefined
+-java_guess_()
+-{
+- d="/opt/java/"
+- [ -d "$t" ] && d="$t"
+- d="/usr/local/opt/java/"
+- [ -d "$t" ] && d="$t"
+-# windows
+- t="C:\\Program\ Files\\Java\\jre1.6.0_03/"
+- [ -d "$t" ] && d="$t"
+- t="\\Program\ Files\\Java\\jre1.6.0_03/"
+- [ -d "$t" ] && d="$t"
+- t="/Program\ Files/Java/jre1.6.0_03/"
+- [ -d "$t" ] && d="$t"
+-# macosx
+- t="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home/"
+- [ -d "$t" ] && d="$t"
+-# opensuse
+- t="/etc/profile.d/alljava.sh"
+- [ -r $t ] && . $t && echo ${JAVA_HOME} && return
+- t="/usr/lib/jvm/java"
+- [ -d "$t" ] && d="$t"
+- t="/usr/lib64/jvm/java"
+- [ -d "$t" ] && d="$t"
+-# mandriva
+- t="/usr/lib/jvm/jre-1.6.0-sun/bin/../"
+- [ -d "$t" ] && d="$t"
+-# gentoo
+- t="/opt/sun-jdk-1.5.0.14/"
+- [ -d "$t" ] && d="$t"
+- t="/opt/sun-jdk-1.6.0.04/"
+- [ -d "$t" ] && d="$t"
+-# debian
+- if [ -r /etc/debian_version ]; then
+- t="/usr/lib/jvm/java-gcj/jre/bin/../../"
+- [ -d "$t" ] && d="$t"
+- t="/usr/lib/jvm/java-1.5.0-sun/jre/bin/../../"
+- [ -d "$t" ] && d="$t"
+- t="/usr/lib/jvm/java-6-sun/jre/bin/../../"
+- [ -d "$t" ] && d="$t"
+- t="/usr/lib/jvm/java-6-openjdk/jre/bin/../../"
+- [ -d "$t" ] && d="$t"
+- fi
++# TODO: use javahelper on Debian to find JRE
+ # results
+- [ -d "$d" ] && echo "$d"
+-}
++# [ -d "$d" ] && echo "$d"
+
+ # last match wins (no short-circuit evaluation)
++# TODO: use javaHelper to find swt.jar
+ swt_guess_()
+ {
+- t="/usr/lib/eclipse/plugins/org.eclipse.swt.gtk.linux.*.jar"
+- [ -r "$t" ] && f="$t"
+- t="/usr/lib/java/swt3.2-gtk.jar"
+- [ -r "$t" ] && f="$t"
+- t="/usr/share/java/swt-gtk-3.4.jar"
+- [ -r "$t" ] && f="$t"
+- t="/usr/lib/java/swt-gtk-3.5.1.jar"
+- [ -r "$t" ] && f="$t"
+ t="/etc/alternatives/swt.jar"
+ [ -r "$t" ] && f="$t"
+ t="/usr/share/java/swt.jar"
+ [ -r "$t" ] && f="$t"
+- t="/usr/lib/java/swt.jar"
+- [ -r "$t" ] && f="$t"
+ file -L "$f" >/dev/null 2>&1 || f=""
+ echo "$f"
+ }
+
+-#/// org.eclipse.swt.SWTError: No more handles
+-#/// [Unknown Mozilla path (MOZILLA_FIVE_HOME not set)]
+-mozilla_guess_()
+-{
+- t="/usr/lib/mozilla"
+- test -r "$t/libxpcom.so" && d="$t"
+- t="/usr/lib/iceape/"
+- test -r "$t/libxpcom.so" && d="$t"
+- t="/usr/lib/icedove/"
+- test -r "$t/libxpcom.so" && d="$t"
+- t="/usr/lib/firefox/"
+- test -r "$t/libxpcom.so" && d="$t"
+- t="/usr/lib/iceweasel"
+- test -r "$t/libxpcom.so" && d="$t"
+- t="/usr/lib/xulrunner"
+- test -r "$t/libxpcom.so" && d="$t"
+- t="/usr/lib/xulrunner-1.9"
+- test -r "$t/libxpcom.so" && d="$t"
+- t="/usr/lib/xulrunner-1.9.1"
+- test -r "$t/libxpcom.so" && d="$t"
+- t="/usr/lib/xulrunner-5.0"
+- test -r "$t/libxpcom.so" && d="$t"
+- t="/usr/lib/xulrunner-6.0"
+- test -r "$t/libxpcom.so" && d="$t"
+- t="/usr/lib/xulrunner-7.0"
+- test -r "$t/libxpcom.so" && d="$t"
+- t="/usr/lib/xulrunner-10.0"
+- test -r "$t/libxpcom.so" && d="$t"
+- t="/usr/lib/xulrunner-17.0"
+- test -r "$t/libxpcom.so" && d="$t"
+- t="/usr/lib/xulrunner-21.0"
+- test -r "$t/libxpcom.so" && d="$t"
+- echo "$d"
+-}
+-
+-
+ #
+ env_()
+ {
+@@ -122,7 +34,6 @@
+ [ -r "$t" ] && . "$t"
+
+ # java
+- [ -z ${JAVA_HOME} ] && t=$(java_guess_) && [ -d "$t" ] && JAVA_HOME="$t"
+ if [ -d "${JAVA_HOME}" ] ; then
+ export JAVA_HOME
+ JAVA="${JAVA:=${JAVA_HOME}/jre/bin/java}"
+@@ -132,21 +43,9 @@
+ export JAVA
+ fi
+
+-# mozilla
+- [ -z ${MOZILLA_FIVE_HOME} ] \
+- && t=$(mozilla_guess_) && [ -d "$t" ] && MOZILLA_FIVE_HOME=$t
+- if [ -d "$MOZILLA_FIVE_HOME" ] ; then
+- export MOZILLA_FIVE_HOME
+- export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$MOZILLA_FIVE_HOME"
+- else
+- echo '$MOZILLA_FIVE_HOME not valid : check doc shipped w/ tuxguitar'
+- fi
+-
+- [ ! -z ${DEBUG} ] && echo "# MOZILLA_FIVE_HOME=${MOZILLA_FIVE_HOME}"
+ [ ! -z ${DEBUG} ] && echo "# JAVA_HOME=${JAVA_HOME}"}
+ }
+
+-
+ tuxguitar_()
+ {
+ local PACKAGE=${PACKAGE:=tuxguitar}
diff --git a/debian/patches/series b/debian/patches/series
index 81fba27..ea47148 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
02-desktop.patch
03-CVE-2010-3385.patch
04-hardening-cppflags.patch
+05-drop_xulrunner.patch
diff --git a/debian/rules b/debian/rules
index 1ecbba2..a5af9ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,12 +12,6 @@ export JAVAC JAVA JAVA_HOME
DEB_DESTDIR?=${CURDIR}/debian/${MAINPACKAGE}
DEB_DESTDIR_TMP?=${CURDIR}/debian/tmp/${MAINPACKAGE}
-ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
- XULRUNNERDEPENDS = -Vxulrunner:Depends=""
-else
- XULRUNNERDEPENDS = -Vxulrunner:Depends="xulrunner-29 | xulrunner-24.0 | xulrunner-17.0 | xulrunner-10.0 | xulrunner-1.9.1"
-endif
-
# build flags for hardening
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
@@ -51,9 +45,6 @@ install: build
${MAKE} $@-linux DESTDIR=${DEB_DESTDIR_TMP}
install -d ${DEB_DESTDIR}/usr/bin/
rm -vf ${DEB_DESTDIR}/usr/share/tuxguitar/doc/LICENSE
-ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
- sed -i -e '/^# mozilla$$/,/\}$$/ d' ${DEB_DESTDIR}/usr/bin/tuxguitar
-endif
dh_install
binary-common:
@@ -70,7 +61,7 @@ binary-common:
dh_fixperms
dh_shlibdeps
dh_installdeb
- dh_gencontrol -- $(XULRUNNERDEPENDS)
+ dh_gencontrol
dh_md5sums
dh_builddeb
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tuxguitar.git
More information about the pkg-java-commits
mailing list