[pkg-java] r13506 - in trunk/jsymphonic/debian: . wrappers

[Vincent Fourmond]

Author: fourmond
Date: 2011-04-04 20:00:51 +0000 (Mon, 04 Apr 2011)
New Revision: 13506

Added:
   trunk/jsymphonic/debian/jsymphonic.classpath
   trunk/jsymphonic/debian/jsymphonic.jlibs
Modified:
   trunk/jsymphonic/debian/build.xml
   trunk/jsymphonic/debian/changelog
   trunk/jsymphonic/debian/control
   trunk/jsymphonic/debian/jsymphonic.install
   trunk/jsymphonic/debian/rules
   trunk/jsymphonic/debian/wrappers/jsymphonic
Log:
[jsymphonic] a well defined classpath + other benefits...

Modified: trunk/jsymphonic/debian/build.xml
===================================================================
--- trunk/jsymphonic/debian/build.xml	2011-04-04 19:20:12 UTC (rev 13505)
+++ trunk/jsymphonic/debian/build.xml	2011-04-04 20:00:51 UTC (rev 13506)
@@ -5,7 +5,7 @@
   <property name="srcdir" value="src" />
   <property name="builddir" value="build" />
   <property name="jardir" value="dist" />
-  <property name="jarname" value="${jardir}/jsymphonic-${PACKAGE_VERSION}.jar" />
+  <property name="jarname" value="${jardir}/jsymphonic.jar" />
 
   <target name="init">
     <mkdir dir="${builddir}" />

Modified: trunk/jsymphonic/debian/changelog
===================================================================
--- trunk/jsymphonic/debian/changelog	2011-04-04 19:20:12 UTC (rev 13505)
+++ trunk/jsymphonic/debian/changelog	2011-04-04 20:00:51 UTC (rev 13506)
@@ -1,3 +1,12 @@
+jsymphonic (0.3.0.Ode.To.Freedom+svn387-3) experimental; urgency=low
+
+  * Switching to javahelper
+  * Using real classpath
+  * Using automatic classpath expansion for the wrapper.
+  * Already conforms to standards 3.9.1
+
+ -- Vincent Fourmond <fourmond at debian.org>  Mon, 04 Apr 2011 21:48:59 +0200
+
 jsymphonic (0.3.0.Ode.To.Freedom+svn387-2) unstable; urgency=low
 
   * Upload to unstable

Modified: trunk/jsymphonic/debian/control
===================================================================
--- trunk/jsymphonic/debian/control	2011-04-04 19:20:12 UTC (rev 13505)
+++ trunk/jsymphonic/debian/control	2011-04-04 20:00:51 UTC (rev 13506)
@@ -3,9 +3,9 @@
 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
+Build-Depends: cdbs, debhelper (>= 7), ant, javahelper
 Build-Depends-Indep: openjdk-6-jdk, libswing-layout-java
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 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
@@ -13,8 +13,8 @@
 
 Package: jsymphonic
 Architecture: all
-Depends: openjdk-6-jre | java6-runtime, java-wrappers (>= 0.1.11),
- 	 ${misc:Depends}, libswing-layout-java
+Depends: openjdk-6-jre | java6-runtime, java-wrappers (>= 0.1.21),
+ 	 ${misc:Depends}, ${java:Depends}
 Recommends: ffmpeg
 Suggests: pmount
 Description: File manager for Sony's MP3 players

Added: trunk/jsymphonic/debian/jsymphonic.classpath
===================================================================
--- trunk/jsymphonic/debian/jsymphonic.classpath	                        (rev 0)
+++ trunk/jsymphonic/debian/jsymphonic.classpath	2011-04-04 20:00:51 UTC (rev 13506)
@@ -0,0 +1 @@
+dist/jsymphonic.jar /usr/share/java/swing-layout.jar

Modified: trunk/jsymphonic/debian/jsymphonic.install
===================================================================
--- trunk/jsymphonic/debian/jsymphonic.install	2011-04-04 19:20:12 UTC (rev 13505)
+++ trunk/jsymphonic/debian/jsymphonic.install	2011-04-04 20:00:51 UTC (rev 13506)
@@ -1,2 +1,3 @@
 debian/jsymphonic.xpm  usr/share/pixmaps
-debian/jsymphonic.desktop usr/share/applications
\ No newline at end of file
+debian/jsymphonic.desktop usr/share/applications
+debian/wrappers/jsymphonic usr/bin
\ No newline at end of file

Added: trunk/jsymphonic/debian/jsymphonic.jlibs
===================================================================
--- trunk/jsymphonic/debian/jsymphonic.jlibs	                        (rev 0)
+++ trunk/jsymphonic/debian/jsymphonic.jlibs	2011-04-04 20:00:51 UTC (rev 13506)
@@ -0,0 +1 @@
+dist/jsymphonic.jar
\ No newline at end of file

Modified: trunk/jsymphonic/debian/rules
===================================================================
--- trunk/jsymphonic/debian/rules	2011-04-04 19:20:12 UTC (rev 13505)
+++ trunk/jsymphonic/debian/rules	2011-04-04 20:00:51 UTC (rev 13506)
@@ -9,8 +9,8 @@
 	sed -r 's/(\.dfsg)?-[0-9.]+//')
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/javahelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-# include /usr/share/cdbs/1/rules/dpatch.mk
 
 JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk
 ANT_HOME             := /usr/share/ant
@@ -29,10 +29,3 @@
 print-version:
 	echo $(VERSION)
 
-
-
-install/jsymphonic::
-	install -m 644 dist/*.jar $(target_dir)/jsymphonic-$(VERSION).jar
-	ln -s jsymphonic-$(VERSION).jar $(target_dir)/jsymphonic.jar
-	install -m 755 -t $(target)/usr/bin debian/wrappers/jsymphonic
-

Modified: trunk/jsymphonic/debian/wrappers/jsymphonic
===================================================================
--- trunk/jsymphonic/debian/wrappers/jsymphonic	2011-04-04 19:20:12 UTC (rev 13505)
+++ trunk/jsymphonic/debian/wrappers/jsymphonic	2011-04-04 20:00:51 UTC (rev 13506)
@@ -3,8 +3,7 @@
 # Include the wrappers utility script
 . /usr/lib/java-wrappers/java-wrappers.sh
 
-# We first look for sun's runtime, and then for all the rest
 find_java_runtime openjdk sun
-find_jars swing-layout jsymphonic 
+find_jar_classpath jsymphonic 
 
 run_java org.danizmax.jsymphonic.gui.JSymphonic "$@"