This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tuxguitar.
commit c5992c5ba700538454d1e3bb13487996144ff876
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Thu Oct 19 22:37:25 2017 +0200
Simplified the patches
---
debian/changelog | 7 +++
debian/patches/01-tuxguitar-rzr.patch | 96 +++-------------------------------
debian/patches/03-CVE-2010-3385.patch | 4 +-
debian/patches/05-drop_xulrunner.patch | 67 ++++++------------------
4 files changed, 31 insertions(+), 143 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 091b512..97c4340 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tuxguitar (1.2-23) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Simplified the patches
+
+ -- Emmanuel Bourg <ebo...@apache.org> Thu, 19 Oct 2017 22:02:45 +0200
+
tuxguitar (1.2-22) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/01-tuxguitar-rzr.patch
b/debian/patches/01-tuxguitar-rzr.patch
index 03a31a3..56b20a5 100644
--- a/debian/patches/01-tuxguitar-rzr.patch
+++ b/debian/patches/01-tuxguitar-rzr.patch
@@ -275,31 +275,7 @@
[ ! -z $DEBUG ] && set -e
[ ! -z $DEBUG ] && set -x
-@@ -41,34 +41,37 @@
- 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
-+ 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
- # results
+@@ -55,6 +55,7 @@
[ -d "$d" ] && echo "$d"
}
@@ -307,48 +283,7 @@
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"
-- t="/usr/share/java/swt-gtk-3.4.jar"
-- [ -r "$t" ] && f="$t"
-- t="/usr/lib/java/swt3.2-gtk.jar"
-- [ -r "$t" ] && f="$t"
- file -L "$f" >/dev/null 2>&1 || f=""
- echo "$f"
- }
-@@ -91,36 +94,59 @@
- 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"
- }
-
-+
+@@ -97,11 +98,17 @@
#
env_()
{
@@ -368,10 +303,9 @@
[ -x ${JAVA} ] && export JAVA
else
JAVA=${JAVA:=java}
- export JAVA
+@@ -109,10 +116,11 @@
fi
--
-+
+
# mozilla
- [ -z ${MOZILLA_FIVE_HOME} ] && t=$(mozilla_guess_) && [ -d "$t" ] &&
MOZILLA_FIVE_HOME=$t
+ [ -z ${MOZILLA_FIVE_HOME} ] \
@@ -381,19 +315,9 @@
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME"
else
-- echo '$MOZILLA_FIVE_HOME not valid : check doc shipped w/ tuxguitar'
-+ echo '$MOZILLA_FIVE_HOME not valid : check doc shipped w/ tuxguitar'
+ 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}
-@@ -140,11 +166,11 @@
+@@ -140,11 +148,11 @@
[ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t
JAVA_FLAGS=${JAVA_FLAGS:="-Xms128m -Xmx128m"}
@@ -410,11 +334,3 @@
local arg=""
[ -z "$1" ] && arg="/usr/share/tuxguitar/tuxguitar.tg"
# run java
-@@ -155,6 +181,7 @@
- }
-
- # main
-+
- env_
- tuxguitar_ "$@"
-
diff --git a/debian/patches/03-CVE-2010-3385.patch
b/debian/patches/03-CVE-2010-3385.patch
index b3072f3..a725e70 100644
--- a/debian/patches/03-CVE-2010-3385.patch
+++ b/debian/patches/03-CVE-2010-3385.patch
@@ -1,11 +1,11 @@
--- a/misc/tuxguitar.sh
+++ b/misc/tuxguitar.sh
-@@ -137,7 +137,7 @@
+@@ -120,7 +120,7 @@
&& 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:$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'
+ echo '$MOZILLA_FIVE_HOME not valid : check doc shipped w/ tuxguitar'
fi
diff --git a/debian/patches/05-drop_xulrunner.patch
b/debian/patches/05-drop_xulrunner.patch
index 7f49d47..f22f42c 100644
--- a/debian/patches/05-drop_xulrunner.patch
+++ b/debian/patches/05-drop_xulrunner.patch
@@ -1,6 +1,6 @@
--- a/misc/tuxguitar.sh
+++ b/misc/tuxguitar.sh
-@@ -8,110 +8,22 @@
+@@ -8,52 +8,9 @@
[ ! -z $DEBUG ] && set -e
[ ! -z $DEBUG ] && set -x
@@ -37,16 +37,16 @@
- 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
+-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"
@@ -54,24 +54,8 @@
+# [ -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=""
+@@ -74,27 +31,6 @@
echo "$f"
}
@@ -93,28 +77,13 @@
- 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 @@
+@@ -105,7 +41,6 @@
[ -r "$t" ] && . "$t"
# java
@@ -122,10 +91,10 @@
if [ -d "${JAVA_HOME}" ] ; then
export JAVA_HOME
JAVA="${JAVA:=${JAVA_HOME}/jre/bin/java}"
-@@ -132,21 +43,9 @@
+@@ -115,17 +50,6 @@
export JAVA
fi
-
+
-# mozilla
- [ -z ${MOZILLA_FIVE_HOME} ] \
- && t=$(mozilla_guess_) && [ -d "$t" ] && MOZILLA_FIVE_HOME=$t
@@ -133,14 +102,10 @@
- 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'
+- 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}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/tuxguitar.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
