The proposed changes to this package are unsuitable for Debian. Firstly, abrowser does not exist in Debian (the equivalent virtual package in Debian is www-browser), and in any case Tuxguitar appears to depend specifically on Mozilla derivatives. Secondly, the package dependencies and documentation still favour Sun JDK over OpenJDK, which is not acceptable in main.
Also, the diff included a HotSpot error dump. Please use debdiff to
sanity-check the changes you make in a source package before uploading
it.
Here are the changes I propose. Please let me know whether I should
upload with these changes.
Ben.
diff -Nru tuxguitar-1.0/debian/changelog tuxguitar-1.0.dak/debian/changelog
--- tuxguitar-1.0/debian/changelog 2008-12-09 01:29:07.000000000 +0000
+++ tuxguitar-1.0.dak/debian/changelog 2008-12-09 01:29:07.000000000 +0000
@@ -1,3 +1,19 @@
+tuxguitar (1.0.dak-1) unstable; urgency=low
+
+ [ Philippe Coval ]
+ * debian/control ; debian/rules :
+ - set to main since openjdk supports sound (Closes: #505612)
+ - uses ${shlibs:Depends} vs hardcoded libs (Closes: #506883)
+ - depends on at least xulrunner for browsing doc (Closes: #493557)
+
+ [ Ben Hutchings ]
+ * Move virtual packages to end of dependency alternations
+ * Move OpenJDK dependencies to start of dependency alternations
+ * Replace recommendation of Sun JVM with OpenJDK
+ * Fix "2<" to "2>" in postinst and postrm
+
+ -- Ben Hutchings <[EMAIL PROTECTED]> Tue, 09 Dec 2008 01:08:11 +0000
+
tuxguitar (1.0-1) unstable; urgency=low
* New upstream release (Closes: #481728) also (LP: #176979, #212207)
diff -Nru tuxguitar-1.0/debian/control tuxguitar-1.0.dak/debian/control
--- tuxguitar-1.0/debian/control 2008-12-09 01:29:07.000000000 +0000
+++ tuxguitar-1.0.dak/debian/control 2008-12-09 01:29:07.000000000 +0000
@@ -1,19 +1,19 @@
Source: tuxguitar
-Section: contrib/sound
+Section: sound
Priority: optional
Maintainer: Philippe Coval <[EMAIL PROTECTED]>
Uploaders: tony mancill <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), docbook-to-man , docbook-utils, ant,
java-gcj-compat-dev | java-compiler | sun-java6-jdk | sun-java5-jdk |
openjdk-6-jdk | icedtea-java7-jdk , gcj, java-gcj-compat-dev,
libswt3.2-gtk-java, libitext-java, libasound2-dev, libfluidsynth-dev
+Build-Depends: debhelper (>= 5.0.0), docbook-to-man, docbook-utils, ant,
openjdk-6-jdk | icedtea-java7-jdk | sun-java6-jdk | sun-java5-jdk |
java-compiler, gcj, java-gcj-compat-dev, libswt-gtk-3.4-java |
libswt3.2-gtk-java, libitext-java, libasound2-dev, libfluidsynth-dev
Standards-Version: 3.8.0
Homepage: http://www.tuxguitar.com.ar
-XS-Vcs-svn: https://tuxguitar.svn.sourceforge.net/svnroot/tuxguitar/trunk
+XS-Vcs-svn: svn://tuxguitar.svn.sourceforge.net/svnroot/tuxguitar/trunk
XS-Vcs-Browser: https://tuxguitar.svn.sourceforge.net/svnroot/tuxguitar/trunk
Package: tuxguitar
Architecture: all
-Section: contrib/sound
-Depends: java-gcj-compat | sun-java6-jre | sun-java5-jre |
java-virtual-machine , libswt3.2-gtk-java, libitext-java
-Recommends: tuxguitar-alsa (= ${source:Version}), tuxguitar-oss (=
${source:Version}), iceweasel | firefox
+Section: sound
+Depends: openjdk-6-jre | java-gcj-compat | sun-java6-jre | sun-java5-jre |
java-virtual-machine, libitext-java, libswt-gtk-3.4-java | libswt3.2-gtk-java,
libswt-cairo-gtk-3.4-jni | libswt3.2-gtk-java , libswt-mozilla-gtk-3.4-jni |
libswt3.2-gtk-java , xulrunner-1.9
+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)
TuxGuitar is a multitrack Guitar tablature editor and player.
@@ -21,25 +21,25 @@
Package: tuxguitar-jsa
Architecture: all
-Section: contrib/sound
-Depends: tuxguitar (= ${source:Version}), sun-java6-jre | sun-java5-jre
+Section: sound
+Depends: tuxguitar (= ${source:Version}), openjdk-6-jre | sun-java6-jre |
sun-java5-jre
Description: tuxguitar plugin for sound playback using Java Sound API
Use Tuxguitar along this plugin if unsure, other sounds can be used too.
Package: tuxguitar-alsa
Architecture: any
-Section: contrib/sound
-Depends: tuxguitar (= ${source:Version}), libasound2, libc6
-Suggests: timidity, fluidsynth
+Section: sound
+Depends: ${shlibs:Depends}, tuxguitar (= ${source:Version})
+Suggests: timidity
Description: tuxguitar plugin for sound playback using ALSA
Use Tuxguitar along this plugin if your Sound Device is supported by ALSA.
A MIDI expander is required (Hardware or Software).
Package: tuxguitar-oss
Architecture: any
-Section: contrib/sound
-Depends: tuxguitar (= ${source:Version}), oss-compat, libc6
-Suggests: timidity, fluidsynth
+Section: sound
+Depends: ${shlibs:Depends}, tuxguitar (= ${source:Version}), oss-compat
+Suggests: timidity
Priority: extra
Description: tuxguitar plugin for sound playback using OSS
Use Tuxguitar along this plugin if your Sound Device is supported by OSS.
@@ -47,8 +47,8 @@
Package: tuxguitar-fluidsynth
Architecture: any
-Section: contrib/sound
-Depends: tuxguitar (= ${source:Version}), oss-compat, libc6, fluidsynth
+Section: sound
+Depends: ${shlibs:Depends}, tuxguitar (= ${source:Version}), fluidsynth
Priority: extra
Description: tuxguitar plugin for sound playback using fluidsynth
Use Tuxguitar along this plugin if your audio system is configured for
diff -Nru tuxguitar-1.0/debian/README.Debian
tuxguitar-1.0.dak/debian/README.Debian
--- tuxguitar-1.0/debian/README.Debian 2008-12-09 01:29:07.000000000 +0000
+++ tuxguitar-1.0.dak/debian/README.Debian 2008-12-09 01:29:07.000000000
+0000
@@ -1,12 +1,13 @@
tuxguitar for Debian
--------------------
+The recommended JVM is OpenJDK because of its sound support (JSA).
+
+ -- Ben Hutchings <[EMAIL PROTECTED]> Tue, 09 Dec 2008 01:04:46 +0000
+
The package has been splited into several part, the core is still tuxguitar
but the sound plugins are optional.
-Sun Java 6 is recommanded JVM (because of the JSA plugin), but other ones may
-be supported too.
-
Note that, other JSA Sound banks can be downloaded at :
http://java.sun.com/products/java-media/sound/soundbanks.html
diff -Nru tuxguitar-1.0/debian/rules tuxguitar-1.0.dak/debian/rules
--- tuxguitar-1.0/debian/rules 2008-12-09 01:29:07.000000000 +0000
+++ tuxguitar-1.0.dak/debian/rules 2008-12-09 01:29:07.000000000 +0000
@@ -62,6 +62,7 @@
# dh_link
dh_compress
dh_fixperms
+ dh_shlibdeps
dh_installdeb
dh_gencontrol
dh_md5sums
diff -Nru tuxguitar-1.0/debian/tuxguitar.postinst
tuxguitar-1.0.dak/debian/tuxguitar.postinst
--- tuxguitar-1.0/debian/tuxguitar.postinst 2008-12-09 01:29:07.000000000
+0000
+++ tuxguitar-1.0.dak/debian/tuxguitar.postinst 2008-12-09 01:29:07.000000000
+0000
@@ -5,10 +5,10 @@
if [ -x "`which update-menus 2>/dev/null`" ]; then
update-menus
fi
- if [ -x "`which update-mime-database 2</dev/null`" ]; then
+ if [ -x "`which update-mime-database 2>/dev/null`" ]; then
update-mime-database /usr/share/mime
fi
- if [ -x "`which update-desktop-database 2</dev/null`" ]; then
+ if [ -x "`which update-desktop-database 2>/dev/null`" ]; then
update-desktop-database -q
fi
fi
diff -Nru tuxguitar-1.0/debian/tuxguitar.postrm
tuxguitar-1.0.dak/debian/tuxguitar.postrm
--- tuxguitar-1.0/debian/tuxguitar.postrm 2008-12-09 01:29:07.000000000
+0000
+++ tuxguitar-1.0.dak/debian/tuxguitar.postrm 2008-12-09 01:29:07.000000000
+0000
@@ -4,10 +4,10 @@
if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi
if [ "$1" = "remove" ]; then
- if [ -x "`which update-mime-database 2</dev/null`" ]; then
+ if [ -x "`which update-mime-database 2>/dev/null`" ]; then
update-mime-database /usr/share/mime
fi
- if [ -x "`which update-desktop-database 2</dev/null`" ]; then
+ if [ -x "`which update-desktop-database 2>/dev/null`" ]; then
update-desktop-database -q
fi
fi
diff -Nru tuxguitar-1.0/Makefile tuxguitar-1.0.dak/Makefile
--- tuxguitar-1.0/Makefile 2008-06-18 19:15:04.000000000 +0100
+++ tuxguitar-1.0.dak/Makefile 2008-12-09 01:29:07.000000000 +0000
@@ -15,7 +15,8 @@
ITEXT_JAR?=/usr/share/java/itext.jar
SWT_JAR?=$(shell echo ` \
- ( t=/usr/share/java/swt.jar && test -r "$$t" && echo $$t ) \
+ ( t=/usr/share/java/swt-gtk-3.4.jar && test -r "$$t" && echo $$t ) \
+ || ( t=/usr/share/java/swt.jar && test -r "$$t" && echo $$t ) \
|| ( t=/usr/lib/java/swt.jar && test -r "$$t" && echo $$t ) \
|| ( t=/etc/alternatives/swt.jar && test -r "$$t" && echo $$t ) \
` )
diff -Nru tuxguitar-1.0/misc/tuxguitar.sh tuxguitar-1.0.dak/misc/tuxguitar.sh
--- tuxguitar-1.0/misc/tuxguitar.sh 2008-06-18 19:09:11.000000000 +0100
+++ tuxguitar-1.0.dak/misc/tuxguitar.sh 2008-12-09 01:29:07.000000000 +0000
@@ -4,7 +4,7 @@
[EMAIL PROTECTED]: LGPL
[EMAIL PROTECTED]: Wrapper script for starting java application tuxguitar
###############################################################################
-
+PACKAGE=tuxguitar
[ ! -z $DEBUG ] && set -e
[ ! -z $DEBUG ] && set -x
@@ -44,12 +44,12 @@
if [ -r /etc/debian_version ]; then
t="/usr/lib/jvm/java-gcj/jre/bin/../../"
[ -d "$t" ] && d="$t"
- t="/usr/lib/jvm/java-6-openjdk/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
[ -d "$d" ] && echo "$d"
@@ -65,9 +65,11 @@
[ -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" || f=""
+ file -L "$f" >/dev/null 2>&1 || f=""
echo "$f"
}
@@ -77,14 +79,22 @@
{
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"
echo "$d"
}
-#
+#
env_()
{
# java
--- END ---
--
Ben Hutchings
All extremists should be taken out and shot.
signature.asc
Description: This is a digitally signed message part
