Author: drazzib Date: 2011-08-21 13:28:59 +0000 (Sun, 21 Aug 2011) New Revision: 14368
Added: trunk/jajuk/debian/patches/02_lastfm_fix_0_1_0.diff Modified: trunk/jajuk/debian/changelog trunk/jajuk/debian/control trunk/jajuk/debian/patches/01_override_manifest.diff trunk/jajuk/debian/patches/series Log: * d/patches/02_lastfm_fix_0_1_0.diff: Fix build with latest lastfm java binding. * d/control: Depends and B-D on liblastfm-java (>= 1:0.1.0) * d/control: wrap-and-sort Depends and B-D. Modified: trunk/jajuk/debian/changelog =================================================================== --- trunk/jajuk/debian/changelog 2011-08-21 09:43:28 UTC (rev 14367) +++ trunk/jajuk/debian/changelog 2011-08-21 13:28:59 UTC (rev 14368) @@ -1,3 +1,12 @@ +jajuk (1:1.9.5-2) unstable; urgency=low + + * d/patches/02_lastfm_fix_0_1_0.diff: Fix build with latest lastfm + java binding. + * d/control: Depends and B-D on liblastfm-java (>= 1:0.1.0) + * d/control: wrap-and-sort Depends and B-D. + + -- Damien Raude-Morvan <[email protected]> Sun, 21 Aug 2011 15:25:40 +0200 + jajuk (1:1.9.5-1) unstable; urgency=low * New upstream release. Modified: trunk/jajuk/debian/control =================================================================== --- trunk/jajuk/debian/control 2011-08-21 09:43:28 UTC (rev 14367) +++ trunk/jajuk/debian/control 2011-08-21 13:28:59 UTC (rev 14368) @@ -2,9 +2,44 @@ Section: sound Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Varun Hiremath <[email protected]>, Torsten Werner <[email protected]>, Damien Raude-Morvan <[email protected]> +Uploaders: Varun Hiremath <[email protected]>, + Torsten Werner <[email protected]>, + Damien Raude-Morvan <[email protected]> Build-Depends: cdbs, debhelper (>= 7) -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 (>= 2.0.0), libjcommon-java, libjfreechart-java, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, substance (>= 5.2), libswingx-java (>= 1:1.6), libtritonus-java, libvldocking-java, libvorbisspi-java, mplayer, default-jdk, libdbus-java, libmiglayout-java, libjna-java, libjhlabs-filters-java, liblastfm-java, libcommons-lang-java, libcommons-io-java, libxstream-java, libsimple-validation-java +Build-Depends-Indep: ant, + default-jdk, + entagged, + libbasicplayer-java, + libcobra-java, + libcommons-codec-java, + libcommons-collections3-java, + libcommons-httpclient-java, + libcommons-io-java, + libcommons-lang-java, + libcommons-logging-java, + libdbus-java, + libjaudiotagger-java (>= 2.0.0), + libjcommon-java, + libjfreechart-java, + libjgoodies-animation-java, + libjhlabs-filters-java, + libjlayer-java, + libjmac-java, + libjna-java, + libjorbis-java, + libjspeex-java, + liblastfm-java (>= 1:0.1.0), + liblog4j1.2-java, + libmiglayout-java, + libmp3spi-java, + libsimple-validation-java, + libswingx-java (>= 1:1.6), + libtritonus-java, + libvldocking-java, + libvorbisspi-java, + libxstream-java, + mplayer, + substance (>= 5.2) Standards-Version: 3.9.2 Homepage: http://jajuk.info/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jajuk @@ -12,7 +47,44 @@ Package: jajuk Architecture: all -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 (>= 2.0.0), libjcommon-java, libjfreechart-java, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, substance (>= 5.2), libswingx-java (>= 1:1.6), libtritonus-java, libvldocking-java, libvorbisspi-java, liblaf-plugin-java, liblaf-widget-java, mplayer, libdbus-java, libmiglayout-java, libjna-java, libjhlabs-filters-java, liblastfm-java, libcommons-lang-java, libcommons-io-java, libxstream-java, java-wrappers, librhino-java, libsimple-validation-java +Depends: entagged, + java-wrappers, + libbasicplayer-java, + libcobra-java, + libcommons-codec-java, + libcommons-collections3-java, + libcommons-httpclient-java, + libcommons-io-java, + libcommons-lang-java, + libcommons-logging-java, + libdbus-java, + libjaudiotagger-java (>= 2.0.0), + libjcommon-java, + libjfreechart-java, + libjgoodies-animation-java, + libjhlabs-filters-java, + libjlayer-java, + libjmac-java, + libjna-java, + libjorbis-java, + libjspeex-java, + liblaf-plugin-java, + liblaf-widget-java, + liblastfm-java (>= 1:0.1.0), + liblog4j1.2-java, + libmiglayout-java, + libmp3spi-java, + librhino-java, + libsimple-validation-java, + libswingx-java (>= 1:1.6), + libtritonus-java, + libvldocking-java, + libvorbisspi-java, + libxstream-java, + mplayer, + openjdk-6-jre, + substance (>= 5.2), + ${misc:Depends} 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/01_override_manifest.diff =================================================================== --- trunk/jajuk/debian/patches/01_override_manifest.diff 2011-08-21 09:43:28 UTC (rev 14367) +++ trunk/jajuk/debian/patches/01_override_manifest.diff 2011-08-21 13:28:59 UTC (rev 14368) @@ -3,9 +3,11 @@ Author: Damien Raude-Morvan <[email protected]> Last-Update: 2011-03-26 Forwarded: no +Index: b/src/scripts/build.xml +=================================================================== --- a/src/scripts/build.xml +++ b/src/scripts/build.xml -@@ -78,6 +78,7 @@ +@@ -71,6 +71,7 @@ <property name='distjarname' value='jajuk-java-installer-' /> <property name='sourcesdist' value='${sourcesdir}/jajuk-sources-${version}.zip' /> <property name='mplayerdir' value='/tmp/mplayer' /> @@ -13,7 +15,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 -@@ -260,7 +261,7 @@ +@@ -252,7 +253,7 @@ <target name='package_jar' description='o Create Jajuk jar file' depends='startup,clean,mkdist_jar,compile'> <echo message='Create Jajuk jar file' /> Added: trunk/jajuk/debian/patches/02_lastfm_fix_0_1_0.diff =================================================================== --- trunk/jajuk/debian/patches/02_lastfm_fix_0_1_0.diff (rev 0) +++ trunk/jajuk/debian/patches/02_lastfm_fix_0_1_0.diff 2011-08-21 13:28:59 UTC (rev 14368) @@ -0,0 +1,202 @@ +Description: Package change from lastfm Java lib from + net.roarsoftware.lastfm to de.umass.lastfm +Author: Damien Raude-Morvan <[email protected]> +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 @@ + + import javax.swing.ImageIcon; + +-import net.roarsoftware.lastfm.Album; +-import net.roarsoftware.lastfm.ImageSize; +-import net.roarsoftware.lastfm.Playlist; +-import net.roarsoftware.lastfm.Track; ++import de.umass.lastfm.Album; ++import de.umass.lastfm.ImageSize; ++import de.umass.lastfm.Playlist; ++import de.umass.lastfm.Track; + + 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 @@ + import java.util.Collection; + import java.util.List; + +-import net.roarsoftware.lastfm.Album; ++import de.umass.lastfm.Album; + + /** + * 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 @@ + + import javax.swing.ImageIcon; + +-import net.roarsoftware.lastfm.Artist; +-import net.roarsoftware.lastfm.ImageSize; ++import de.umass.lastfm.Artist; ++import de.umass.lastfm.ImageSize; + + /** + * 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 @@ + + import javax.swing.ImageIcon; + +-import net.roarsoftware.lastfm.scrobble.SubmissionData; ++import de.umass.lastfm.scrobble.SubmissionData; + + 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 @@ + import java.util.Locale; + import java.util.Set; + +-import net.roarsoftware.lastfm.Album; +-import net.roarsoftware.lastfm.Artist; +-import net.roarsoftware.lastfm.Caller; +-import net.roarsoftware.lastfm.ImageSize; +-import net.roarsoftware.lastfm.PaginatedResult; +-import net.roarsoftware.lastfm.Playlist; +-import net.roarsoftware.lastfm.scrobble.ResponseStatus; +-import net.roarsoftware.lastfm.scrobble.Scrobbler; +-import net.roarsoftware.lastfm.scrobble.Source; +-import net.roarsoftware.lastfm.scrobble.SubmissionData; ++import de.umass.lastfm.Album; ++import de.umass.lastfm.Artist; ++import de.umass.lastfm.Caller; ++import de.umass.lastfm.ImageSize; ++import de.umass.lastfm.PaginatedResult; ++import de.umass.lastfm.Playlist; ++import de.umass.lastfm.Tag; ++import de.umass.lastfm.scrobble.ResponseStatus; ++import de.umass.lastfm.scrobble.Scrobbler; ++import de.umass.lastfm.scrobble.Source; ++import de.umass.lastfm.scrobble.SubmissionData; + + import org.apache.commons.lang.StringEscapeUtils; + import org.apache.commons.lang.StringUtils; +@@ -291,11 +292,11 @@ + * + * @return the artist top tag + */ +- public String getArtistTopTag(String artist) { ++ public Tag getArtistTopTag(String artist) { + try { +- Collection<String> topTags = Artist.getTopTags(artist, UtilString.rot13(API_KEY)); +- List<String> tags = new ArrayList<String>(topTags); +- return tags.isEmpty() ? "" : tags.get(0); ++ Collection<Tag> topTags = Artist.getTopTags(artist, UtilString.rot13(API_KEY)); ++ List<Tag> tags = new ArrayList<Tag>(topTags); ++ return tags.isEmpty() ? null : tags.get(0); + } catch (Exception e) { + Log.error(e); + } +@@ -406,9 +407,9 @@ + private Image getArtistImageFromLastFM(String artistName) { + try { + // 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, + UtilString.rot13(API_KEY)); +- List<net.roarsoftware.lastfm.Image> imageList = new ArrayList<net.roarsoftware.lastfm.Image>( ++ List<de.umass.lastfm.Image> imageList = new ArrayList<de.umass.lastfm.Image>( + images.getPageResults()); + if (!imageList.isEmpty()) { + Set<ImageSize> sizes = imageList.get(0).availableSizes(); +@@ -463,7 +464,8 @@ + String wikiText = lastFmCache.retrieveArtistWiki(artist); + if (wikiText == null) { + +- Artist a = Artist.getInfo(artist, locale, UtilString.rot13(API_KEY)); ++ String userName = null; ++ Artist a = Artist.getInfo(artist, locale, userName, UtilString.rot13(API_KEY)); + 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 @@ + import java.util.Comparator; + import java.util.List; + +-import net.roarsoftware.lastfm.Artist; +-import net.roarsoftware.lastfm.ImageSize; ++import de.umass.lastfm.Artist; ++import de.umass.lastfm.ImageSize; + + /** + * 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 @@ + + package ext.services.lastfm; + +-import net.roarsoftware.lastfm.Track; ++import de.umass.lastfm.Track; + + /** + * 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 @@ + import java.util.ArrayList; + import java.util.Locale; + +-import net.roarsoftware.lastfm.Album; +-import net.roarsoftware.lastfm.CallException; +-import net.roarsoftware.lastfm.Playlist; ++import de.umass.lastfm.Album; ++import de.umass.lastfm.CallException; ++import de.umass.lastfm.Playlist; + + import org.jajuk.JUnitHelpers; + import org.jajuk.JajukTestCase; +@@ -45,7 +45,7 @@ + /** + * Test method for. + * +- * {@link ext.services.lastfm.LastFmAlbum#getAlbum(net.roarsoftware.lastfm.Album, net.roarsoftware.lastfm.Playlist)} ++ * {@link ext.services.lastfm.LastFmAlbum#getAlbum(de.umass.lastfm.Album, de.umass.lastfm.Playlist)} + * . + */ + 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 @@ + import java.util.ArrayList; + import java.util.List; + +-import net.roarsoftware.lastfm.Album; ++import de.umass.lastfm.Album; + + import org.jajuk.JajukTestCase; + import org.jajuk.util.UtilString; Modified: trunk/jajuk/debian/patches/series =================================================================== --- trunk/jajuk/debian/patches/series 2011-08-21 09:43:28 UTC (rev 14367) +++ trunk/jajuk/debian/patches/series 2011-08-21 13:28:59 UTC (rev 14368) @@ -1 +1,2 @@ 01_override_manifest.diff +02_lastfm_fix_0_1_0.diff _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
