[pkg-java] r16640 - trunk/jsymphonic/debian

[Markus Koschany]

Author: apo-guest
Date: 2013-05-14 22:58:04 +0000 (Tue, 14 May 2013)
New Revision: 16640

Modified:
   trunk/jsymphonic/debian/build.xml
   trunk/jsymphonic/debian/changelog
   trunk/jsymphonic/debian/control
   trunk/jsymphonic/debian/copyright
   trunk/jsymphonic/debian/jsymphonic.install
   trunk/jsymphonic/debian/rules
Log:
0.3.0.Ode.To.Freedom+svn387-8

Transition the package to use the default java implementation.
Use the current canonical Vcs-URI.
wrap-and-sort -s


Modified: trunk/jsymphonic/debian/build.xml
===================================================================
--- trunk/jsymphonic/debian/build.xml	2013-05-14 11:12:12 UTC (rev 16639)
+++ trunk/jsymphonic/debian/build.xml	2013-05-14 22:58:04 UTC (rev 16640)
@@ -33,7 +33,8 @@
   </target>
   
   <target name="compile" depends="init">
-    <javac srcdir="${srcdir}" destdir="${builddir}" encoding="UTF-8" />
+    <javac srcdir="${srcdir}" destdir="${builddir}" encoding="UTF-8"
+           source="1.5" target="1.5" />
   </target>
 
   <target name="build" depends="compile,languages,resources">

Modified: trunk/jsymphonic/debian/changelog
===================================================================
--- trunk/jsymphonic/debian/changelog	2013-05-14 11:12:12 UTC (rev 16639)
+++ trunk/jsymphonic/debian/changelog	2013-05-14 22:58:04 UTC (rev 16640)
@@ -1,3 +1,12 @@
+jsymphonic (0.3.0.Ode.To.Freedom+svn387-8) unstable; urgency=low
+
+  * Team upload.
+  * Transition package to use default java implementation.
+    Thanks to James Page for the patch. (Closes: #684015)
+  * Update to use the current canonical Vcs-URI.
+
+ -- Markus Koschany <apo at gambaru.de>  Wed, 15 May 2013 00:43:47 +0200
+
 jsymphonic (0.3.0.Ode.To.Freedom+svn387-7) unstable; urgency=medium
 
   * Fix FTBS with newer openJDK directory layout (closes: #643517)

Modified: trunk/jsymphonic/debian/control
===================================================================
--- trunk/jsymphonic/debian/control	2013-05-14 11:12:12 UTC (rev 16639)
+++ trunk/jsymphonic/debian/control	2013-05-14 22:58:04 UTC (rev 16640)
@@ -3,25 +3,27 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Vincent Fourmond <fourmond at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), ant, javahelper (>= 0.36)
-Build-Depends-Indep: openjdk-6-jdk, libswing-layout-java
-Standards-Version: 3.9.2
+Build-Depends: ant, cdbs, debhelper (>= 7), javahelper (>= 0.36)
+Build-Depends-Indep: default-jdk, libswing-layout-java
+Standards-Version: 3.9.4
 Homepage: http://sourceforge.net/projects/symphonic/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jsymphonic
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/jsymphonic
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jsymphonic
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jsymphonic
 
-
 Package: jsymphonic
 Architecture: all
-Depends: openjdk-6-jre | java6-runtime, java-wrappers (>= 0.1.22),
- 	 ${misc:Depends}, ${java:Depends}
+Depends:
+ default-jre | java6-runtime,
+ java-wrappers (>= 0.1.22),
+ ${java:Depends},
+ ${misc:Depends}
 Recommends: ffmpeg
 Suggests: pmount
 Description: File manager for Sony's MP3 players
- Symphonic is a file manager for Sony's flash players (such as the 
+ Symphonic is a file manager for Sony's flash players (such as the
  NW-E00x series), where songs are stored in a proprietary format
  not very Unix-friendly.
  .
  This program provides functionalities similar to the proprietary
  Windows-only SonicStage software given by Sony to interact with
- the players.
\ No newline at end of file
+ the players.

Modified: trunk/jsymphonic/debian/copyright
===================================================================
--- trunk/jsymphonic/debian/copyright	2013-05-14 11:12:12 UTC (rev 16639)
+++ trunk/jsymphonic/debian/copyright	2013-05-14 22:58:04 UTC (rev 16640)
@@ -65,5 +65,5 @@
 Copyright: 2008 by Vincent Fourmond <fourmond at debian.org>
 License: GPL-2+
 
- The text of the above licences can be found on debian systems at 
- /usr/share/common-licenses. 
\ No newline at end of file
+ The text of the above licences can be found on debian systems at
+ /usr/share/common-licenses.

Modified: trunk/jsymphonic/debian/jsymphonic.install
===================================================================
--- trunk/jsymphonic/debian/jsymphonic.install	2013-05-14 11:12:12 UTC (rev 16639)
+++ trunk/jsymphonic/debian/jsymphonic.install	2013-05-14 22:58:04 UTC (rev 16640)
@@ -1,3 +1,3 @@
+debian/jsymphonic.desktop usr/share/applications
 debian/jsymphonic.xpm  usr/share/pixmaps
-debian/jsymphonic.desktop usr/share/applications
-debian/wrappers/jsymphonic usr/bin
\ No newline at end of file
+debian/wrappers/jsymphonic usr/bin

Modified: trunk/jsymphonic/debian/rules
===================================================================
--- trunk/jsymphonic/debian/rules	2013-05-14 11:12:12 UTC (rev 16639)
+++ trunk/jsymphonic/debian/rules	2013-05-14 22:58:04 UTC (rev 16640)
@@ -12,7 +12,7 @@
 include /usr/share/cdbs/1/class/javahelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk-$(shell dpkg-architecture -qDEB_HOST_ARCH)
+JAVA_HOME_DIRS       := /usr/lib/jvm/default-java
 ANT_HOME             := /usr/share/ant
 DEB_ANT_COMPILER     := modern
 DEB_BUILDDIR         := .