[pkg-java] r8640 - in trunk: . jlgui jlgui/debian jlgui/debian/patches
Torsten Werner
twerner at alioth.debian.org
Sun Jun 28 18:53:24 UTC 2009
Author: twerner
Date: 2009-06-28 18:53:23 +0000 (Sun, 28 Jun 2009)
New Revision: 8640
Added:
trunk/jlgui/
trunk/jlgui/debian/
trunk/jlgui/debian/README.Debian
trunk/jlgui/debian/README.Debian-source
trunk/jlgui/debian/changelog
trunk/jlgui/debian/compat
trunk/jlgui/debian/control
trunk/jlgui/debian/copyright
trunk/jlgui/debian/doc-base
trunk/jlgui/debian/docs
trunk/jlgui/debian/install
trunk/jlgui/debian/jlgui.desktop
trunk/jlgui/debian/jlgui.pod
trunk/jlgui/debian/jlgui.sh
trunk/jlgui/debian/manpages
trunk/jlgui/debian/orig-tar.sh
trunk/jlgui/debian/patches/
trunk/jlgui/debian/patches/build.diff
trunk/jlgui/debian/patches/create_confdir.diff
trunk/jlgui/debian/patches/series
trunk/jlgui/debian/rules
trunk/jlgui/debian/watch
Log:
move jlgui to pkg-java
Added: trunk/jlgui/debian/README.Debian
===================================================================
--- trunk/jlgui/debian/README.Debian (rev 0)
+++ trunk/jlgui/debian/README.Debian 2009-06-28 18:53:23 UTC (rev 8640)
@@ -0,0 +1,8 @@
+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:
+
+mkdir /var/spool/jlgui
+cd /var/spool/jlgui
+wget http://bollin.googlecode.com/files/tritonus_share.jar
+
Added: trunk/jlgui/debian/README.Debian-source
===================================================================
--- trunk/jlgui/debian/README.Debian-source (rev 0)
+++ trunk/jlgui/debian/README.Debian-source 2009-06-28 18:53:23 UTC (rev 8640)
@@ -0,0 +1,13 @@
+jlgui
+=====
+
+The upstream supplied source package contains binary jar files.
+Currently no clean source distribution exists. Therefore, the upstream
+sources were modified to comply with the Debian Free Software
+Guidelines.
+
+Use the rules/get-orig-source target to create the orig.tar.gz.
+For more details on repackaging of upstream sources please see the
+debian/orig-tar.sh file.
+
+-- Varun Hiremath <varunhiremath at gmail.com> Mon, 27 Aug 2007 19:02:53 +0530
Added: trunk/jlgui/debian/changelog
===================================================================
--- trunk/jlgui/debian/changelog (rev 0)
+++ trunk/jlgui/debian/changelog 2009-06-28 18:53:23 UTC (rev 8640)
@@ -0,0 +1,64 @@
+jlgui (3.0-7) unstable; urgency=low
+
+ * Move jlgui script to debian dir
+ * debian/control:
+ + Add Homepage header
+ + Fix Vcs headers (Closes: #466726)
+ + Bump Standards-Version to 3.7.3
+ * debian/rules: fix installed jar and symlink's name
+ * Remove encoding field from desktop file
+
+ -- Varun Hiremath <varun at debian.org> Thu, 21 Feb 2008 23:49:16 +0530
+
+jlgui (3.0-6) unstable; urgency=low
+
+ * Remove Depends: cortado, because we have libvorbisspi-java now (Closes: 451397).
+
+ -- Varun Hiremath <varunhiremath at gmail.com> Sat, 17 Nov 2007 04:35:08 +0530
+
+jlgui (3.0-5) unstable; urgency=low
+
+ * debian/control: Fix Depends - replace libjmactritonus-java with libjmac-java
+
+ -- Varun Hiremath <varunhiremath at gmail.com> Sat, 13 Oct 2007 14:24:37 +0530
+
+jlgui (3.0-4) unstable; urgency=low
+
+ [ Varun Hiremath ]
+ * debian/control:
+ + Build-Depend on libjmac-java
+ + Switch to java-gcj instead of kaffe
+ + Depend on kaffe temporarily for tritonus classes.
+ * debian/patches: Add create_confdir.diff patch to create all the config files
+ (jlgui.ini and default.m3u) in $HOME/.jlgui instead of current dir.
+ * Clean up the jlgui load script.
+ * debian/control: Add XS-Vcs-{Svn,Browser} headers.
+ * Add debian/README.Debian-source file.
+
+ [ Torsten Werner ]
+ * Add another patch build.diff that sets the option encoding="iso8859-1" to
+ javac.
+
+ -- Torsten Werner <twerner at debian.org> Fri, 12 Oct 2007 09:42:18 +0200
+
+jlgui (3.0-3) unstable; urgency=low
+
+ * Add support for uscan and make sure no jar file becomes part of
+ *.orig.tar.gz.
+ * Fix (Build-)Depends, Recommends and Suggests.
+ * Add manpage and jlgui.desktop.
+
+ -- Torsten Werner <twerner at debian.org> Tue, 15 May 2007 22:48:22 +0200
+
+jlgui (3.0-2) unstable; urgency=low
+
+ * Set Architecture: all.
+ * Add myself to Uploaders.
+
+ -- Torsten Werner <twerner at debian.org> Wed, 21 Mar 2007 21:38:43 +0100
+
+jlgui (3.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #415610)
+
+ -- Varun Hiremath <varunhiremath at gmail.com> Mon, 29 Jan 2007 00:45:34 +0530
Added: trunk/jlgui/debian/compat
===================================================================
--- trunk/jlgui/debian/compat (rev 0)
+++ trunk/jlgui/debian/compat 2009-06-28 18:53:23 UTC (rev 8640)
@@ -0,0 +1 @@
+5
Added: trunk/jlgui/debian/control
===================================================================
--- trunk/jlgui/debian/control (rev 0)
+++ trunk/jlgui/debian/control 2009-06-28 18:53:23 UTC (rev 8640)
@@ -0,0 +1,26 @@
+Source: jlgui
+Section: sound
+Priority: optional
+Maintainer: Varun Hiremath <varun at debian.org>
+Uploaders: Torsten Werner <twerner at debian.org>
+Build-Depends: ant, cdbs, debhelper (>= 5), java-gcj-compat-dev, libbasicplayer-java,
+ libcommons-logging-java, libjlayer-java, libkjdsp-java,
+ libtritonus-java, libjmac-java, quilt
+Standards-Version: 3.7.3
+Homepage: http://www.javazoom.net/jlgui/jlgui.html
+Vcs-Svn: https://bollin.googlecode.com/svn/jlgui/trunk
+Vcs-Browser: http://bollin.googlecode.com/svn/jlgui/trunk
+
+Package: jlgui
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ java-gcj-compat | java1-runtime | java2-runtime, kaffe,
+ libbasicplayer-java, libcommons-logging-java,
+ libjlayer-java, libkjdsp-java, libmp3spi-java, libtritonus-java,
+ libvorbisspi-java, libjmac-java
+Recommends: kdebase-data, libjflac-java, libjspeex-java
+Suggests: java-virtual-machine
+Description: graphical music player
+ jlGui is a Music Player application for the Java Platform. It
+ supports MP3, OGG Vorbis, FLAC, MONKEY's AUDIO, WAV, AIFF, AU and
+ SPEEX audio formats. Front-end is WinAmp skins 2.0 compliant.
Added: trunk/jlgui/debian/copyright
===================================================================
--- trunk/jlgui/debian/copyright (rev 0)
+++ trunk/jlgui/debian/copyright 2009-06-28 18:53:23 UTC (rev 8640)
@@ -0,0 +1,32 @@
+This package was debianized by Varun Hiremath <varunhiremath at gmail.com> on
+Mon, 29 Jan 2007 00:45:34 +0530.
+
+It was downloaded from http://www.javazoom.net/jlgui/sources.html
+
+Upstream Author:
+ Joseph Hines <jhines at psyberrealm.com>
+ Dong Yang <john_yang at 263.net>
+ Scott Pennell <spennell6 at comcast.net>
+ Dmitry Vaguine <davagin at udm.ru>
+
+Copyright: (C) 2007 Joseph Hines <jhines at psyberrealm.com>
+ (C) 2007 Dong Yang <john_yang at 263.net>
+ (C) 2007 Scott Pennell <spennell6 at comcast.net>
+ (C) 2007 Dmitry Vaguine <davagin at udm.ru>
+
+License:
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+The Debian packaging is (C) 2007, Varun Hiremath <varunhiremath at gmail.com> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Added: trunk/jlgui/debian/doc-base
===================================================================
--- trunk/jlgui/debian/doc-base (rev 0)
+++ trunk/jlgui/debian/doc-base 2009-06-28 18:53:23 UTC (rev 8640)
@@ -0,0 +1,11 @@
+Document: jlgui
+Title: graphical music player
+Author: Joseph Hines, Dong Yang, Scott Pennell, Dmitry Vaguine
+Abstract: jlGui is a Music Player application for the Java Platform. It
+ supports MP3, OGG Vorbis, FLAC, MONKEY's AUDIO, WAV, AIFF, AU and
+ SPEEX audio formats. Front-end is WinAmp skins 2.0 compliant.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/jlgui/index.html
+Files: /usr/share/doc/jlgui/*.html
Added: trunk/jlgui/debian/docs
===================================================================
--- trunk/jlgui/debian/docs (rev 0)
+++ trunk/jlgui/debian/docs 2009-06-28 18:53:23 UTC (rev 8640)
@@ -0,0 +1,2 @@
+docs/*
+README.txt
Added: trunk/jlgui/debian/install
===================================================================
--- trunk/jlgui/debian/install (rev 0)
+++ trunk/jlgui/debian/install 2009-06-28 18:53:23 UTC (rev 8640)
@@ -0,0 +1 @@
+debian/jlgui.desktop /usr/share/applications/
Added: trunk/jlgui/debian/jlgui.desktop
===================================================================
--- trunk/jlgui/debian/jlgui.desktop (rev 0)
+++ trunk/jlgui/debian/jlgui.desktop 2009-06-28 18:53:23 UTC (rev 8640)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Exec=jlgui
+Name=jlGui
+Comment=graphical music player
+Icon=multimedia
+Name[de]=jlGui
+StartupNotify=false
+Type=Application
+Categories=AudioVideo
Added: trunk/jlgui/debian/jlgui.pod
===================================================================
--- trunk/jlgui/debian/jlgui.pod (rev 0)
+++ trunk/jlgui/debian/jlgui.pod 2009-06-28 18:53:23 UTC (rev 8640)
@@ -0,0 +1,26 @@
+=head1 NAME
+
+jlgui - graphical music player
+
+=head1 SYNOPSIS
+
+B<jlgui>
+
+=head1 DESCRIPTION
+
+jlGui is a Music Player application for the Java Platform. It
+supports MP3, OGG Vorbis, FLAC, MONKEY's AUDIO, WAV, AIFF, AU and
+SPEEX audio formats. Front-end is WinAmp skins 2.0 compliant.
+
+=head1 SEE ALSO
+
+Debian specific information: F</usr/share/doc/jlgui/README.Debian>
+
+Homepage: L<http://www.javazoom.net/jlgui/jlgui.html>
+
+API documentation: L<file:///usr/share/doc/jlgui/index.html>
+
+=head1 AUTHOR
+
+Torsten Werner <twerner at debian.org>
+
Added: trunk/jlgui/debian/jlgui.sh
===================================================================
--- trunk/jlgui/debian/jlgui.sh (rev 0)
+++ trunk/jlgui/debian/jlgui.sh 2009-06-28 18:53:23 UTC (rev 8640)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+JARS="jl mp3spi tritonus_share vorbisspi jspeex jflac basicplayer kj_dsp jlgui commons-logging-api jmactritonusspi"
+
+#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
Property changes on: trunk/jlgui/debian/jlgui.sh
___________________________________________________________________
Added: svn:executable
+
Added: trunk/jlgui/debian/manpages
===================================================================
--- trunk/jlgui/debian/manpages (rev 0)
+++ trunk/jlgui/debian/manpages 2009-06-28 18:53:23 UTC (rev 8640)
@@ -0,0 +1 @@
+debian/jlgui.1
Added: trunk/jlgui/debian/orig-tar.sh
===================================================================
--- trunk/jlgui/debian/orig-tar.sh (rev 0)
+++ trunk/jlgui/debian/orig-tar.sh 2009-06-28 18:53:23 UTC (rev 8640)
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+
+DIR=jlgui-$2.orig
+
+# clean up the upstream tarball
+tar -x -z -f $3
+mv jlgui$2 $DIR
+tar -c -z -f $3 --exclude '*.jar' $DIR
+rm -rf $DIR
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $3 $origDir
+ echo "moved $3 to $origDir"
+fi
+
+exit 0
+
Property changes on: trunk/jlgui/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
+
Added: trunk/jlgui/debian/patches/build.diff
===================================================================
--- trunk/jlgui/debian/patches/build.diff (rev 0)
+++ trunk/jlgui/debian/patches/build.diff 2009-06-28 18:53:23 UTC (rev 8640)
@@ -0,0 +1,13 @@
+Index: jlgui-3.0/build.xml
+===================================================================
+--- jlgui-3.0.orig/build.xml 2007-10-12 09:39:38.000000000 +0200
++++ jlgui-3.0/build.xml 2007-10-12 09:39:59.000000000 +0200
+@@ -19,7 +19,7 @@
+ <!-- Build -->
+ <target name="build" depends="init">
+ <echo message="------ Compiling application"/>
+- <javac srcdir="${sources}" destdir="${classes}" includes="**" source="${jdksource}" target="${jdktarget}">
++ <javac srcdir="${sources}" destdir="${classes}" includes="**" source="${jdksource}" target="${jdktarget}" encoding="iso8859-1">
+ <classpath>
+ <pathelement location="${lib}/tritonus_share.jar"/>
+ <pathelement location="${lib}/basicplayer3.0.jar"/>
Added: trunk/jlgui/debian/patches/create_confdir.diff
===================================================================
--- trunk/jlgui/debian/patches/create_confdir.diff (rev 0)
+++ trunk/jlgui/debian/patches/create_confdir.diff 2009-06-28 18:53:23 UTC (rev 8640)
@@ -0,0 +1,56 @@
+diff -urN jlgui3.0.orig/src/javazoom/jlgui/player/amp/PlayerUI.java jlgui3.0/src/javazoom/jlgui/player/amp/PlayerUI.java
+--- jlgui3.0.orig/src/javazoom/jlgui/player/amp/PlayerUI.java 2007-10-10 20:01:38.000000000 +0530
++++ jlgui3.0/src/javazoom/jlgui/player/amp/PlayerUI.java 2007-10-10 20:01:55.000000000 +0530
+@@ -1707,8 +1707,13 @@
+ }
+ if (playlist != null)
+ {
+- playlist.save("default.m3u");
+- config.setPlaylistFilename("default.m3u");
++ String confdir = System.getProperty("user.home") + "/.jlgui/";
++ File fconfdir = new File(confdir);
++ if (!fconfdir.exists()) {
++ fconfdir.mkdirs(); // create the directory if it doesn't exist
++ }
++ playlist.save(confdir+"default.m3u");
++ config.setPlaylistFilename(confdir+"default.m3u");
+ }
+ loader.close();
+ }
+diff -urN jlgui3.0.orig/src/javazoom/jlgui/player/amp/StandalonePlayer.java jlgui3.0/src/javazoom/jlgui/player/amp/StandalonePlayer.java
+--- jlgui3.0.orig/src/javazoom/jlgui/player/amp/StandalonePlayer.java 2007-10-10 20:01:38.000000000 +0530
++++ jlgui3.0/src/javazoom/jlgui/player/amp/StandalonePlayer.java 2007-10-10 20:01:55.000000000 +0530
+@@ -52,7 +52,8 @@
+ {
+ private static Log log = LogFactory.getLog(StandalonePlayer.class);
+ /*-- Run parameters --*/
+- private String initConfig = "jlgui.ini";
++ private String confdir = System.getProperty("user.home") + "/.jlgui/";
++ private String initConfig = confdir + "jlgui.ini";
+ private String initSong = null;
+ private String showPlaylist = null;
+ private String showEqualizer = null;
+diff -urN jlgui3.0.orig/src/javazoom/jlgui/player/amp/util/Config.java jlgui3.0/src/javazoom/jlgui/player/amp/util/Config.java
+--- jlgui3.0.orig/src/javazoom/jlgui/player/amp/util/Config.java 2007-10-10 20:01:38.000000000 +0530
++++ jlgui3.0/src/javazoom/jlgui/player/amp/util/Config.java 2007-10-10 20:01:55.000000000 +0530
+@@ -37,7 +37,8 @@
+ public static String TAGINFO_POLICY_FILE = "file";
+ public static String TAGINFO_POLICY_ALL = "all";
+ public static String TAGINFO_POLICY_NONE = "none";
+- private static String CONFIG_FILE_NAME = "jlgui.ini";
++ private String confdir = System.getProperty("user.home") + "/.jlgui/";
++ private String CONFIG_FILE_NAME = confdir + "jlgui.ini";
+ private Configuration _config = null;
+ // configuration keys
+ private static final String LAST_URL = "last_url",
+@@ -617,6 +618,10 @@
+ */
+ public void save()
+ {
++ File fconfdir = new File(confdir);
++ if (!fconfdir.exists()) {
++ fconfdir.mkdirs(); // create the directory if it doesn't exist
++ }
+ if (_config != null)
+ {
+ _config.add(ORIGINE_X, _x);
Added: trunk/jlgui/debian/patches/series
===================================================================
--- trunk/jlgui/debian/patches/series (rev 0)
+++ trunk/jlgui/debian/patches/series 2009-06-28 18:53:23 UTC (rev 8640)
@@ -0,0 +1,2 @@
+create_confdir.diff
+build.diff
Added: trunk/jlgui/debian/rules
===================================================================
--- trunk/jlgui/debian/rules (rev 0)
+++ trunk/jlgui/debian/rules 2009-06-28 18:53:23 UTC (rev 8640)
@@ -0,0 +1,24 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+JAVA_HOME := /usr/lib/jvm/java-gcj
+DEB_ANT_BUILD_TARGET := all
+DEB_JARS := basicplayer commons-logging jlayer kj_dsp tritonus_share
+
+build/jlgui:: $(EXTRATARGET)
+ pod2man -c 'jlgui for Debian GNU/Linux' \
+ -r jlgui-$(DEB_UPSTREAM_VERSION) debian/jlgui.pod > debian/jlgui.1
+
+install/jlgui::
+ install -D -m644 jlgui*.jar $(DEB_DESTDIR)/usr/share/java/jlgui-$(DEB_UPSTREAM_VERSION).jar
+ dh_link /usr/share/java/jlgui-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jlgui.jar
+ install -D -m755 debian/jlgui.sh $(DEB_DESTDIR)/usr/bin/jlgui
+
+clean::
+ $(RM) debian/jlgui.1
+
+get-orig-source:
+ uscan --upstream-version 0 --rename
Property changes on: trunk/jlgui/debian/rules
___________________________________________________________________
Added: svn:executable
+
Added: trunk/jlgui/debian/watch
===================================================================
--- trunk/jlgui/debian/watch (rev 0)
+++ trunk/jlgui/debian/watch 2009-06-28 18:53:23 UTC (rev 8640)
@@ -0,0 +1,4 @@
+version=3
+http://www.javazoom.net/jlgui/sources.html .*/jlgui(.*).tar.gz \
+ debian debian/orig-tar.sh
+
More information about the pkg-java-commits
mailing list