[pkg-java] r11372 - in trunk/red5/debian: . patches

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-01-17 20:58:22 +0000 (Sun, 17 Jan 2010)
New Revision: 11372

Added:
   trunk/red5/debian/patches/13_jaudiotagger2.diff
Modified:
   trunk/red5/debian/changelog
   trunk/red5/debian/control
   trunk/red5/debian/patches/series
   trunk/red5/debian/red5-server.init
Log:
* Upload to unstable distribution
* Red5 API documentation:
  - Build-Depends and use default-jdk-doc instead of openjdk-6-doc
  - red5-doc now Recommends default-jdk-doc
* red5-server.init: Add dependency on $remote_fs
* Add debian/patches/13_jaudiotagger2.diff to fix compatibility
  with libjaudiotagger-java 2.0

Modified: trunk/red5/debian/changelog
===================================================================
--- trunk/red5/debian/changelog	2010-01-17 20:14:08 UTC (rev 11371)
+++ trunk/red5/debian/changelog	2010-01-17 20:58:22 UTC (rev 11372)
@@ -1,10 +1,14 @@
 red5 (0.9~svn3968-2) unstable; urgency=low
 
-  * Target unstable distribution
-  * Build-Depends and use default-jdk-doc instead of openjdk-6-doc
-  * red5-doc now Recommends default-jdk-doc
+  * Upload to unstable distribution
+  * Red5 API documentation:
+    - Build-Depends and use default-jdk-doc instead of openjdk-6-doc
+    - red5-doc now Recommends default-jdk-doc
+  * red5-server.init: Add dependency on $remote_fs
+  * Add debian/patches/13_jaudiotagger2.diff to fix compatibility
+    with libjaudiotagger-java 2.0
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 12 Dec 2009 14:04:49 +0100
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 17 Jan 2010 21:51:28 +0100
 
 red5 (0.9~svn3968-1) experimental; urgency=low
 

Modified: trunk/red5/debian/control
===================================================================
--- trunk/red5/debian/control	2010-01-17 20:14:08 UTC (rev 11371)
+++ trunk/red5/debian/control	2010-01-17 20:58:22 UTC (rev 11372)
@@ -11,7 +11,7 @@
  libspring-web-2.5-java, libbcprov-java, libehcache-java, libquartz-java,
  libjaudiotagger-java, libmx4j-java (>> 3.0.2-4), libxmlrpc3-server-java,
  libtomcat6-java (>= 6.0.20-7), libservlet2.5-java, junit4 (>= 4.5),
- libhamcrest-java, ant-optional, libspring-test-2.5-java,
+ libhamcrest-java, libspring-test-2.5-java,
  libgroboutils-java, libcommons-logging-java, libjetty-java, jython,
  libbackport-util-concurrent-java,
  default-jdk-doc, libmina2-java-doc, liblog4j1.2-java-doc, groovy-doc

Added: trunk/red5/debian/patches/13_jaudiotagger2.diff
===================================================================
--- trunk/red5/debian/patches/13_jaudiotagger2.diff	                        (rev 0)
+++ trunk/red5/debian/patches/13_jaudiotagger2.diff	2010-01-17 20:58:22 UTC (rev 11372)
@@ -0,0 +1,42 @@
+cription: Update for Jaudiotagger 2.0 API changes
+ TagFieldKey as been renamed to FieldKey
+ <https://jaudiotagger.dev.java.net/issues/show_bug.cgi?id=313>
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-01-17
+Forwarded: no
+
+--- a/src/org/red5/io/mp3/impl/MP3Reader.java
++++ b/src/org/red5/io/mp3/impl/MP3Reader.java
+@@ -38,7 +38,7 @@
+ import org.jaudiotagger.audio.mp3.MP3File;
+ import org.jaudiotagger.tag.TagException;
+ import org.jaudiotagger.tag.TagField;
+-import org.jaudiotagger.tag.TagFieldKey;
++import org.jaudiotagger.tag.FieldKey;
+ import org.jaudiotagger.tag.datatype.DataTypes;
+ import org.jaudiotagger.tag.id3.AbstractID3v2Frame;
+ import org.jaudiotagger.tag.id3.ID3v24Tag;
+@@ -174,15 +174,15 @@
+ 			if (idTag != null) {
+ 				// create meta data holder
+ 				metaData = new MetaData();
+-				metaData.setAlbum(idTag.getFirstAlbum());
+-				metaData.setArtist(idTag.getFirstArtist());
+-				metaData.setComment(idTag.getFirstComment());
+-				metaData.setGenre(idTag.getFirstGenre());
+-				metaData.setSongName(idTag.getFirstTitle());
+-				metaData.setTrack(idTag.getFirstTrack());
+-				metaData.setYear(idTag.getFirstYear());
++				metaData.setAlbum(idTag.getFirst(FieldKey.ALBUM));
++				metaData.setArtist(idTag.getFirst(FieldKey.ARTIST));
++				metaData.setComment(idTag.getFirst(FieldKey.COMMENT));
++				metaData.setGenre(idTag.getFirst(FieldKey.GENRE));
++				metaData.setSongName(idTag.getFirst(FieldKey.TITLE));
++				metaData.setTrack(idTag.getFirst(FieldKey.TRACK));
++				metaData.setYear(idTag.getFirst(FieldKey.YEAR));
+ 				//send album image if included
+-				List<TagField> tagFieldList = mp3file.getTag().get(TagFieldKey.COVER_ART);
++				List<TagField> tagFieldList = mp3file.getTag().getFields(FieldKey.COVER_ART);
+ 				//fix for APPSERVER-310
+ 				if (tagFieldList == null || tagFieldList.isEmpty()) {
+ 					log.debug("No cover art was found");

Modified: trunk/red5/debian/patches/series
===================================================================
--- trunk/red5/debian/patches/series	2010-01-17 20:14:08 UTC (rev 11371)
+++ trunk/red5/debian/patches/series	2010-01-17 20:58:22 UTC (rev 11372)
@@ -5,3 +5,4 @@
 11_change_red5_bootstrap.diff
 11_change_jmx_port.diff
 12_javadoc_links.diff
+13_jaudiotagger2.diff

Modified: trunk/red5/debian/red5-server.init
===================================================================
--- trunk/red5/debian/red5-server.init	2010-01-17 20:14:08 UTC (rev 11371)
+++ trunk/red5/debian/red5-server.init	2010-01-17 20:58:22 UTC (rev 11372)
@@ -19,10 +19,10 @@
 #
 ### BEGIN INIT INFO
 # Provides:          red5-server
-# Required-Start:    $network $local_fs
-# Required-Stop:
+# Required-Start:    $local_fs $remote_fs $network
+# Required-Stop:     $local_fs $remote_fs $network
 # Should-Start:      $named
-# Should-Stop:
+# Should-Stop:       $named
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Red5