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

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-01-09 14:56:04 +0000 (Sat, 09 Jan 2010)
New Revision: 11333

Removed:
   trunk/jajuk/debian/patches/jajuktablemodel.diff
Modified:
   trunk/jajuk/debian/changelog
   trunk/jajuk/debian/patches/jaudiotagger2.diff
   trunk/jajuk/debian/patches/series
Log:
* New snapshot from 1.8 maintenance branch (r5662).
  - remove jajuktablemodel.diff: merged upstream

Modified: trunk/jajuk/debian/changelog
===================================================================
--- trunk/jajuk/debian/changelog	2010-01-09 11:12:34 UTC (rev 11332)
+++ trunk/jajuk/debian/changelog	2010-01-09 14:56:04 UTC (rev 11333)
@@ -1,3 +1,10 @@
+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

Deleted: trunk/jajuk/debian/patches/jajuktablemodel.diff
===================================================================
--- trunk/jajuk/debian/patches/jajuktablemodel.diff	2010-01-09 11:12:34 UTC (rev 11332)
+++ trunk/jajuk/debian/patches/jajuktablemodel.diff	2010-01-09 14:56:04 UTC (rev 11333)
@@ -1,15 +0,0 @@
-Description: Fix JajukTableModel#getColumnClass to never return null.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2009-12-30
-Forwarded: no
---- a/src/main/java/org/jajuk/ui/helpers/JajukTableModel.java
-+++ b/src/main/java/org/jajuk/ui/helpers/JajukTableModel.java
-@@ -191,7 +191,7 @@
-     if (o != null) {
-       return o.getClass();
-     } else {
--      return null;
-+      return Object.class;
-     }
-   }
- 

Modified: trunk/jajuk/debian/patches/jaudiotagger2.diff
===================================================================
--- trunk/jajuk/debian/patches/jaudiotagger2.diff	2010-01-09 11:12:34 UTC (rev 11332)
+++ trunk/jajuk/debian/patches/jaudiotagger2.diff	2010-01-09 14:56:04 UTC (rev 11333)
@@ -4,7 +4,7 @@
  <https://jaudiotagger.dev.java.net/issues/show_bug.cgi?id=313>
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Update: 2009-11-14
-Forwarded: no
+Forwarded: yes, https://trac.jajuk.info/ticket/1499
 --- a/src/main/java/org/jajuk/services/tags/JAudioTaggerTagImpl.java
 +++ b/src/main/java/org/jajuk/services/tags/JAudioTaggerTagImpl.java
 @@ -31,7 +31,7 @@

Modified: trunk/jajuk/debian/patches/series
===================================================================
--- trunk/jajuk/debian/patches/series	2010-01-09 11:12:34 UTC (rev 11332)
+++ trunk/jajuk/debian/patches/series	2010-01-09 14:56:04 UTC (rev 11333)
@@ -2,4 +2,3 @@
 cobra.diff
 jaudiotagger2.diff
 jintellitype.diff
-jajuktablemodel.diff