[pkg-java] r6654 - in trunk/jajuk/debian: . patches

varun at alioth.debian.org varun at alioth.debian.org
Tue Jul 8 21:07:48 UTC 2008 

Author: varun
Date: 2008-07-08 21:07:47 +0000 (Tue, 08 Jul 2008)
New Revision: 6654

Added:
   trunk/jajuk/debian/patches/swingx.diff
Modified:
   trunk/jajuk/debian/changelog
   trunk/jajuk/debian/control
   trunk/jajuk/debian/patches/series
   trunk/jajuk/debian/rules
Log:
* Add patches/swingx.diff for changes in the new version of swingx
* Remove libjdic-java from (Build-)Depends

Modified: trunk/jajuk/debian/changelog
===================================================================
--- trunk/jajuk/debian/changelog	2008-07-08 14:08:14 UTC (rev 6653)
+++ trunk/jajuk/debian/changelog	2008-07-08 21:07:47 UTC (rev 6654)
@@ -1,3 +1,10 @@
+jajuk (1.6.2+svn4047-2) unstable; urgency=low
+
+  * Add patches/swingx.diff for changes in the new version of swingx
+  * Remove libjdic-java from (Build-)Depends
+
+ -- Varun Hiremath <varun at debian.org>  Tue, 08 Jul 2008 18:26:23 +0530
+
 jajuk (1.6.2+svn4047-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/jajuk/debian/control
===================================================================
--- trunk/jajuk/debian/control	2008-07-08 14:08:14 UTC (rev 6653)
+++ trunk/jajuk/debian/control	2008-07-08 21:07:47 UTC (rev 6654)
@@ -4,7 +4,7 @@
 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>
 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, libjgoodies-forms-java, libjcommon-java, libjdic-java, libjfreechart-java, javahelp2, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, libqdwizard-java, substance, libswingx-java, libtablelayout-java, libtritonus-java, libvldocking-java, libvorbisspi-java, mplayer, sun-java6-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, libjgoodies-forms-java, libjcommon-java, libjfreechart-java, javahelp2, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, libqdwizard-java, substance, libswingx-java, libtablelayout-java, libtritonus-java, libvldocking-java, libvorbisspi-java, mplayer, sun-java6-jdk
 Standards-Version: 3.8.0
 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}, sun-java6-jre, libjgoodies-animation-java, libbasicplayer-java, libcobra-java, libcommons-codec-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-logging-java, entagged, libjgoodies-forms-java, libjcommon-java, libjdic-java, libjfreechart-java, javahelp2, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, libqdwizard-java, substance, libswingx-java, libtablelayout-java, libtritonus-java, libvldocking-java, libvorbisspi-java, liblaf-plugin-java, liblaf-widget-java, mplayer
+Depends: ${shlibs:Depends}, ${misc:Depends}, sun-java6-jre, libjgoodies-animation-java, libbasicplayer-java, libcobra-java, libcommons-codec-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-logging-java, entagged, libjgoodies-forms-java, libjcommon-java, libjfreechart-java, javahelp2, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, libqdwizard-java, substance, libswingx-java, libtablelayout-java, libtritonus-java, libvldocking-java, libvorbisspi-java, liblaf-plugin-java, liblaf-widget-java, mplayer
 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/patches/series
===================================================================
--- trunk/jajuk/debian/patches/series	2008-07-08 14:08:14 UTC (rev 6653)
+++ trunk/jajuk/debian/patches/series	2008-07-08 21:07:47 UTC (rev 6654)
@@ -1 +1,2 @@
+swingx.diff
 cobra.diff

Added: trunk/jajuk/debian/patches/swingx.diff
===================================================================
--- trunk/jajuk/debian/patches/swingx.diff	                        (rev 0)
+++ trunk/jajuk/debian/patches/swingx.diff	2008-07-08 21:07:47 UTC (rev 6654)
@@ -0,0 +1,48 @@
+Index: jajuk-1.6.2+svn4047/src/main/java/org/jajuk/ui/views/PlaylistView.java
+===================================================================
+--- jajuk-1.6.2+svn4047.orig/src/main/java/org/jajuk/ui/views/PlaylistView.java	2008-07-08 18:11:02.000000000 +0530
++++ jajuk-1.6.2+svn4047/src/main/java/org/jajuk/ui/views/PlaylistView.java	2008-07-08 18:11:07.000000000 +0530
+@@ -329,8 +329,7 @@
+     editorTable.getMenu().add(jmiFileDown);
+     editorTable.getMenu().add(jmiFileProperties);
+ 
+-    ColorHighlighter colorHighlighter = new ColorHighlighter(Color.ORANGE, null,
+-        new PlayHighlighterPredicate(editorModel));
++    ColorHighlighter colorHighlighter = new ColorHighlighter(new PlayHighlighterPredicate(editorModel), Color.ORANGE, null);
+     Highlighter alternate = Util.getAlternateHighlighter();
+     editorTable.setHighlighters(alternate, colorHighlighter);
+     // register events
+Index: jajuk-1.6.2+svn4047/src/main/java/org/jajuk/ui/views/QueueView.java
+===================================================================
+--- jajuk-1.6.2+svn4047.orig/src/main/java/org/jajuk/ui/views/QueueView.java	2008-07-08 18:11:02.000000000 +0530
++++ jajuk-1.6.2+svn4047/src/main/java/org/jajuk/ui/views/QueueView.java	2008-07-08 18:11:07.000000000 +0530
+@@ -179,8 +179,7 @@
+     editorTable.getMenu().add(jmiFileDown);
+     editorTable.getMenu().add(jmiFileProperties);
+ 
+-    ColorHighlighter colorHighlighter = new ColorHighlighter(Color.ORANGE, null,
+-        new PlayHighlighterPredicate(editorModel));
++    ColorHighlighter colorHighlighter = new ColorHighlighter(new PlayHighlighterPredicate(editorModel), Color.ORANGE, null);
+     Highlighter alternate = Util.getAlternateHighlighter();
+     editorTable.setHighlighters(alternate, colorHighlighter);
+     // register events
+@@ -531,4 +530,4 @@
+     }
+   }
+ 
+-}
+\ No newline at end of file
++}
+Index: jajuk-1.6.2+svn4047/src/main/java/org/jajuk/ui/wizard/PropertiesWizard.java
+===================================================================
+--- jajuk-1.6.2+svn4047.orig/src/main/java/org/jajuk/ui/wizard/PropertiesWizard.java	2008-07-08 18:11:17.000000000 +0530
++++ jajuk-1.6.2+svn4047/src/main/java/org/jajuk/ui/wizard/PropertiesWizard.java	2008-07-08 18:11:40.000000000 +0530
+@@ -402,7 +402,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)) {

Modified: trunk/jajuk/debian/rules
===================================================================
--- trunk/jajuk/debian/rules	2008-07-08 14:08:14 UTC (rev 6653)
+++ trunk/jajuk/debian/rules	2008-07-08 21:07:47 UTC (rev 6654)
@@ -8,7 +8,7 @@
 JAVA_HOME		:= /usr/lib/jvm/java-6-sun
 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 forms jcommon jdic 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 forms jcommon jfreechart jh jl jmactritonusspi jogg jorbis js jspeex log4j-1.2 mp3spi qdwizard substance swingx tablelayout tritonus_share vldocking vorbisspi
 
 install/jajuk::
 	install -m 755 -D debian/jajuk.sh $(DEB_DESTDIR)/usr/bin/jajuk

More information about the pkg-java-commits mailing list