[pkg-java] r10951 - trunk/jlgui/debian

[Niels Thykier]

Author: nthykier-guest
Date: 2009-10-28 10:46:16 +0000 (Wed, 28 Oct 2009)
New Revision: 10951

Modified:
   trunk/jlgui/debian/README.Debian
   trunk/jlgui/debian/changelog
   trunk/jlgui/debian/compat
   trunk/jlgui/debian/control
   trunk/jlgui/debian/jlgui.sh
Log:
Removed useless workaround for tritonus; added alternative to openjdk; added missing depends for ogg-support.

Modified: trunk/jlgui/debian/README.Debian
===================================================================
--- trunk/jlgui/debian/README.Debian	2009-10-28 09:57:14 UTC (rev 10950)
+++ trunk/jlgui/debian/README.Debian	2009-10-28 10:46:16 UTC (rev 10951)
@@ -1,8 +1,5 @@
-The newest tritonus library that is packaged for Debian is not fully compatible
-with jlgui. You need to download an older binary only jar file if you want to
-play ogg/vorbis files. Please execute the following commands as root:
+With minimal testing, gcj(4:4.4.1-1ubuntu2) does not work in all cases.
+Some of the functions do work but not all,
+and therefore it is not recommended to use gcj.
 
-mkdir /var/spool/jlgui
-cd /var/spool/jlgui
-wget http://bollin.googlecode.com/files/tritonus_share.jar
-
+ -- Niels Thykier <niels at thykier.net>  Wed, 28 Oct 2009 10:43:01 +0100

Modified: trunk/jlgui/debian/changelog
===================================================================
--- trunk/jlgui/debian/changelog	2009-10-28 09:57:14 UTC (rev 10950)
+++ trunk/jlgui/debian/changelog	2009-10-28 10:46:16 UTC (rev 10951)
@@ -11,6 +11,10 @@
     - correct reference to LGPL-2
     - corrected copyright symbol
   * Removed suggest on java-virtual-machine.
+  * Removed a workaround for tritonus since it is no longer relevant.
+  * Added java6-runtime as an alternative for openjdk.
+  * Updated README.Debian.
+  * Added missing dependency to get support for ogg-files.
 
  -- Niels Thykier <niels at thykier.net>  Sat, 24 Oct 2009 21:29:01 +0200
 

Modified: trunk/jlgui/debian/compat
===================================================================
--- trunk/jlgui/debian/compat	2009-10-28 09:57:14 UTC (rev 10950)
+++ trunk/jlgui/debian/compat	2009-10-28 10:46:16 UTC (rev 10951)
@@ -1 +1 @@
-5
+7

Modified: trunk/jlgui/debian/control
===================================================================
--- trunk/jlgui/debian/control	2009-10-28 09:57:14 UTC (rev 10950)
+++ trunk/jlgui/debian/control	2009-10-28 10:46:16 UTC (rev 10951)
@@ -4,9 +4,17 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>,
  Niels Thykier <niels at thykier.net>
-Build-Depends: ant, cdbs, debhelper (>= 5), default-jdk, libbasicplayer-java,
- libcommons-logging-java, libjlayer-java, libkjdsp-java,
- libtritonus-java, libjmac-java, quilt
+Build-Depends: ant,
+               cdbs,
+               debhelper (>= 7),
+               default-jdk,
+               libbasicplayer-java,
+               libcommons-logging-java,
+               libjlayer-java,
+               libjmac-java,
+               libkjdsp-java,
+               libtritonus-java,
+               quilt
 Standards-Version: 3.8.3
 Homepage: http://sourceforge.net/projects/jlgui
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jlgui/
@@ -14,10 +22,17 @@
 
 Package: jlgui
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends},
- openjdk-6-jre, libbasicplayer-java, libcommons-logging-java,
- libjlayer-java, libkjdsp-java, libmp3spi-java, libtritonus-java,
- libvorbisspi-java, libjmac-java
+Depends: libbasicplayer-java,
+         libcommons-logging-java,
+         libjlayer-java,
+         libjmac-java,
+         libjorbis-java,
+         libkjdsp-java,
+         libmp3spi-java,
+         libtritonus-java,
+         libvorbisspi-java,
+         openjdk-6-jre | java6-runtime,
+         ${misc:Depends}
 Recommends: kdebase-data, libjflac-java, libjspeex-java
 Description: graphical music player
  jlGui is a Music Player application for the Java Platform. It

Modified: trunk/jlgui/debian/jlgui.sh
===================================================================
--- trunk/jlgui/debian/jlgui.sh	2009-10-28 09:57:14 UTC (rev 10950)
+++ trunk/jlgui/debian/jlgui.sh	2009-10-28 10:46:16 UTC (rev 10951)
@@ -1,15 +1,10 @@
 #!/bin/sh
 
-JARS="jl mp3spi tritonus_share vorbisspi jspeex jflac basicplayer kj_dsp jlgui commons-logging-api jmactritonusspi"
+JARS="jl mp3spi tritonus_share vorbisspi jspeex jflac basicplayer kj_dsp jlgui commons-logging-api jmactritonusspi jorbis jogg"
 
-#workaround for broken tritonus:
-CLASSPATH=/var/spool/jlgui/tritonus_share.jar
-
-#another workaround for broken tritonus:
-CLASSPATH=$CLASSPATH:/usr/lib/kaffe/jre/lib/rt.jar
-
 for FILE in $JARS; do
   CLASSPATH=$CLASSPATH:/usr/share/java/$FILE.jar
 done
 
 exec java -classpath $CLASSPATH javazoom.jlgui.player.amp.StandalonePlayer
+