The following commit has been merged in the master branch: commit da1a87a4d5f5b2081538aa29a839798815307ef5 Author: tony mancill <tmanc...@debian.org> Date: Sun Oct 16 08:43:08 2011 -0700
apply patch for 644921 from Daniel T Chen diff --git a/debian/control b/debian/control index 3d7a167..e8d04f8 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-java/tuxguitar.git Package: tuxguitar Architecture: all Section: sound -Depends: default-jre | java2-runtime, libitext-java, libswt-gtk-3-java, libswt-cairo-gtk-3-jni, libswt-webkit-gtk-3-jni, xulrunner-6.0 | xulrunner-5.0 | xulrunner-1.9.1, ${misc:Depends} +Depends: default-jre | java2-runtime, libitext-java, libswt-gtk-3-java, libswt-cairo-gtk-3-jni, libswt-webkit-gtk-3-jni, xulrunner-7.0 | xulrunner-6.0 | xulrunner-5.0 | xulrunner-1.9.1, ${misc:Depends} Recommends: tuxguitar-alsa (= ${source:Version}), tuxguitar-oss (= ${source:Version}) Suggests: tuxguitar-jsa (= ${source:Version}), lilypond Description: Multitrack guitar tablature editor and player (gp3 to gp5) diff --git a/debian/patches/01-tuxguitar-rzr.patch b/debian/patches/01-tuxguitar-rzr.patch index 33feb7a..1b0fbc4 100644 --- a/debian/patches/01-tuxguitar-rzr.patch +++ b/debian/patches/01-tuxguitar-rzr.patch @@ -1,5 +1,7 @@ ---- /dev/null -+++ b/Makefile +Index: tuxguitar-1.2/Makefile +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ tuxguitar-1.2/Makefile 2011-10-15 22:35:25.000000000 -0400 @@ -0,0 +1,263 @@ +#! /usr/bin/make -f +# -*- makefile -*- @@ -264,8 +266,10 @@ +../${snapshot_dir} ../${release_dir}: + svn co ${scmroot} $@ + ---- a/misc/tuxguitar.sh -+++ b/misc/tuxguitar.sh +Index: tuxguitar-1.2/misc/tuxguitar.sh +=================================================================== +--- tuxguitar-1.2.orig/misc/tuxguitar.sh 2011-10-15 22:35:24.000000000 -0400 ++++ tuxguitar-1.2/misc/tuxguitar.sh 2011-10-15 22:36:20.000000000 -0400 @@ -4,7 +4,7 @@ #@Licence: LGPL #@Description: Wrapper script for starting java application tuxguitar @@ -327,7 +331,7 @@ file -L "$f" >/dev/null 2>&1 || f="" echo "$f" } -@@ -91,36 +94,51 @@ +@@ -91,36 +94,53 @@ test -r "$t/libxpcom.so" && d="$t" t="/usr/lib/xulrunner-1.9" test -r "$t/libxpcom.so" && d="$t" @@ -337,6 +341,8 @@ + 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" echo "$d" } @@ -385,7 +391,7 @@ tuxguitar_() { local PACKAGE=${PACKAGE:=tuxguitar} -@@ -140,11 +158,11 @@ +@@ -140,11 +160,11 @@ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t JAVA_FLAGS=${JAVA_FLAGS:="-Xms128m -Xmx128m"} @@ -402,7 +408,7 @@ local arg="" [ -z "$1" ] && arg="/usr/share/tuxguitar/tuxguitar.tg" # run java -@@ -155,6 +173,7 @@ +@@ -155,6 +175,7 @@ } # main diff --git a/debian/patches/03-CVE-2010-3385.patch b/debian/patches/03-CVE-2010-3385.patch index f0f8aa2..effd52f 100644 --- a/debian/patches/03-CVE-2010-3385.patch +++ b/debian/patches/03-CVE-2010-3385.patch @@ -1,6 +1,8 @@ ---- a/misc/tuxguitar.sh -+++ b/misc/tuxguitar.sh -@@ -126,7 +126,7 @@ +Index: tuxguitar-1.2/misc/tuxguitar.sh +=================================================================== +--- tuxguitar-1.2.orig/misc/tuxguitar.sh 2011-10-15 22:36:20.000000000 -0400 ++++ tuxguitar-1.2/misc/tuxguitar.sh 2011-10-15 22:36:31.000000000 -0400 +@@ -131,7 +131,7 @@ && t=$(mozilla_guess_) && [ -d "$t" ] && MOZILLA_FIVE_HOME=$t if [ -d "$MOZILLA_FIVE_HOME" ] ; then export MOZILLA_FIVE_HOME -- UNNAMED PROJECT _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits