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

Damien Raude-Morvan drazzib at alioth.debian.org
Wed Feb 22 22:19:45 UTC 2012 

Author: drazzib
Date: 2012-02-22 22:19:44 +0000 (Wed, 22 Feb 2012)
New Revision: 15790

Modified:
   trunk/jajuk/debian/MANIFEST.MF
   trunk/jajuk/debian/changelog
   trunk/jajuk/debian/control
   trunk/jajuk/debian/copyright
   trunk/jajuk/debian/patches/01_override_manifest.diff
   trunk/jajuk/debian/patches/02_lastfm_fix_0_1_0.diff
   trunk/jajuk/debian/rules
Log:
* New upstream release.
* Refresh patches.
* Use Guava:
  - d/control: Build-Depends and Depends on libguava-java r11.
  - d/rules: Add guava to DEB_JARS.
  - d/MANIFEST.MF: Add guava to runtime classpath.
* d/copyright: Small fixes, thanks to lintian!

Modified: trunk/jajuk/debian/MANIFEST.MF
===================================================================
--- trunk/jajuk/debian/MANIFEST.MF	2012-02-19 18:41:05 UTC (rev 15789)
+++ trunk/jajuk/debian/MANIFEST.MF	2012-02-22 22:19:44 UTC (rev 15790)
@@ -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 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 jhlabs-filters.jar lastfm.jar commons-io.jar commons-lang.jar xstream.jar jna.jar js.jar simple-validation.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 jhlabs-filters.jar lastfm.jar commons-io.jar commons-lang.jar xstream.jar jna.jar js.jar simple-validation.jar guava.jar
 Specification-Title: Jajuk

Modified: trunk/jajuk/debian/changelog
===================================================================
--- trunk/jajuk/debian/changelog	2012-02-19 18:41:05 UTC (rev 15789)
+++ trunk/jajuk/debian/changelog	2012-02-22 22:19:44 UTC (rev 15790)
@@ -1,3 +1,15 @@
+jajuk (1:1.9.6-1) unstable; urgency=low
+
+  * New upstream release.
+  * Refresh patches.
+  * Use Guava:
+    - d/control: Build-Depends and Depends on libguava-java r11.
+    - d/rules: Add guava to DEB_JARS.
+    - d/MANIFEST.MF: Add guava to runtime classpath.
+  * d/copyright: Small fixes, thanks to lintian!
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 22 Feb 2012 23:15:18 +0100
+
 jajuk (1:1.9.5-3) unstable; urgency=low
 
   * Fix "FTBFS: JAVA_HOME not defined correctly.", in debian/rules:

Modified: trunk/jajuk/debian/control
===================================================================
--- trunk/jajuk/debian/control	2012-02-19 18:41:05 UTC (rev 15789)
+++ trunk/jajuk/debian/control	2012-02-22 22:19:44 UTC (rev 15790)
@@ -17,6 +17,7 @@
                      libcommons-lang-java,
                      libcommons-logging-java,
                      libdbus-java,
+                     libguava-java (>= 11),
                      libjaudiotagger-java (>= 2.0.0),
                      libjcommon-java,
                      libjfreechart-java,
@@ -58,6 +59,7 @@
          libcommons-lang-java,
          libcommons-logging-java,
          libdbus-java,
+         libguava-java (>= 11),
          libjaudiotagger-java (>= 2.0.0),
          libjcommon-java,
          libjfreechart-java,

Modified: trunk/jajuk/debian/copyright
===================================================================
--- trunk/jajuk/debian/copyright	2012-02-19 18:41:05 UTC (rev 15789)
+++ trunk/jajuk/debian/copyright	2012-02-22 22:19:44 UTC (rev 15790)
@@ -23,27 +23,27 @@
 Copyright: 2009 Zdenek Pech
 License: GPL-2+
 
-Files: src/main/java/ext/JSplashLabel.java,
- src/main/java/ext/ProcessLauncher.java,
- src/main/java/ext/AutoCompleteDocument.java,
- src/main/java/ext/JVM.java,
- src/main/java/ext/AutoCompleteDecorator.java,
- src/main/java/ext/JXTrayIcon.java,
+Files: src/main/java/ext/JSplashLabel.java
+ src/main/java/ext/ProcessLauncher.java
+ src/main/java/ext/AutoCompleteDocument.java
+ src/main/java/ext/JVM.java
+ src/main/java/ext/AutoCompleteDecorator.java
+ src/main/java/ext/JXTrayIcon.java
  src/main/java/ext/JSplash.java
 Copyright: © 2007 The Jajuk Team
 Copyright: (c) 2004,2005 Gregory Kotsaftis <gregkotsaftis at yahoo.com>
 Copyright: (C) 2006  Fabio MARAZZATO, Yann D'ISANTO
 Copyright: © 2004, 2006, 2008 Sun Microsystems, Inc.
-Licence: LGPL-2.1+
+License: LGPL-2.1+
 
-Files: src/main/java/ext/services/lastfm/*,
- src/main/java/ext/services/network/NetworkUtils.java,
+Files: src/main/java/ext/services/lastfm/*
+ src/main/java/ext/services/network/NetworkUtils.java
  src/main/java/ext/services/network/Proxy.java
- src/main/java/ext/JScrollingText.java,
- src/main/java/ext/service/io/Kernel32.java,
- src/main/java/ext/service/io/NativeFunctionsUtils.java,
- src/main/java/ext/services/xml/XMLBuilder.java,
- src/main/java/ext/services/xml/XMLUtils.java,
+ src/main/java/ext/JScrollingText.java
+ src/main/java/ext/service/io/Kernel32.java
+ src/main/java/ext/service/io/NativeFunctionsUtils.java
+ src/main/java/ext/services/xml/XMLBuilder.java
+ src/main/java/ext/services/xml/XMLUtils.java
  src/main/java/ext/XMLUtils.java
 Copyright: (C) 2006-2009 Alex Aranda, Sylvain Gaudard, Thomas Beckers and contributors
 Copyright: (C) 2006-2007 Alex Aranda (fleax) alex at atunes.org
@@ -52,7 +52,7 @@
 
 Files: src/main/resources/icons/*
 Copyright: public domain
-Licence: public-domain
+License: public-domain
  From <http://tango.freedesktop.org/Tango_Desktop_Project>
  The Tango base icon theme is released to the Public Domain.
  The palette is in public domain.

Modified: trunk/jajuk/debian/patches/01_override_manifest.diff
===================================================================
--- trunk/jajuk/debian/patches/01_override_manifest.diff	2012-02-19 18:41:05 UTC (rev 15789)
+++ trunk/jajuk/debian/patches/01_override_manifest.diff	2012-02-22 22:19:44 UTC (rev 15790)
@@ -3,8 +3,6 @@
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Update: 2011-03-26
 Forwarded: no
-Index: b/src/scripts/build.xml
-===================================================================
 --- a/src/scripts/build.xml
 +++ b/src/scripts/build.xml
 @@ -71,6 +71,7 @@
@@ -15,7 +13,7 @@
  
  	<!-- This used to be the intermediate directory used to build war file, we used a persisitent 
   	directory to use jar files in next war (each war contains current and previous jars for 
-@@ -252,7 +253,7 @@
+@@ -254,7 +255,7 @@
  
  	<target name='package_jar' description='o Create Jajuk jar file' depends='startup,clean,mkdist_jar,compile'>
  		<echo message='Create Jajuk jar file' />

Modified: trunk/jajuk/debian/patches/02_lastfm_fix_0_1_0.diff
===================================================================
--- trunk/jajuk/debian/patches/02_lastfm_fix_0_1_0.diff	2012-02-19 18:41:05 UTC (rev 15789)
+++ trunk/jajuk/debian/patches/02_lastfm_fix_0_1_0.diff	2012-02-22 22:19:44 UTC (rev 15790)
@@ -3,11 +3,9 @@
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Update: 2011-08-21
 Forwarded: no
-Index: b/src/main/java/ext/services/lastfm/LastFmAlbum.java
-===================================================================
 --- a/src/main/java/ext/services/lastfm/LastFmAlbum.java
 +++ b/src/main/java/ext/services/lastfm/LastFmAlbum.java
-@@ -31,10 +31,10 @@
+@@ -33,10 +33,10 @@
  
  import javax.swing.ImageIcon;
  
@@ -22,11 +20,9 @@
  
  import org.jajuk.util.UtilString;
  
-Index: b/src/main/java/ext/services/lastfm/LastFmAlbumList.java
-===================================================================
 --- a/src/main/java/ext/services/lastfm/LastFmAlbumList.java
 +++ b/src/main/java/ext/services/lastfm/LastFmAlbumList.java
-@@ -25,7 +25,7 @@
+@@ -27,7 +27,7 @@
  import java.util.Collection;
  import java.util.List;
  
@@ -35,11 +31,9 @@
  
  /**
   * The Class LastFmAlbumList.
-Index: b/src/main/java/ext/services/lastfm/LastFmArtist.java
-===================================================================
 --- a/src/main/java/ext/services/lastfm/LastFmArtist.java
 +++ b/src/main/java/ext/services/lastfm/LastFmArtist.java
-@@ -23,8 +23,8 @@
+@@ -25,8 +25,8 @@
  
  import javax.swing.ImageIcon;
  
@@ -50,11 +44,9 @@
  
  /**
   * The Class LastFmArtist.
-Index: b/src/main/java/ext/services/lastfm/LastFmCache.java
-===================================================================
 --- a/src/main/java/ext/services/lastfm/LastFmCache.java
 +++ b/src/main/java/ext/services/lastfm/LastFmCache.java
-@@ -33,7 +33,7 @@
+@@ -35,7 +35,7 @@
  
  import javax.swing.ImageIcon;
  
@@ -63,11 +55,9 @@
  
  import org.apache.commons.io.FileUtils;
  import org.jajuk.services.core.SessionService;
-Index: b/src/main/java/ext/services/lastfm/LastFmService.java
-===================================================================
 --- a/src/main/java/ext/services/lastfm/LastFmService.java
 +++ b/src/main/java/ext/services/lastfm/LastFmService.java
-@@ -31,16 +31,17 @@
+@@ -33,16 +33,17 @@
  import java.util.Locale;
  import java.util.Set;
  
@@ -95,7 +85,7 @@
  
  import org.apache.commons.lang.StringEscapeUtils;
  import org.apache.commons.lang.StringUtils;
-@@ -291,11 +292,11 @@
+@@ -279,11 +280,11 @@
     * 
     * @return the artist top tag
     */
@@ -111,9 +101,9 @@
      } catch (Exception e) {
        Log.error(e);
      }
-@@ -406,9 +407,9 @@
-   private Image getArtistImageFromLastFM(String artistName) {
+@@ -398,9 +399,9 @@
      try {
+       Proxy proxy = DownloadManager.getProxy();
        // Try to get from Artist.getImages() method
 -      PaginatedResult<net.roarsoftware.lastfm.Image> images = Artist.getImages(artistName, 1, 1,
 +      PaginatedResult<de.umass.lastfm.Image> images = Artist.getImages(artistName, 1, 1,
@@ -123,7 +113,7 @@
            images.getPageResults());
        if (!imageList.isEmpty()) {
          Set<ImageSize> sizes = imageList.get(0).availableSizes();
-@@ -463,7 +464,8 @@
+@@ -455,7 +456,8 @@
        String wikiText = lastFmCache.retrieveArtistWiki(artist);
        if (wikiText == null) {
  
@@ -133,11 +123,9 @@
          wikiText = a != null ? a.getWikiSummary() : "";
          if (wikiText != null) {
            wikiText = wikiText.replaceAll("<.*?>", "");
-Index: b/src/main/java/ext/services/lastfm/LastFmSimilarArtists.java
-===================================================================
 --- a/src/main/java/ext/services/lastfm/LastFmSimilarArtists.java
 +++ b/src/main/java/ext/services/lastfm/LastFmSimilarArtists.java
-@@ -27,8 +27,8 @@
+@@ -29,8 +29,8 @@
  import java.util.Comparator;
  import java.util.List;
  
@@ -148,11 +136,9 @@
  
  /**
   * The Class LastFmSimilarArtists.
-Index: b/src/main/java/ext/services/lastfm/LastFmTrack.java
-===================================================================
 --- a/src/main/java/ext/services/lastfm/LastFmTrack.java
 +++ b/src/main/java/ext/services/lastfm/LastFmTrack.java
-@@ -21,7 +21,7 @@
+@@ -23,7 +23,7 @@
  
  package ext.services.lastfm;
  
@@ -161,8 +147,6 @@
  
  /**
   * The Class LastFmTrack.
-Index: b/src/test/java/ext/services/lastfm/TestLastFmAlbum.java
-===================================================================
 --- a/src/test/java/ext/services/lastfm/TestLastFmAlbum.java
 +++ b/src/test/java/ext/services/lastfm/TestLastFmAlbum.java
 @@ -25,9 +25,9 @@
@@ -187,8 +171,6 @@
     * .
     */
    public void testGetAlbum() {
-Index: b/src/test/java/ext/services/lastfm/TestLastFmAlbumList.java
-===================================================================
 --- a/src/test/java/ext/services/lastfm/TestLastFmAlbumList.java
 +++ b/src/test/java/ext/services/lastfm/TestLastFmAlbumList.java
 @@ -23,7 +23,7 @@

Modified: trunk/jajuk/debian/rules
===================================================================
--- trunk/jajuk/debian/rules	2012-02-19 18:41:05 UTC (rev 15789)
+++ trunk/jajuk/debian/rules	2012-02-22 22:19:44 UTC (rev 15790)
@@ -6,7 +6,7 @@
 JAVA_HOME := $(firstword $(wildcard /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/java-6-openjdk))
 DEB_ANT_BUILDFILE	:= src/scripts/build.xml
 DEB_ANT_BUILD_TARGET	:= package_jar
-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 jhlabs-filters lastfm commons-lang commons-io xstream simple-validation
+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 jhlabs-filters lastfm commons-lang commons-io xstream simple-validation guava
 
 install/jajuk::
 	install -m 755 -D debian/jajuk.sh $(DEB_DESTDIR)/usr/bin/jajuk

More information about the pkg-java-commits mailing list