Author: varun
Date: 2009-05-25 06:22:48 +0000 (Mon, 25 May 2009)
New Revision: 8299
Modified:
trunk/jajuk/debian/MANIFEST.MF
trunk/jajuk/debian/build.xml
trunk/jajuk/debian/changelog
trunk/jajuk/debian/control
trunk/jajuk/debian/install
trunk/jajuk/debian/orig-tar.sh
trunk/jajuk/debian/patches/cobra.diff
trunk/jajuk/debian/patches/swingx.diff
trunk/jajuk/debian/rules
Log:
* Development version from trunk
* Replace non-free libtablelayout-java with free libmiglayout-java
* Add libjna-java and libdbus-java to Build-Depends
* Move to main as all dependencies are now in main
Modified: trunk/jajuk/debian/MANIFEST.MF
===================================================================
--- trunk/jajuk/debian/MANIFEST.MF 2009-05-25 06:01:29 UTC (rev 8298)
+++ trunk/jajuk/debian/MANIFEST.MF 2009-05-25 06:22:48 UTC (rev 8299)
@@ -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 tablelayout.jar tritonus_share.jar vldocking.jar
vorbisspi.jar jajuk-help.jar jajuk-help_fr.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 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
Specification-Title: Jajuk
Modified: trunk/jajuk/debian/build.xml
===================================================================
--- trunk/jajuk/debian/build.xml 2009-05-25 06:01:29 UTC (rev 8298)
+++ trunk/jajuk/debian/build.xml 2009-05-25 06:22:48 UTC (rev 8299)
@@ -57,9 +57,6 @@
<target name="javadoc" description="Creates the documentation jars">
<mkdir dir="${help.dir}"/>
- <copy todir="${help.dir}">
- <fileset dir="${doc.dir}/jajuk-hs" />
- </copy>
<copy todir="${help.dir}/default">
<fileset dir="${doc.dir}">
<include name="images/**" />
@@ -76,7 +73,7 @@
<jar jarfile="${jar-help_fr.name}" basedir="${help.dir}/fr" />
</target>
- <target name="jar" description="Create the jars" depends="compile, javadoc">
+ <target name="jar" description="Create the jars" depends="compile">
<jar jarfile="${jar.name}" basedir="${class.dir}"
manifest="debian/MANIFEST.MF"/>
</target>
Modified: trunk/jajuk/debian/changelog
===================================================================
--- trunk/jajuk/debian/changelog 2009-05-25 06:01:29 UTC (rev 8298)
+++ trunk/jajuk/debian/changelog 2009-05-25 06:22:48 UTC (rev 8299)
@@ -1,3 +1,12 @@
+jajuk (1.8~svn4764-1) unstable; urgency=low
+
+ * Development version from trunk
+ * Replace non-free libtablelayout-java with free libmiglayout-java
+ * Add libjna-java and libdbus-java to Build-Depends
+ * Move to main as all dependencies are now in main
+
+ -- Varun Hiremath <[email protected]> Mon, 25 May 2009 02:18:01 -0400
+
jajuk (1.7.1-1) unstable; urgency=low
[ Damien Raude-Morvan ]
Modified: trunk/jajuk/debian/control
===================================================================
--- trunk/jajuk/debian/control 2009-05-25 06:01:29 UTC (rev 8298)
+++ trunk/jajuk/debian/control 2009-05-25 06:22:48 UTC (rev 8299)
@@ -1,10 +1,10 @@
Source: jajuk
-Section: non-free/sound
+Section: sound
Priority: optional
Maintainer: Debian Java maintainers
<[email protected]>
Uploaders: Varun Hiremath <[email protected]>, Torsten Werner
<[email protected]>, Damien Raude-Morvan <[email protected]>
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, libtablelayout-java, libtritonus-java,
libvldocking-java, libvorbisspi-java, mplayer, openjdk-6-jdk
+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
Standards-Version: 3.8.1
Homepage: http://jajuk.info/index.php/Main_Page
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jajuk
@@ -12,7 +12,7 @@
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, libtablelayout-java, libtritonus-java,
libvldocking-java, libvorbisspi-java, liblaf-plugin-java, liblaf-widget-java,
mplayer
+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
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/install
===================================================================
--- trunk/jajuk/debian/install 2009-05-25 06:01:29 UTC (rev 8298)
+++ trunk/jajuk/debian/install 2009-05-25 06:22:48 UTC (rev 8299)
@@ -1,3 +1 @@
-jajuk-help.jar /usr/share/java/
-jajuk-help_fr.jar /usr/share/java/
debian/jajuk.desktop /usr/share/applications
Modified: trunk/jajuk/debian/orig-tar.sh
===================================================================
--- trunk/jajuk/debian/orig-tar.sh 2009-05-25 06:01:29 UTC (rev 8298)
+++ trunk/jajuk/debian/orig-tar.sh 2009-05-25 06:22:48 UTC (rev 8299)
@@ -4,14 +4,15 @@
TAR=../jajuk_$1.orig.tar.gz
DIR=jajuk-$1.orig
VERSION=`echo $1 | sed -e 's/\+.*//g' | sed -e 's/\./_/g'`
+REVISION=`echo $1 | sed -e 's/.*svn//'`
TAG=release-$VERSION
# clean up the upstream tarball
mkdir $DIR
mkdir $DIR/src
(cd $DIR/src; \
-svn export https://jajuk.svn.sourceforge.net/svnroot/jajuk/tags/$TAG/src/main;
\
-svn export https://jajuk.svn.sourceforge.net/svnroot/jajuk/tags/$TAG/src/doc )
+svn export -r $REVISION
https://jajuk.svn.sourceforge.net/svnroot/jajuk/trunk/jajuk/src/main; \
+svn export -r $REVISION
https://jajuk.svn.sourceforge.net/svnroot/jajuk/trunk/jajuk/src/doc )
GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
rm -rf $DIR
Modified: trunk/jajuk/debian/patches/cobra.diff
===================================================================
--- trunk/jajuk/debian/patches/cobra.diff 2009-05-25 06:01:29 UTC (rev
8298)
+++ trunk/jajuk/debian/patches/cobra.diff 2009-05-25 06:22:48 UTC (rev
8299)
@@ -1,8 +1,8 @@
-Index:
jajuk-1.7~rc10+svn4318/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java
+Index: jajuk-1.8/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java
===================================================================
----
jajuk-1.7~rc10+svn4318.orig/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java
2008-10-18 17:15:09.000000000 -0400
-+++
jajuk-1.7~rc10+svn4318/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java
2008-11-28 17:46:32.000000000 -0500
-@@ -39,12 +39,12 @@
+--- 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 @@
import org.jajuk.util.UtilGUI;
import org.jajuk.util.UtilSystem;
import org.w3c.dom.Document;
@@ -18,19 +18,19 @@
+import org.lobobrowser.html.parser.InputSourceImpl;
+import org.lobobrowser.html.test.SimpleUserAgentContext;
+import org.lobobrowser.html.test.SimpleHtmlRendererContext;
+ import org.xml.sax.SAXException;
/**
- * Type description
-@@ -55,7 +55,7 @@
+@@ -58,7 +58,7 @@
- private SimpleHtmlRendererContext rcontext;
+ private final SimpleHtmlRendererContext rcontext;
-- private HtmlParserContext context;
-+ private UserAgentContext context;
+- private final HtmlParserContext context;
++ private final UserAgentContext context;
- private DocumentBuilderImpl dbi;
+ private final DocumentBuilderImpl dbi;
-@@ -67,7 +67,7 @@
+@@ -70,7 +70,7 @@
// Disable Cobra traces
Logger.getLogger("").setLevel(Level.OFF);
rcontext = new SimpleHtmlRendererContext(this);
Modified: trunk/jajuk/debian/patches/swingx.diff
===================================================================
--- trunk/jajuk/debian/patches/swingx.diff 2009-05-25 06:01:29 UTC (rev
8298)
+++ trunk/jajuk/debian/patches/swingx.diff 2009-05-25 06:22:48 UTC (rev
8299)
@@ -1,42 +1,29 @@
-Index: jajuk-1.7~rc10+svn4318/src/main/java/org/jajuk/ui/views/QueueView.java
+Index: jajuk-1.8/src/main/java/org/jajuk/ui/views/QueueView.java
===================================================================
----
jajuk-1.7~rc10+svn4318.orig/src/main/java/org/jajuk/ui/views/QueueView.java
2008-11-16 17:07:18.000000000 -0500
-+++ jajuk-1.7~rc10+svn4318/src/main/java/org/jajuk/ui/views/QueueView.java
2008-11-28 17:46:16.000000000 -0500
-@@ -164,8 +164,7 @@
- });
- initMenuItems();
-
-- ColorHighlighter colorHighlighter = new ColorHighlighter(Color.ORANGE,
null,
-- new PlayHighlighterPredicate(editorModel));
-+ ColorHighlighter colorHighlighter = new ColorHighlighter(new
PlayHighlighterPredicate(editorModel), Color.ORANGE, null);
+--- 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
+@@ -187,8 +187,7 @@
+ } else {
+ queueHighlighterColor = scheme.getLineColor();
+ }
+- ColorHighlighter colorHighlighter = new
ColorHighlighter(queueHighlighterColor, null,
+- new IndexHighlighterPredicate());
++ ColorHighlighter colorHighlighter = new ColorHighlighter(new
IndexHighlighterPredicate(), queueHighlighterColor, null);
Highlighter alternate = UtilGUI.getAlternateHighlighter();
editorTable.setHighlighters(alternate, colorHighlighter);
// register events
-@@ -525,4 +524,4 @@
+@@ -592,4 +591,4 @@
}
}
-}
\ No newline at end of file
+}
-Index:
jajuk-1.7~rc10+svn4318/src/main/java/org/jajuk/ui/wizard/PropertiesWizard.java
+Index: jajuk-1.8/src/main/java/org/jajuk/ui/views/PlaylistView.java
===================================================================
----
jajuk-1.7~rc10+svn4318.orig/src/main/java/org/jajuk/ui/wizard/PropertiesWizard.java
2008-11-26 17:02:04.000000000 -0500
-+++
jajuk-1.7~rc10+svn4318/src/main/java/org/jajuk/ui/wizard/PropertiesWizard.java
2008-11-28 17:44:09.000000000 -0500
-@@ -425,7 +425,7 @@
- // to set date to today for multiple selection and to allow
jajuk
- // to
- // detect a change
-- jdp.setDateInMillis(0l);
-+ jdp.setDate(new Date(0l));
- }
- widgets[index][1] = jdp;
- } else if (meta.getType().equals(Boolean.class)) {
-Index:
jajuk-1.7~rc10+svn4318/src/main/java/org/jajuk/ui/views/PlaylistView.java
-===================================================================
----
jajuk-1.7~rc10+svn4318.orig/src/main/java/org/jajuk/ui/views/PlaylistView.java
2008-11-16 17:07:18.000000000 -0500
-+++ jajuk-1.7~rc10+svn4318/src/main/java/org/jajuk/ui/views/PlaylistView.java
2008-11-28 17:45:30.000000000 -0500
-@@ -321,8 +321,7 @@
+--- 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 @@
initMenuItems();
@@ -46,3 +33,16 @@
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
+@@ -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
+ // to detect a change
+- jdp.setDateInMillis(0l);
++ jdp.setDate(new Date(0l));
+ }
+ widgets[index][1] = jdp;
+ } else if (meta.getType().equals(Boolean.class)) {
Modified: trunk/jajuk/debian/rules
===================================================================
--- trunk/jajuk/debian/rules 2009-05-25 06:01:29 UTC (rev 8298)
+++ trunk/jajuk/debian/rules 2009-05-25 06:22:48 UTC (rev 8299)
@@ -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 tablelayout tritonus_share vldocking vorbisspi
+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
install/jajuk::
install -m 755 -D debian/jajuk.sh $(DEB_DESTDIR)/usr/bin/jajuk
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
