Package: tuxguitar
Version: 1.2-9.1
Followup-For: Bug #644921
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
For Debian sid, the attached patch can be applied to achieve the following:
* debian/control: Add xulrunner-7.0 as an alternate dependency to
fix uninstallable package. (Closes: #644921)
* debian/patches/01-tuxguitar-rzr.patch: Handle xulrunner-7.0.
* debian/patches/03-CVE-2010-3385.patch: Refresh/rediff.
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-12-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru tuxguitar-1.2/debian/control tuxguitar-1.2/debian/control
--- tuxguitar-1.2/debian/control 2011-08-11 16:30:01.000000000 -0400
+++ tuxguitar-1.2/debian/control 2011-10-15 22:16:21.000000000 -0400
@@ -12,7 +12,7 @@
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 -Nru tuxguitar-1.2/debian/patches/01-tuxguitar-rzr.patch tuxguitar-1.2/debian/patches/01-tuxguitar-rzr.patch
--- tuxguitar-1.2/debian/patches/01-tuxguitar-rzr.patch 2011-08-11 16:30:01.000000000 -0400
+++ tuxguitar-1.2/debian/patches/01-tuxguitar-rzr.patch 2011-10-15 22:36:27.000000000 -0400
@@ -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 -Nru tuxguitar-1.2/debian/patches/03-CVE-2010-3385.patch tuxguitar-1.2/debian/patches/03-CVE-2010-3385.patch
--- tuxguitar-1.2/debian/patches/03-CVE-2010-3385.patch 2011-08-11 16:30:01.000000000 -0400
+++ tuxguitar-1.2/debian/patches/03-CVE-2010-3385.patch 2011-10-15 22:36:35.000000000 -0400
@@ -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
