[pkg-java] r9723 - in trunk/jajuk/debian: . patches
Damien Raude-Morvan
drazzib-guest at alioth.debian.org
Thu Aug 6 22:46:27 UTC 2009
Author: drazzib-guest
Date: 2009-08-06 22:46:27 +0000 (Thu, 06 Aug 2009)
New Revision: 9723
Added:
trunk/jajuk/debian/patches/substance.diff
Modified:
trunk/jajuk/debian/MANIFEST.MF
trunk/jajuk/debian/build.xml
trunk/jajuk/debian/changelog
trunk/jajuk/debian/control
trunk/jajuk/debian/jajuk.sh
trunk/jajuk/debian/patches/cobra.diff
trunk/jajuk/debian/patches/series
trunk/jajuk/debian/patches/swingx.diff
trunk/jajuk/debian/rules
Log:
[jajuk]
* New upstream SVN snapshot (r4991).
* debian/control:
- Add liblastfm-java, libxstream-java, libcommons-lang-java
and libcommons-io-java in Depends and Build-Depends
- Remove javahelp2, libjgoodies-forms-java and libqdwizard-java
from Build-Depends
- Add java-wrappers to Depends (for shell script)
* debian/rules:
- Add pixels, lastfm, commons-lang, commons-io and xstream in DEB_JARS
- Remove forms, jh (javahelp2), js (rhino), qdwizard in DEB_JARS
* debian/MANIFEST.MF:
- Update like DEB_JARS + remove jdic.jar + add jna.jar
* Update all patches to new release
* Add a new substance.diff patch for Substance 5.2 compatibility
* Rework jajuk.sh launch script to use java-wrappers for finding
a suitable JAVA_HOME
* Bump Standards-Version to 3.8.2 (no changes needed)
Modified: trunk/jajuk/debian/MANIFEST.MF
===================================================================
--- trunk/jajuk/debian/MANIFEST.MF 2009-08-06 19:36:05 UTC (rev 9722)
+++ trunk/jajuk/debian/MANIFEST.MF 2009-08-06 22:46:27 UTC (rev 9723)
@@ -1,5 +1,5 @@
Manifest-Version: 2.0
Main-Class: org.jajuk.Main
Created-By: Jajuk team
-Class-Path: animation.jar basicplayer.jar cobra.jar commons-codec.jar commons-collections3.jar commons-httpclient.jar commons-logging.jar entagged-tageditor.jar jaudiotagger.jar forms.jar jcommon.jar jdic.jar jfreechart.jar jh.jar jl.jar jmactritonusspi.jar jogg.jar jorbis.jar js.jar jspeex.jar laf-plugin.jar laf-widget.jar log4j-1.2.jar mp3spi.jar qdwizard.jar substance.jar swingx.jar tritonus_share.jar vldocking.jar vorbisspi.jar jajuk-help.jar jajuk-help_fr.jar dbus.jar miglayout.jar pixels.jar
+Class-Path: animation.jar basicplayer.jar cobra.jar commons-codec.jar commons-collections3.jar commons-httpclient.jar commons-logging.jar entagged-tageditor.jar jaudiotagger.jar jcommon.jar jfreechart.jar jl.jar jmactritonusspi.jar jogg.jar jorbis.jar jspeex.jar laf-plugin.jar laf-widget.jar log4j-1.2.jar mp3spi.jar substance.jar swingx.jar tritonus_share.jar vldocking.jar vorbisspi.jar jajuk-help.jar jajuk-help_fr.jar dbus.jar miglayout.jar pixels.jar lastfm.jar commons-io.jar commons-lang.jar xstream.jar jna.jar
Specification-Title: Jajuk
Modified: trunk/jajuk/debian/build.xml
===================================================================
--- trunk/jajuk/debian/build.xml 2009-08-06 19:36:05 UTC (rev 9722)
+++ trunk/jajuk/debian/build.xml 2009-08-06 22:46:27 UTC (rev 9723)
@@ -44,7 +44,7 @@
<target name="compile" description="Compile the sources" depends="init">
<mkdir dir="${class.dir}"/>
<javac srcdir="${source.dir}" destdir="${class.dir}"
- deprecation="true" debug="true" optimize="false"/>
+ deprecation="true" debug="true" optimize="false" encoding="utf-8"/>
<copy todir="${class.dir}">
<fileset dir="${source.dir}">
<patternset refid="compiler.resources" />
Modified: trunk/jajuk/debian/changelog
===================================================================
--- trunk/jajuk/debian/changelog 2009-08-06 19:36:05 UTC (rev 9722)
+++ trunk/jajuk/debian/changelog 2009-08-06 22:46:27 UTC (rev 9723)
@@ -1,3 +1,25 @@
+jajuk (1.8~svn4991-1) UNRELEASED; urgency=low
+
+ * New upstream SVN snapshot (r4991).
+ * debian/control:
+ - Add liblastfm-java, libxstream-java, libcommons-lang-java
+ and libcommons-io-java in Depends and Build-Depends
+ - Remove javahelp2, libjgoodies-forms-java and libqdwizard-java
+ from Build-Depends
+ - Add java-wrappers to Depends (for shell script)
+ * debian/rules:
+ - Add pixels, lastfm, commons-lang, commons-io and xstream in DEB_JARS
+ - Remove forms, jh (javahelp2), js (rhino), qdwizard in DEB_JARS
+ * debian/MANIFEST.MF:
+ - Update like DEB_JARS + remove jdic.jar + add jna.jar
+ * Update all patches to new release
+ * Add a new substance.diff patch for Substance 5.2 compatibility
+ * Rework jajuk.sh launch script to use java-wrappers for finding
+ a suitable JAVA_HOME
+ * Bump Standards-Version to 3.8.2 (no changes needed)
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Fri, 07 Aug 2009 00:05:15 +0200
+
jajuk (1.8~svn4796-1) unstable; urgency=low
* New bugfix release from upstream
Modified: trunk/jajuk/debian/control
===================================================================
--- trunk/jajuk/debian/control 2009-08-06 19:36:05 UTC (rev 9722)
+++ trunk/jajuk/debian/control 2009-08-06 22:46:27 UTC (rev 9723)
@@ -4,15 +4,15 @@
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>, Damien Raude-Morvan <drazzib at drazzib.com>
Build-Depends: cdbs, debhelper (>= 5), quilt
-Build-Depends-Indep: ant, libjgoodies-animation-java, libbasicplayer-java, libcobra-java, libcommons-codec-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-logging-java, entagged, libjaudiotagger-java (>= 1.0.9), libjgoodies-forms-java, libjcommon-java, libjfreechart-java, javahelp2, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, libqdwizard-java (>= 2.1), substance, libswingx-java, libtritonus-java, libvldocking-java, libvorbisspi-java, mplayer, openjdk-6-jdk, libdbus-java, libmiglayout-java, libjna-java, libpixels-java
-Standards-Version: 3.8.1
+Build-Depends-Indep: ant, libjgoodies-animation-java, libbasicplayer-java, libcobra-java, libcommons-codec-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-logging-java, entagged, libjaudiotagger-java (>= 1.0.9), libjcommon-java, libjfreechart-java, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, substance, libswingx-java, libtritonus-java, libvldocking-java, libvorbisspi-java, mplayer, openjdk-6-jdk, libdbus-java, libmiglayout-java, libjna-java, libpixels-java, liblastfm-java, libcommons-lang-java, libcommons-io-java, libxstream-java
+Standards-Version: 3.8.2
Homepage: http://jajuk.info/index.php/Main_Page
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jajuk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jajuk
Package: jajuk
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre, libjgoodies-animation-java, libbasicplayer-java, libcobra-java, libcommons-codec-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-logging-java, entagged, libjaudiotagger-java (>= 1.0.9), libjgoodies-forms-java, libjcommon-java, libjfreechart-java, javahelp2, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, libqdwizard-java (>= 2.1), substance, libswingx-java, libtritonus-java, libvldocking-java, libvorbisspi-java, liblaf-plugin-java, liblaf-widget-java, mplayer, libdbus-java, libmiglayout-java, libjna-java
+Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre, libjgoodies-animation-java, libbasicplayer-java, libcobra-java, libcommons-codec-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-logging-java, entagged, libjaudiotagger-java (>= 1.0.9), libjcommon-java, libjfreechart-java, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, substance, libswingx-java, libtritonus-java, libvldocking-java, libvorbisspi-java, liblaf-plugin-java, liblaf-widget-java, mplayer, libdbus-java, libmiglayout-java, libjna-java, libpixels-java, liblastfm-java, libcommons-lang-java, libcommons-io-java, libxstream-java, java-wrappers
Description: advanced jukebox and music organizer
Jajuk is software that organizes and plays music. Jajuk is designed
to be intuitive, fast and provide multiple ways to perform the same
Modified: trunk/jajuk/debian/jajuk.sh
===================================================================
--- trunk/jajuk/debian/jajuk.sh 2009-08-06 19:36:05 UTC (rev 9722)
+++ trunk/jajuk/debian/jajuk.sh 2009-08-06 22:46:27 UTC (rev 9723)
@@ -1,3 +1,20 @@
#!/bin/sh
-cd /usr/share/java/
-exec java -Djava.library.path=/usr/lib/jni/ -client -Xms20M -Xmx512M -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10 -Xincgc -XX:NewRatio=12 -jar jajuk.jar -test
+
+# Move old user config (i.e. using -test switch) to a stable location
+if [ -d "$HOME/.jajuk_test_1.8" -a ! -e "$HOME/.jajuk" ]; then
+ mv "$HOME/.jajuk_test_1.8" "$HOME/.jajuk"
+fi
+if [ -d "$HOME/.jajuk_test_1.7" -a ! -e "$HOME/.jajuk" ]; then
+ mv "$HOME/.jajuk_test_1.7" "$HOME/.jajuk"
+fi
+
+JAVA_OPTS="-Djava.library.path=/usr/lib/jni/ -client -Xms20M -Xmx512M -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10 -Xincgc -XX:NewRatio=12"
+JAJUK_OPTS=""
+
+# Include the wrappers utility script
+. /usr/lib/java-wrappers/java-wrappers.sh
+
+# We need a java6 runtime
+find_java_runtime java6
+
+exec $JAVA_HOME/bin/java $JAVA_OPTS -jar /usr/share/java/jajuk.jar $JAJUK_OPTS "$@"
Modified: trunk/jajuk/debian/patches/cobra.diff
===================================================================
--- trunk/jajuk/debian/patches/cobra.diff 2009-08-06 19:36:05 UTC (rev 9722)
+++ trunk/jajuk/debian/patches/cobra.diff 2009-08-06 22:46:27 UTC (rev 9723)
@@ -1,8 +1,6 @@
-Index: jajuk-1.8/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java
-===================================================================
---- jajuk-1.8.orig/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java 2009-05-15 14:01:50.000000000 -0400
-+++ jajuk-1.8/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java 2009-05-21 23:33:46.000000000 -0400
-@@ -41,12 +41,12 @@
+--- a/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java
++++ b/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java
+@@ -42,12 +42,12 @@
import org.jajuk.util.UtilGUI;
import org.jajuk.util.UtilSystem;
import org.w3c.dom.Document;
@@ -18,10 +16,10 @@
+import org.lobobrowser.html.parser.InputSourceImpl;
+import org.lobobrowser.html.test.SimpleUserAgentContext;
+import org.lobobrowser.html.test.SimpleHtmlRendererContext;
+ import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
- /**
-@@ -58,7 +58,7 @@
+@@ -60,7 +60,7 @@
private final SimpleHtmlRendererContext rcontext;
@@ -30,7 +28,7 @@
private final DocumentBuilderImpl dbi;
-@@ -70,7 +70,7 @@
+@@ -72,7 +72,7 @@
// Disable Cobra traces
Logger.getLogger("").setLevel(Level.OFF);
rcontext = new SimpleHtmlRendererContext(this);
Modified: trunk/jajuk/debian/patches/series
===================================================================
--- trunk/jajuk/debian/patches/series 2009-08-06 19:36:05 UTC (rev 9722)
+++ trunk/jajuk/debian/patches/series 2009-08-06 22:46:27 UTC (rev 9723)
@@ -1,2 +1,3 @@
+substance.diff
swingx.diff
cobra.diff
Added: trunk/jajuk/debian/patches/substance.diff
===================================================================
--- trunk/jajuk/debian/patches/substance.diff (rev 0)
+++ trunk/jajuk/debian/patches/substance.diff 2009-08-06 22:46:27 UTC (rev 9723)
@@ -0,0 +1,45 @@
+Description: Substance 5.2 compatibility
+Origin: vendor, Debian
+Forwarded: yes
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Last-Update: 2009-08-07
+--- a/src/main/java/org/jajuk/ui/substance/ButtonShaper.java
++++ b/src/main/java/org/jajuk/ui/substance/ButtonShaper.java
+@@ -27,7 +27,7 @@
+ import java.awt.Component;
+ import java.awt.Dimension;
+ import java.awt.Insets;
+-import java.awt.geom.GeneralPath;
++import java.awt.Shape;
+
+ import javax.swing.AbstractButton;
+ import javax.swing.border.Border;
+@@ -72,18 +72,25 @@
+ }
+ };
+ }
+-
++
+ /* (non-Javadoc)
+ * @see org.jvnet.substance.shaper.SubstanceButtonShaper#getButtonOutline(javax.swing.AbstractButton, java.awt.Insets, int, int)
+ */
+- public GeneralPath getButtonOutline(AbstractButton button, Insets insets, int w, int h) {
++ public Shape getButtonOutline(AbstractButton button, Insets insets, int w, int h) {
++ return getButtonOutline(button);
++ }
++
++ /* (non-Javadoc)
++ * @see org.jvnet.substance.shaper.SubstanceButtonShaper#getButtonOutline(javax.swing.AbstractButton, java.awt.Insets, int, int, boolean)
++ */
++ public Shape getButtonOutline(AbstractButton button, Insets insets, int w, int h, boolean b) {
+ return getButtonOutline(button);
+ }
+
+ /* (non-Javadoc)
+ * @see org.jvnet.substance.shaper.SubstanceButtonShaper#getButtonOutline(javax.swing.AbstractButton, java.awt.Insets)
+ */
+- public GeneralPath getButtonOutline(AbstractButton button, Insets insets) {
++ public Shape getButtonOutline(AbstractButton button, Insets insets) {
+ return getButtonOutline(button);
+ }
+
Modified: trunk/jajuk/debian/patches/swingx.diff
===================================================================
--- trunk/jajuk/debian/patches/swingx.diff 2009-08-06 19:36:05 UTC (rev 9722)
+++ trunk/jajuk/debian/patches/swingx.diff 2009-08-06 22:46:27 UTC (rev 9723)
@@ -1,7 +1,5 @@
-Index: jajuk-1.8/src/main/java/org/jajuk/ui/views/QueueView.java
-===================================================================
---- jajuk-1.8.orig/src/main/java/org/jajuk/ui/views/QueueView.java 2009-05-24 17:14:41.000000000 -0400
-+++ jajuk-1.8/src/main/java/org/jajuk/ui/views/QueueView.java 2009-05-24 19:04:00.000000000 -0400
+--- a/src/main/java/org/jajuk/ui/views/QueueView.java
++++ b/src/main/java/org/jajuk/ui/views/QueueView.java
@@ -187,8 +187,7 @@
} else {
queueHighlighterColor = scheme.getLineColor();
@@ -12,18 +10,16 @@
Highlighter alternate = UtilGUI.getAlternateHighlighter();
editorTable.setHighlighters(alternate, colorHighlighter);
// register events
-@@ -592,4 +591,4 @@
+@@ -597,4 +596,4 @@
}
}
-}
\ No newline at end of file
+}
-Index: jajuk-1.8/src/main/java/org/jajuk/ui/views/PlaylistView.java
-===================================================================
---- jajuk-1.8.orig/src/main/java/org/jajuk/ui/views/PlaylistView.java 2009-05-21 07:12:07.000000000 -0400
-+++ jajuk-1.8/src/main/java/org/jajuk/ui/views/PlaylistView.java 2009-05-24 19:02:27.000000000 -0400
-@@ -324,8 +324,7 @@
+--- a/src/main/java/org/jajuk/ui/views/PlaylistView.java
++++ b/src/main/java/org/jajuk/ui/views/PlaylistView.java
+@@ -323,8 +323,7 @@
initMenuItems();
@@ -33,10 +29,8 @@
Highlighter alternate = UtilGUI.getAlternateHighlighter();
editorTable.setHighlighters(alternate, colorHighlighter);
// register events
-Index: jajuk-1.8/src/main/java/org/jajuk/ui/wizard/PropertiesWizard.java
-===================================================================
---- jajuk-1.8.orig/src/main/java/org/jajuk/ui/wizard/PropertiesWizard.java 2009-05-24 07:25:47.000000000 -0400
-+++ jajuk-1.8/src/main/java/org/jajuk/ui/wizard/PropertiesWizard.java 2009-05-24 19:05:44.000000000 -0400
+--- a/src/main/java/org/jajuk/ui/wizard/PropertiesWizard.java
++++ b/src/main/java/org/jajuk/ui/wizard/PropertiesWizard.java
@@ -425,7 +425,7 @@
// Make sure to set default date to 1970, not today to allow user
// to set date to today for multiple selection and to allow jajuk
Modified: trunk/jajuk/debian/rules
===================================================================
--- trunk/jajuk/debian/rules 2009-08-06 19:36:05 UTC (rev 9722)
+++ trunk/jajuk/debian/rules 2009-08-06 22:46:27 UTC (rev 9723)
@@ -8,7 +8,7 @@
JAVA_HOME := /usr/lib/jvm/java-6-openjdk
DEB_ANT_BUILDFILE := debian/build.xml
DEB_ANT_BUILD_TARGET := jar -Djajuk.version="$(VERSION)"
-DEB_JARS := animation basicplayer cobra commons-codec commons-collections3 commons-httpclient commons-logging entagged-tageditor jaudiotagger forms jcommon jfreechart jh jl jmactritonusspi jogg jorbis js jspeex log4j-1.2 mp3spi qdwizard substance swingx tritonus_share vldocking vorbisspi jna dbus miglayout jna pixels
+DEB_JARS := animation basicplayer cobra commons-codec commons-collections3 commons-httpclient commons-logging entagged-tageditor jaudiotagger jcommon jfreechart jl jmactritonusspi jogg jorbis jspeex log4j-1.2 mp3spi substance swingx tritonus_share vldocking vorbisspi jna dbus miglayout pixels lastfm commons-lang commons-io xstream
install/jajuk::
install -m 755 -D debian/jajuk.sh $(DEB_DESTDIR)/usr/bin/jajuk
More information about the pkg-java-commits
mailing list