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

varun at alioth.debian.org varun at alioth.debian.org
Fri Nov 28 23:01:03 UTC 2008 

Author: varun
Date: 2008-11-28 23:01:02 +0000 (Fri, 28 Nov 2008)
New Revision: 7444

Modified:
   trunk/jajuk/debian/MANIFEST.MF
   trunk/jajuk/debian/changelog
   trunk/jajuk/debian/control
   trunk/jajuk/debian/orig-tar.sh
   trunk/jajuk/debian/patches/cobra.diff
   trunk/jajuk/debian/patches/swingx.diff
   trunk/jajuk/debian/rules
Log:
* New upstream release
* Add libjaudiotagger-java to (Build-)Depends

Modified: trunk/jajuk/debian/MANIFEST.MF
===================================================================
--- trunk/jajuk/debian/MANIFEST.MF	2008-11-28 22:09:42 UTC (rev 7443)
+++ trunk/jajuk/debian/MANIFEST.MF	2008-11-28 23:01:02 UTC (rev 7444)
@@ -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 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 tablelayout.jar tritonus_share.jar vldocking.jar vorbisspi.jar jajuk-help.jar jajuk-help_fr.jar
 Specification-Title: Jajuk

Modified: trunk/jajuk/debian/changelog
===================================================================
--- trunk/jajuk/debian/changelog	2008-11-28 22:09:42 UTC (rev 7443)
+++ trunk/jajuk/debian/changelog	2008-11-28 23:01:02 UTC (rev 7444)
@@ -1,3 +1,10 @@
+jajuk (1.7~rc10+svn4317-1) unstable; urgency=low
+
+  * New upstream release
+  * Add libjaudiotagger-java to (Build-)Depends
+
+ -- Varun Hiremath <varun at debian.org>  Fri, 28 Nov 2008 17:34:41 -0500
+
 jajuk (1.6.2+svn4047-2) unstable; urgency=low
 
   * Add patches/swingx.diff for changes in the new version of swingx

Modified: trunk/jajuk/debian/control
===================================================================
--- trunk/jajuk/debian/control	2008-11-28 22:09:42 UTC (rev 7443)
+++ trunk/jajuk/debian/control	2008-11-28 23:01:02 UTC (rev 7444)
@@ -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, 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, libjaudiotagger-java, 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, 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, libjaudiotagger-java, 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/orig-tar.sh
===================================================================
--- trunk/jajuk/debian/orig-tar.sh	2008-11-28 22:09:42 UTC (rev 7443)
+++ trunk/jajuk/debian/orig-tar.sh	2008-11-28 23:01:02 UTC (rev 7444)
@@ -10,8 +10,10 @@
 mkdir $DIR
 mkdir $DIR/src
 (cd $DIR/src; \
-svn export -r $REVISION https://jajuk.svn.sourceforge.net/svnroot/jajuk/branches/maintenance-1_6/src/main; \
-svn export -r $REVISION https://jajuk.svn.sourceforge.net/svnroot/jajuk/branches/maintenance-1_6/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 )
+#svn export -r $REVISION https://jajuk.svn.sourceforge.net/svnroot/jajuk/branches/maintenance-1_6/src/main; \
+#svn export -r $REVISION https://jajuk.svn.sourceforge.net/svnroot/jajuk/branches/maintenance-1_6/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	2008-11-28 22:09:42 UTC (rev 7443)
+++ trunk/jajuk/debian/patches/cobra.diff	2008-11-28 23:01:02 UTC (rev 7444)
@@ -1,10 +1,10 @@
-Index: jajuk-1.6+svn3925/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java
+Index: jajuk-1.7~rc10+svn4318/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java
 ===================================================================
---- jajuk-1.6+svn3925.orig/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java	2008-05-11 23:01:16.000000000 +0530
-+++ jajuk-1.6+svn3925/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java	2008-05-13 21:28:17.000000000 +0530
-@@ -38,12 +38,12 @@
- import org.jajuk.util.Messages;
- import org.jajuk.util.Util;
+--- 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 @@
+ import org.jajuk.util.UtilGUI;
+ import org.jajuk.util.UtilSystem;
  import org.w3c.dom.Document;
 -import org.xamjwg.html.HtmlParserContext;
 -import org.xamjwg.html.gui.HtmlPanel;
@@ -21,7 +21,7 @@
  
  /**
   * Type description
-@@ -54,7 +54,7 @@
+@@ -55,7 +55,7 @@
  
    private SimpleHtmlRendererContext rcontext;
  
@@ -30,7 +30,7 @@
  
    private DocumentBuilderImpl dbi;
  
-@@ -66,7 +66,7 @@
+@@ -67,7 +67,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	2008-11-28 22:09:42 UTC (rev 7443)
+++ trunk/jajuk/debian/patches/swingx.diff	2008-11-28 23:01:02 UTC (rev 7444)
@@ -1,43 +1,29 @@
-Index: jajuk-1.6.2+svn4047/src/main/java/org/jajuk/ui/views/PlaylistView.java
+Index: jajuk-1.7~rc10+svn4318/src/main/java/org/jajuk/ui/views/QueueView.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);
+--- 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);
-     Highlighter alternate = Util.getAlternateHighlighter();
+     Highlighter alternate = UtilGUI.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 @@
+@@ -525,4 +524,4 @@
      }
    }
  
 -}
 \ No newline at end of file
 +}
-Index: jajuk-1.6.2+svn4047/src/main/java/org/jajuk/ui/wizard/PropertiesWizard.java
+Index: jajuk-1.7~rc10+svn4318/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 @@
+--- 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
@@ -46,3 +32,17 @@
              }
              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 @@
+ 
+     initMenuItems();
+ 
+-    ColorHighlighter colorHighlighter = new ColorHighlighter(Color.ORANGE, null,
+-        new PlayHighlighterPredicate(editorModel));
++    ColorHighlighter colorHighlighter = new ColorHighlighter(new PlayHighlighterPredicate(editorModel), Color.ORANGE, null);
+     Highlighter alternate = UtilGUI.getAlternateHighlighter();
+     editorTable.setHighlighters(alternate, colorHighlighter);
+     // register events

Modified: trunk/jajuk/debian/rules
===================================================================
--- trunk/jajuk/debian/rules	2008-11-28 22:09:42 UTC (rev 7443)
+++ trunk/jajuk/debian/rules	2008-11-28 23:01:02 UTC (rev 7444)
@@ -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 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 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