[pkg-java] r14369 - in tags/jajuk: . 1:1.9.5-2/debian 1:1.9.5-2/debian/patches

Damien Raude-Morvan drazzib at alioth.debian.org
Sun Aug 21 13:29:45 UTC 2011


Author: drazzib
Date: 2011-08-21 13:29:45 +0000 (Sun, 21 Aug 2011)
New Revision: 14369

Added:
   tags/jajuk/1:1.9.5-2/
   tags/jajuk/1:1.9.5-2/debian/changelog
   tags/jajuk/1:1.9.5-2/debian/control
   tags/jajuk/1:1.9.5-2/debian/patches/01_override_manifest.diff
   tags/jajuk/1:1.9.5-2/debian/patches/02_lastfm_fix_0_1_0.diff
   tags/jajuk/1:1.9.5-2/debian/patches/series
Removed:
   tags/jajuk/1:1.9.5-2/debian/changelog
   tags/jajuk/1:1.9.5-2/debian/control
   tags/jajuk/1:1.9.5-2/debian/patches/01_override_manifest.diff
   tags/jajuk/1:1.9.5-2/debian/patches/series
Log:
[svn-buildpackage] Tagging jajuk 1:1.9.5-2

Deleted: tags/jajuk/1:1.9.5-2/debian/changelog
===================================================================
--- trunk/jajuk/debian/changelog	2011-08-20 14:31:07 UTC (rev 14358)
+++ tags/jajuk/1:1.9.5-2/debian/changelog	2011-08-21 13:29:45 UTC (rev 14369)
@@ -1,343 +0,0 @@
-jajuk (1:1.9.5-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 30 Jul 2011 13:55:10 +0200
-
-jajuk (1:1.9.4-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 19 Jul 2011 20:21:39 +0200
-
-jajuk (1:1.9.3-1) unstable; urgency=low
-
-  * New upstream release.
-  * d/control: Depends on librhino-java instead of rhino.
-  * Bump Standards-Version to 3.9.2: no changes needed.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 14 Jul 2011 20:37:21 +0200
-
-jajuk (1:1.9.2-1) unstable; urgency=low
-
-  * New upstream release.
-  * d/copyright: Upgrade to latest DEP-5 r166 format and add information
-    about public domain content.
-  * d/{watch,orig-tar.sh,orig-tar.exclude}: Download upstream tarball from
-    sourceforce download area.
-  * d/{rules,ant.proprties}: Use upstream Ant build-system instead of
-    debian/build.xml.
-  * d/patches/01_override_manifest.diff: Override Class-Path definition for
-    Jajuk.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 26 Mar 2011 12:44:22 +0100
-
-jajuk (1:1.9.1-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 20 Dec 2010 22:51:36 +0100
-
-jajuk (1:1.9-1) unstable; urgency=low
-
-  * New upstream -final- release: 1.9 "Killer Queen".
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 21 Nov 2010 20:09:36 +0100
-
-jajuk (1:1.9~RC9+svn6163-1) unstable; urgency=low
-
-  * New release candidate: 1.9 RC9.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 06 Nov 2010 23:21:20 +0100
-
-jajuk (1:1.9~RC5~svn6021-1) unstable; urgency=low
-
-  [ Torsten Werner ]
-  * Change maintainers into Maintainers.
-
-  [ Damien Raude-Morvan ]
-  * New release candidate: 1.9 RC5.
-  * d/control: Bump Standards-Version to 3.9.1: no changes needed.
-  * d/rules: Fix jajuk.version transformation to match upstream UpgradeManager
-    handling.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 27 Jul 2010 15:46:48 +0200
-
-jajuk (1:1.9~RC2~svn5837-1) unstable; urgency=low
-
-  * New release candidate -- 1.9 Killer Queen
-  * Add (Build-)Depends libsimple-validation-java
-  * Remove all patches/* -- merged upstream
-  * Fix watch file
-
- -- Varun Hiremath <varun at debian.org>  Sat, 10 Apr 2010 19:42:54 -0400
-
-jajuk (1:1.8.4-1) unstable; urgency=low
-
-  * In accordance with upstream recommendation, revert to 1.8.4 tag
-    as 1.8.5 release won't be released:
-    - use epoch "1" as release number prefix
-    - debian/orig-tar.sh: svn export from tags
-  * debian/install: Removed (logic moved to debian/rules)
-  * debian/README.source: Remove "patch system" section as we now use
-    3.0 (quilt) as source format
-  * debian/docs: Removed (empty)
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 03 Mar 2010 23:26:53 +0100
-
-jajuk (1.8.5~svn5725-1) unstable; urgency=low
-
-  * New snapshot from 1.8 maintenance branch (r5725):
-    - Remove jaudiotagger2.diff patch (merged upstream)
-    - Refresh jintellitype.diff patch
-  * Bump Standards-Version to 3.8.4 (no changes needed).
-  * Source format 3.0 (quilt).
-  * Update debian/copyright and convert to DEP5 format
-  * Depends on rhino package and add js.jar to Class-Path in JAR
-    to prevent issue with HTML viewer.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 26 Feb 2010 23:01:31 +0100
-
-jajuk (1.8.4~svn5662-1) unstable; urgency=low
-
-  * New snapshot from 1.8 maintenance branch (r5662).
-    - remove jajuktablemodel.diff: merged upstream
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 09 Jan 2010 15:35:06 +0100
-
-jajuk (1.8.4~svn5628-1) unstable; urgency=low
-
-  * New upstream bugfix release
-    - Snapshot from 1.8 maintenance branch (r5628).
-  * debian/patches:
-    - (new) jaudiotagger.diff: fix compat with Jaudiotagger 2.0
-    - (new) jajuktablemodel.diff: never return null in getColumnClass
-    - (new) jintellitype.diff: disable jintellitype (win32 only)
-  * Thighten Depends and B-D:
-    - substance >= 5.2
-    - libjaudiotagger >= 2.0.0
-    - libswingx >= 1:1.6
-  * Bump debhelper version to >= 7
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 30 Dec 2009 22:08:36 +0100
-
-jajuk (1.8.2~svn5414-1) unstable; urgency=low
-
-  [ Damien Raude-Morvan ]
-  * New upstream bugfix release
-    - Snapshot from 1.8 maintenance branch (r5414).
-    - Fix NPE in CatalogView when running under KDE.
-  * Update my email address.
-
-  [ Michael Koch ]
-  * Fixed watch file.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 23 Oct 2009 19:42:06 +0200
-
-jajuk (1.8.1+svn5138-1) unstable; urgency=low
-
-  * New upstream release
-  * debian/control:
-    - Use libjhlabs-filters-java instead of libpixels-java
-    - Bump Standards-Version to 3.8.3
-  * debian/MANIFEST.MF: replace pixels with jhlabs-filters
-  * debian/rules: replace pixels with jhlabs-filters in DEB_JARS
-  * Fix debian/watch file
-  * debian/orig-tar.sh: track only the latest maintenance branch
-
- -- Varun Hiremath <varun at debian.org>  Sun, 30 Aug 2009 22:09:13 -0400
-
-jajuk (1.8~svn5030-1) unstable; urgency=low
-
-  [ Damien Raude-Morvan ]
-  * New upstream release 1.8 Breathless (r5030).
-  * debian/control:
-    - Add liblastfm-java, libxstream-java, libcommons-lang-java
-      and libcommons-io-java in Depends and Build-Depends
-    - Remove javahelp2, libjgoodies-forms-java and libqdwizard-java
-      from Build-Depends
-    - Add java-wrappers to Depends (for shell script)
-  * debian/rules:
-    - Add pixels, lastfm, commons-lang, commons-io and xstream in DEB_JARS
-    - Remove forms, jh (javahelp2), js (rhino), qdwizard in DEB_JARS
-  * debian/MANIFEST.MF:
-    - Update like DEB_JARS + remove jdic.jar + add jna.jar
-  * Update all patches to new release
-  * Add a new substance.diff patch for Substance 5.2 compatibility
-  * Rework jajuk.sh launch script:
-    - Use java-wrappers for finding a suitable JAVA_HOME (Java6)
-    - Move old $HOME/.jajuk_test_{1.7,1.8} to $HOME/.jajuk
-      and describe this change in debian/NEWS for users
-  * Bump Standards-Version to 3.8.2 (no changes needed)
-
-  [ Varun Hiremath ]
-  * debian/jajuk.sh: use upstream settings for JAVA_OPTS
-  * debian/orig-tar.sh: remove doc files from source tarball
-  * debian/build.xml: remove javadoc build
-
- -- Varun Hiremath <varun at debian.org>  Sun, 09 Aug 2009 19:13:28 -0400
-
-jajuk (1.8~svn4796-1) unstable; urgency=low
-
-  * New bugfix release from upstream
-  * debian/copyright: Tango icons are now released under the public
-    domain, update the license.
-  * Add libpixels-java to Build-Depends
-
- -- Varun Hiremath <varun at debian.org>  Sun, 14 Jun 2009 07:36:35 -0400
-
-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 <varun at debian.org>  Mon, 25 May 2009 02:18:01 -0400
-
-jajuk (1.7.1-1) unstable; urgency=low
-
-  [ Damien Raude-Morvan ]
-  * New upstream release
-  * Build and run with OpenJDK-6
-    - debian/control: B-D on opendjk-6-jdk and D on openjdk-6-jre
-    - debian/jajuk.sh: Run with openjdk-6-jre
-    - debian/rules: Build with JAVA_HOME as openjdk-6-jdk
-  * Add myself as Uploaders
-  * Bump Standards-Version to 3.8.1 (no changes needed)
-  * Build-Depends/Depends on libjaudiotagger-java >= 1.0.9
-  * Build-Depends/Depends on libqdwizard-java >= 2.1
-
-  [ Varun Hiremath ]
-  * Accept changes made by Damien Raude-Morvan (Closes: #522131)
-  * Fix VERSION and DATE replace in build.xml
-
- -- Varun Hiremath <varun at debian.org>  Wed, 01 Apr 2009 20:26:58 -0400
-
-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
-  * 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
-  * Bump Standards-Version to 3.8.0
-
- -- Varun Hiremath <varun at debian.org>  Sun, 22 Jun 2008 19:10:59 +0530
-
-jajuk (1.6+svn3925-1) unstable; urgency=low
-
-  * New upstream release
-  * Fix debian/build.xml files, make sure all xml files are installed
-
- -- Varun Hiremath <varun at debian.org>  Sun, 01 Jun 2008 02:35:56 +0530
-
-jajuk (1.5.3+svn3684-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Varun Hiremath <varun at debian.org>  Sun, 30 Mar 2008 23:05:39 +0530
-
-jajuk (1.5+svn3461-2) unstable; urgency=low
-
-  * Add patches/swingx.diff for changes in the new version of swingx
-  * Update patches/cobra.diff for changes in cobra
-
- -- Varun Hiremath <varun at debian.org>  Thu, 13 Mar 2008 13:46:28 +0530
-
-jajuk (1.5+svn3461-1) unstable; urgency=low
-
-  * New upstream release
-  * Move package to non-free as some of the icons used are released under
-    the Creative Commons license
-  * Remove patches/lastfm.diff - not required
-  * Update watch and orig-tar.sh files
-
- -- Varun Hiremath <varun at debian.org>  Sun, 10 Feb 2008 21:29:03 +0530
-
-jajuk (1.4.6+svn3338-1) unstable; urgency=low
-
-  * New upstream release
-  * Install jajuk icon to /usr/share/pixmaps and update jajuk.desktop to
-    use this icon.
-
- -- Varun Hiremath <varun at debian.org>  Sun, 20 Jan 2008 16:57:41 +0530
-
-jajuk (1.4.5+svn3233-1) unstable; urgency=low
-
-  * New upstream release
-  * debian/patches:
-    + Remove qdwizard-2.0.diff - not required
-    + Remove AquaLnFPopupLocationFix.diff - merged upstream
-    + Update cobra.diff patch
-
- -- Varun Hiremath <varun at debian.org>  Wed, 09 Jan 2008 18:24:43 +0530
-
-jajuk (1.4.4+svn3115-3) unstable; urgency=low
-
-  * Add patches/qdwizard-2.0.diff for changes in the new version of
-    qdwizard.
-  * Fix clean target in debian/build.xml - remove left over jars.
-
- -- Varun Hiremath <varun at debian.org>  Wed, 19 Dec 2007 04:45:41 +0530
-
-jajuk (1.4.4+svn3115-2) unstable; urgency=low
-
-  * Fix the debian/watch file (Closes: #456481)
-  * debian/jajuk.sh: Set java.library.path to /usr/lib/jni/
-  * Add patches/AquaLnFPopupLocationFix.diff for the missing class in the
-    new version of swingx
-
- -- Varun Hiremath <varun at debian.org>  Mon, 17 Dec 2007 02:52:05 +0530
-
-jajuk (1.4.4+svn3115-1) unstable; urgency=low
-
-  * New upstream release
-  * Update debian/patches
-  * debian/control: Bumped up Standards-Version to 3.7.3
-
- -- Varun Hiremath <varun at debian.org>  Thu, 13 Dec 2007 20:51:40 +0530
-
-jajuk (1.4.3+svn3076-1) unstable; urgency=low
-
-  * New upstream release
-    + Fixes issues with volume slider (Closes: #453518)
-
- -- Varun Hiremath <varunhiremath at gmail.com>  Fri, 30 Nov 2007 12:53:44 +0530
-
-jajuk (1.4.3~rc3+svn3068-1) unstable; urgency=low
-
-  * New upstream release
-  * debian/jajuk.sh: Set java.library.path to /usr/lib/libjdic-java/
-
- -- Varun Hiremath <varunhiremath at gmail.com>  Fri, 23 Nov 2007 09:26:34 +0530
-
-jajuk (1.4.2+svn3034-1) unstable; urgency=low
-
-  * New upstream release
-  * Move the package to pkg-java svn.
-  * debian/control:
-    + Set Maintainer to Debian Java Maintainers and add myself to Uploaders.
-    + Add liblaf-widget-java and liblaf-plugin-java to Depends (Closes: #449556)
-  * Add some patches from upstream.
-  * Use "exec" in the jajuk startup script.
-  * Set jajuk.version from debian/rules instead of specifying it in
-    ant.properties.
-
- -- Varun Hiremath <varunhiremath at gmail.com>  Fri, 23 Nov 2007 09:25:46 +0530
-
-jajuk (1.4+svn2993-1) unstable; urgency=low
-
-  * Initial release (Closes: #423608)
-
- -- Varun Hiremath <varunhiremath at gmail.com>  Thu, 11 Oct 2007 07:36:30 +0530

Copied: tags/jajuk/1:1.9.5-2/debian/changelog (from rev 14368, trunk/jajuk/debian/changelog)
===================================================================
--- tags/jajuk/1:1.9.5-2/debian/changelog	                        (rev 0)
+++ tags/jajuk/1:1.9.5-2/debian/changelog	2011-08-21 13:29:45 UTC (rev 14369)
@@ -0,0 +1,352 @@
+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 <drazzib at debian.org>  Sun, 21 Aug 2011 15:25:40 +0200
+
+jajuk (1:1.9.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 30 Jul 2011 13:55:10 +0200
+
+jajuk (1:1.9.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 19 Jul 2011 20:21:39 +0200
+
+jajuk (1:1.9.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * d/control: Depends on librhino-java instead of rhino.
+  * Bump Standards-Version to 3.9.2: no changes needed.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 14 Jul 2011 20:37:21 +0200
+
+jajuk (1:1.9.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * d/copyright: Upgrade to latest DEP-5 r166 format and add information
+    about public domain content.
+  * d/{watch,orig-tar.sh,orig-tar.exclude}: Download upstream tarball from
+    sourceforce download area.
+  * d/{rules,ant.proprties}: Use upstream Ant build-system instead of
+    debian/build.xml.
+  * d/patches/01_override_manifest.diff: Override Class-Path definition for
+    Jajuk.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 26 Mar 2011 12:44:22 +0100
+
+jajuk (1:1.9.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 20 Dec 2010 22:51:36 +0100
+
+jajuk (1:1.9-1) unstable; urgency=low
+
+  * New upstream -final- release: 1.9 "Killer Queen".
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 21 Nov 2010 20:09:36 +0100
+
+jajuk (1:1.9~RC9+svn6163-1) unstable; urgency=low
+
+  * New release candidate: 1.9 RC9.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 06 Nov 2010 23:21:20 +0100
+
+jajuk (1:1.9~RC5~svn6021-1) unstable; urgency=low
+
+  [ Torsten Werner ]
+  * Change maintainers into Maintainers.
+
+  [ Damien Raude-Morvan ]
+  * New release candidate: 1.9 RC5.
+  * d/control: Bump Standards-Version to 3.9.1: no changes needed.
+  * d/rules: Fix jajuk.version transformation to match upstream UpgradeManager
+    handling.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 27 Jul 2010 15:46:48 +0200
+
+jajuk (1:1.9~RC2~svn5837-1) unstable; urgency=low
+
+  * New release candidate -- 1.9 Killer Queen
+  * Add (Build-)Depends libsimple-validation-java
+  * Remove all patches/* -- merged upstream
+  * Fix watch file
+
+ -- Varun Hiremath <varun at debian.org>  Sat, 10 Apr 2010 19:42:54 -0400
+
+jajuk (1:1.8.4-1) unstable; urgency=low
+
+  * In accordance with upstream recommendation, revert to 1.8.4 tag
+    as 1.8.5 release won't be released:
+    - use epoch "1" as release number prefix
+    - debian/orig-tar.sh: svn export from tags
+  * debian/install: Removed (logic moved to debian/rules)
+  * debian/README.source: Remove "patch system" section as we now use
+    3.0 (quilt) as source format
+  * debian/docs: Removed (empty)
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 03 Mar 2010 23:26:53 +0100
+
+jajuk (1.8.5~svn5725-1) unstable; urgency=low
+
+  * New snapshot from 1.8 maintenance branch (r5725):
+    - Remove jaudiotagger2.diff patch (merged upstream)
+    - Refresh jintellitype.diff patch
+  * Bump Standards-Version to 3.8.4 (no changes needed).
+  * Source format 3.0 (quilt).
+  * Update debian/copyright and convert to DEP5 format
+  * Depends on rhino package and add js.jar to Class-Path in JAR
+    to prevent issue with HTML viewer.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 26 Feb 2010 23:01:31 +0100
+
+jajuk (1.8.4~svn5662-1) unstable; urgency=low
+
+  * New snapshot from 1.8 maintenance branch (r5662).
+    - remove jajuktablemodel.diff: merged upstream
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 09 Jan 2010 15:35:06 +0100
+
+jajuk (1.8.4~svn5628-1) unstable; urgency=low
+
+  * New upstream bugfix release
+    - Snapshot from 1.8 maintenance branch (r5628).
+  * debian/patches:
+    - (new) jaudiotagger.diff: fix compat with Jaudiotagger 2.0
+    - (new) jajuktablemodel.diff: never return null in getColumnClass
+    - (new) jintellitype.diff: disable jintellitype (win32 only)
+  * Thighten Depends and B-D:
+    - substance >= 5.2
+    - libjaudiotagger >= 2.0.0
+    - libswingx >= 1:1.6
+  * Bump debhelper version to >= 7
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 30 Dec 2009 22:08:36 +0100
+
+jajuk (1.8.2~svn5414-1) unstable; urgency=low
+
+  [ Damien Raude-Morvan ]
+  * New upstream bugfix release
+    - Snapshot from 1.8 maintenance branch (r5414).
+    - Fix NPE in CatalogView when running under KDE.
+  * Update my email address.
+
+  [ Michael Koch ]
+  * Fixed watch file.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 23 Oct 2009 19:42:06 +0200
+
+jajuk (1.8.1+svn5138-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control:
+    - Use libjhlabs-filters-java instead of libpixels-java
+    - Bump Standards-Version to 3.8.3
+  * debian/MANIFEST.MF: replace pixels with jhlabs-filters
+  * debian/rules: replace pixels with jhlabs-filters in DEB_JARS
+  * Fix debian/watch file
+  * debian/orig-tar.sh: track only the latest maintenance branch
+
+ -- Varun Hiremath <varun at debian.org>  Sun, 30 Aug 2009 22:09:13 -0400
+
+jajuk (1.8~svn5030-1) unstable; urgency=low
+
+  [ Damien Raude-Morvan ]
+  * New upstream release 1.8 Breathless (r5030).
+  * debian/control:
+    - Add liblastfm-java, libxstream-java, libcommons-lang-java
+      and libcommons-io-java in Depends and Build-Depends
+    - Remove javahelp2, libjgoodies-forms-java and libqdwizard-java
+      from Build-Depends
+    - Add java-wrappers to Depends (for shell script)
+  * debian/rules:
+    - Add pixels, lastfm, commons-lang, commons-io and xstream in DEB_JARS
+    - Remove forms, jh (javahelp2), js (rhino), qdwizard in DEB_JARS
+  * debian/MANIFEST.MF:
+    - Update like DEB_JARS + remove jdic.jar + add jna.jar
+  * Update all patches to new release
+  * Add a new substance.diff patch for Substance 5.2 compatibility
+  * Rework jajuk.sh launch script:
+    - Use java-wrappers for finding a suitable JAVA_HOME (Java6)
+    - Move old $HOME/.jajuk_test_{1.7,1.8} to $HOME/.jajuk
+      and describe this change in debian/NEWS for users
+  * Bump Standards-Version to 3.8.2 (no changes needed)
+
+  [ Varun Hiremath ]
+  * debian/jajuk.sh: use upstream settings for JAVA_OPTS
+  * debian/orig-tar.sh: remove doc files from source tarball
+  * debian/build.xml: remove javadoc build
+
+ -- Varun Hiremath <varun at debian.org>  Sun, 09 Aug 2009 19:13:28 -0400
+
+jajuk (1.8~svn4796-1) unstable; urgency=low
+
+  * New bugfix release from upstream
+  * debian/copyright: Tango icons are now released under the public
+    domain, update the license.
+  * Add libpixels-java to Build-Depends
+
+ -- Varun Hiremath <varun at debian.org>  Sun, 14 Jun 2009 07:36:35 -0400
+
+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 <varun at debian.org>  Mon, 25 May 2009 02:18:01 -0400
+
+jajuk (1.7.1-1) unstable; urgency=low
+
+  [ Damien Raude-Morvan ]
+  * New upstream release
+  * Build and run with OpenJDK-6
+    - debian/control: B-D on opendjk-6-jdk and D on openjdk-6-jre
+    - debian/jajuk.sh: Run with openjdk-6-jre
+    - debian/rules: Build with JAVA_HOME as openjdk-6-jdk
+  * Add myself as Uploaders
+  * Bump Standards-Version to 3.8.1 (no changes needed)
+  * Build-Depends/Depends on libjaudiotagger-java >= 1.0.9
+  * Build-Depends/Depends on libqdwizard-java >= 2.1
+
+  [ Varun Hiremath ]
+  * Accept changes made by Damien Raude-Morvan (Closes: #522131)
+  * Fix VERSION and DATE replace in build.xml
+
+ -- Varun Hiremath <varun at debian.org>  Wed, 01 Apr 2009 20:26:58 -0400
+
+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
+  * 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
+  * Bump Standards-Version to 3.8.0
+
+ -- Varun Hiremath <varun at debian.org>  Sun, 22 Jun 2008 19:10:59 +0530
+
+jajuk (1.6+svn3925-1) unstable; urgency=low
+
+  * New upstream release
+  * Fix debian/build.xml files, make sure all xml files are installed
+
+ -- Varun Hiremath <varun at debian.org>  Sun, 01 Jun 2008 02:35:56 +0530
+
+jajuk (1.5.3+svn3684-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Varun Hiremath <varun at debian.org>  Sun, 30 Mar 2008 23:05:39 +0530
+
+jajuk (1.5+svn3461-2) unstable; urgency=low
+
+  * Add patches/swingx.diff for changes in the new version of swingx
+  * Update patches/cobra.diff for changes in cobra
+
+ -- Varun Hiremath <varun at debian.org>  Thu, 13 Mar 2008 13:46:28 +0530
+
+jajuk (1.5+svn3461-1) unstable; urgency=low
+
+  * New upstream release
+  * Move package to non-free as some of the icons used are released under
+    the Creative Commons license
+  * Remove patches/lastfm.diff - not required
+  * Update watch and orig-tar.sh files
+
+ -- Varun Hiremath <varun at debian.org>  Sun, 10 Feb 2008 21:29:03 +0530
+
+jajuk (1.4.6+svn3338-1) unstable; urgency=low
+
+  * New upstream release
+  * Install jajuk icon to /usr/share/pixmaps and update jajuk.desktop to
+    use this icon.
+
+ -- Varun Hiremath <varun at debian.org>  Sun, 20 Jan 2008 16:57:41 +0530
+
+jajuk (1.4.5+svn3233-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/patches:
+    + Remove qdwizard-2.0.diff - not required
+    + Remove AquaLnFPopupLocationFix.diff - merged upstream
+    + Update cobra.diff patch
+
+ -- Varun Hiremath <varun at debian.org>  Wed, 09 Jan 2008 18:24:43 +0530
+
+jajuk (1.4.4+svn3115-3) unstable; urgency=low
+
+  * Add patches/qdwizard-2.0.diff for changes in the new version of
+    qdwizard.
+  * Fix clean target in debian/build.xml - remove left over jars.
+
+ -- Varun Hiremath <varun at debian.org>  Wed, 19 Dec 2007 04:45:41 +0530
+
+jajuk (1.4.4+svn3115-2) unstable; urgency=low
+
+  * Fix the debian/watch file (Closes: #456481)
+  * debian/jajuk.sh: Set java.library.path to /usr/lib/jni/
+  * Add patches/AquaLnFPopupLocationFix.diff for the missing class in the
+    new version of swingx
+
+ -- Varun Hiremath <varun at debian.org>  Mon, 17 Dec 2007 02:52:05 +0530
+
+jajuk (1.4.4+svn3115-1) unstable; urgency=low
+
+  * New upstream release
+  * Update debian/patches
+  * debian/control: Bumped up Standards-Version to 3.7.3
+
+ -- Varun Hiremath <varun at debian.org>  Thu, 13 Dec 2007 20:51:40 +0530
+
+jajuk (1.4.3+svn3076-1) unstable; urgency=low
+
+  * New upstream release
+    + Fixes issues with volume slider (Closes: #453518)
+
+ -- Varun Hiremath <varunhiremath at gmail.com>  Fri, 30 Nov 2007 12:53:44 +0530
+
+jajuk (1.4.3~rc3+svn3068-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/jajuk.sh: Set java.library.path to /usr/lib/libjdic-java/
+
+ -- Varun Hiremath <varunhiremath at gmail.com>  Fri, 23 Nov 2007 09:26:34 +0530
+
+jajuk (1.4.2+svn3034-1) unstable; urgency=low
+
+  * New upstream release
+  * Move the package to pkg-java svn.
+  * debian/control:
+    + Set Maintainer to Debian Java Maintainers and add myself to Uploaders.
+    + Add liblaf-widget-java and liblaf-plugin-java to Depends (Closes: #449556)
+  * Add some patches from upstream.
+  * Use "exec" in the jajuk startup script.
+  * Set jajuk.version from debian/rules instead of specifying it in
+    ant.properties.
+
+ -- Varun Hiremath <varunhiremath at gmail.com>  Fri, 23 Nov 2007 09:25:46 +0530
+
+jajuk (1.4+svn2993-1) unstable; urgency=low
+
+  * Initial release (Closes: #423608)
+
+ -- Varun Hiremath <varunhiremath at gmail.com>  Thu, 11 Oct 2007 07:36:30 +0530

Deleted: tags/jajuk/1:1.9.5-2/debian/control
===================================================================
--- trunk/jajuk/debian/control	2011-08-20 14:31:07 UTC (rev 14358)
+++ tags/jajuk/1:1.9.5-2/debian/control	2011-08-21 13:29:45 UTC (rev 14369)
@@ -1,20 +0,0 @@
-Source: jajuk
-Section: sound
-Priority: optional
-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>, Damien Raude-Morvan <drazzib at debian.org>
-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
-Standards-Version: 3.9.2
-Homepage: http://jajuk.info/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jajuk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jajuk
-
-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
-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
- operation. It is a fully-featured application geared towards advanced
- users with very large or scattered music collections.

Copied: tags/jajuk/1:1.9.5-2/debian/control (from rev 14368, trunk/jajuk/debian/control)
===================================================================
--- tags/jajuk/1:1.9.5-2/debian/control	                        (rev 0)
+++ tags/jajuk/1:1.9.5-2/debian/control	2011-08-21 13:29:45 UTC (rev 14369)
@@ -0,0 +1,92 @@
+Source: jajuk
+Section: sound
+Priority: optional
+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>,
+           Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: cdbs, debhelper (>= 7)
+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
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jajuk
+
+Package: jajuk
+Architecture: all
+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
+ operation. It is a fully-featured application geared towards advanced
+ users with very large or scattered music collections.

Deleted: tags/jajuk/1:1.9.5-2/debian/patches/01_override_manifest.diff
===================================================================
--- trunk/jajuk/debian/patches/01_override_manifest.diff	2011-08-20 14:31:07 UTC (rev 14358)
+++ tags/jajuk/1:1.9.5-2/debian/patches/01_override_manifest.diff	2011-08-21 13:29:45 UTC (rev 14369)
@@ -1,24 +0,0 @@
-Description: Move MANIFEST.MF definition to a property in
- src/scripts/build.xml
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2011-03-26
-Forwarded: no
---- a/src/scripts/build.xml
-+++ b/src/scripts/build.xml
-@@ -78,6 +78,7 @@
- 	<property name='distjarname' value='jajuk-java-installer-' />
- 	<property name='sourcesdist' value='${sourcesdir}/jajuk-sources-${version}.zip' />
- 	<property name='mplayerdir' value='/tmp/mplayer' />
-+	<property name='manifest' value='${srcdir}/packaging/MANIFEST.MF' />
- 
- 	<!-- 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 @@
- 
- 	<target name='package_jar' description='o Create Jajuk jar file' depends='startup,clean,mkdist_jar,compile'>
- 		<echo message='Create Jajuk jar file' />
--		<jar jarfile='${distdir}/bin/${jarname}' excludes='**/package.html' manifest='${srcdir}/packaging/MANIFEST.MF' compress='true'>
-+		<jar jarfile='${distdir}/bin/${jarname}' excludes='**/package.html' manifest='${manifest}' compress='true'>
- 			<fileset dir='${distdir}/${classdir}' />
- 		</jar>
- 		<delete dir='${distdir}/${classdir}' />

Copied: tags/jajuk/1:1.9.5-2/debian/patches/01_override_manifest.diff (from rev 14368, trunk/jajuk/debian/patches/01_override_manifest.diff)
===================================================================
--- tags/jajuk/1:1.9.5-2/debian/patches/01_override_manifest.diff	                        (rev 0)
+++ tags/jajuk/1:1.9.5-2/debian/patches/01_override_manifest.diff	2011-08-21 13:29:45 UTC (rev 14369)
@@ -0,0 +1,26 @@
+Description: Move MANIFEST.MF definition to a property in
+ src/scripts/build.xml
+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 @@
+ 	<property name='distjarname' value='jajuk-java-installer-' />
+ 	<property name='sourcesdist' value='${sourcesdir}/jajuk-sources-${version}.zip' />
+ 	<property name='mplayerdir' value='/tmp/mplayer' />
++	<property name='manifest' value='${srcdir}/packaging/MANIFEST.MF' />
+ 
+ 	<!-- 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 @@
+ 
+ 	<target name='package_jar' description='o Create Jajuk jar file' depends='startup,clean,mkdist_jar,compile'>
+ 		<echo message='Create Jajuk jar file' />
+-		<jar jarfile='${distdir}/bin/${jarname}' excludes='**/package.html' manifest='${srcdir}/packaging/MANIFEST.MF' compress='true'>
++		<jar jarfile='${distdir}/bin/${jarname}' excludes='**/package.html' manifest='${manifest}' compress='true'>
+ 			<fileset dir='${distdir}/${classdir}' />
+ 		</jar>
+ 		<delete dir='${distdir}/${classdir}' />

Copied: tags/jajuk/1:1.9.5-2/debian/patches/02_lastfm_fix_0_1_0.diff (from rev 14368, trunk/jajuk/debian/patches/02_lastfm_fix_0_1_0.diff)
===================================================================
--- tags/jajuk/1:1.9.5-2/debian/patches/02_lastfm_fix_0_1_0.diff	                        (rev 0)
+++ tags/jajuk/1:1.9.5-2/debian/patches/02_lastfm_fix_0_1_0.diff	2011-08-21 13:29:45 UTC (rev 14369)
@@ -0,0 +1,202 @@
+Description: Package change from lastfm Java lib from 
+ net.roarsoftware.lastfm to de.umass.lastfm
+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 @@
+ 
+ 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;

Deleted: tags/jajuk/1:1.9.5-2/debian/patches/series
===================================================================
--- trunk/jajuk/debian/patches/series	2011-08-20 14:31:07 UTC (rev 14358)
+++ tags/jajuk/1:1.9.5-2/debian/patches/series	2011-08-21 13:29:45 UTC (rev 14369)
@@ -1 +0,0 @@
-01_override_manifest.diff

Copied: tags/jajuk/1:1.9.5-2/debian/patches/series (from rev 14368, trunk/jajuk/debian/patches/series)
===================================================================
--- tags/jajuk/1:1.9.5-2/debian/patches/series	                        (rev 0)
+++ tags/jajuk/1:1.9.5-2/debian/patches/series	2011-08-21 13:29:45 UTC (rev 14369)
@@ -0,0 +1,2 @@
+01_override_manifest.diff
+02_lastfm_fix_0_1_0.diff




More information about the pkg-java-commits mailing list