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

[fourmond at alioth.debian.org]

Author: fourmond
Date: 2009-01-29 17:16:11 +0000 (Thu, 29 Jan 2009)
New Revision: 7898

Modified:
   trunk/jsymphonic/debian/build.xml
   trunk/jsymphonic/debian/changelog
   trunk/jsymphonic/debian/copyright
   trunk/jsymphonic/debian/get-svn-source
   trunk/jsymphonic/debian/wrappers/jsymphonic
Log:
[jsymphonic] Fixed a number of things + now use SVN source rather than -sources.zip file

Modified: trunk/jsymphonic/debian/build.xml
===================================================================
--- trunk/jsymphonic/debian/build.xml	2009-01-29 10:54:21 UTC (rev 7897)
+++ trunk/jsymphonic/debian/build.xml	2009-01-29 17:16:11 UTC (rev 7898)
@@ -22,12 +22,20 @@
       <fileset dir="${srcdir}/localization" />
     </copy>
   </target>
+
+  <target name="resources" depends="init">
+    <copy todir="${builddir}">
+      <fileset dir="${srcdir}">
+	<include name="**/resources/*" />
+      </fileset>
+    </copy>
+  </target>
   
   <target name="compile" depends="init">
     <javac srcdir="${srcdir}" destdir="${builddir}" />
   </target>
 
-  <target name="build" depends="compile,languages">
+  <target name="build" depends="compile,languages,resources">
     <jar basedir="${builddir}" destfile="${jarname}" />
   </target>
 </project>
\ No newline at end of file

Modified: trunk/jsymphonic/debian/changelog
===================================================================
--- trunk/jsymphonic/debian/changelog	2009-01-29 10:54:21 UTC (rev 7897)
+++ trunk/jsymphonic/debian/changelog	2009-01-29 17:16:11 UTC (rev 7898)
@@ -1,3 +1,11 @@
+jsymphonic (0.3.0alpha1+svn252-1) experimental; urgency=low
+
+  * Adapted debian/get-svn-source to the newer SVN structure
+  * Switching to a SVN export, as the -sources.zip file is not complete.
+  * Updated debian/build.xml to copy resources.
+
+ -- Vincent Fourmond <fourmond at debian.org>  Thu, 29 Jan 2009 18:08:08 +0100
+
 jsymphonic (0.3.0alpha1-1) experimental; urgency=low
 
   * New upstream release

Modified: trunk/jsymphonic/debian/copyright
===================================================================
--- trunk/jsymphonic/debian/copyright	2009-01-29 10:54:21 UTC (rev 7897)
+++ trunk/jsymphonic/debian/copyright	2009-01-29 17:16:11 UTC (rev 7898)
@@ -1,7 +1,17 @@
 Format-Specification:
     http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
 Upstream-Name: JSymphonic
+
+ Depending on wether the debian version name contains a svn or not in it,
+ the source tarball was made this way:
+   * if the version number contains svn, the source package was made
+     using the debian/get-svn-source script
+   * the debian/new-upstream script applied to the -source.zip files
+     found on the download page (see also debian/watch for more
+     details)
+
 Upstream-Source: http://sourceforge.net/projects/symphonic/
+Upstream-Source: http://symphonic.svn.sourceforge.net/svnroot/symphonic/jsymphonic/trunk/
 
  Disclaimer: the following copyright information is based on the list of
  contributors in sourceforge.net rather than copyright information within

Modified: trunk/jsymphonic/debian/get-svn-source
===================================================================
--- trunk/jsymphonic/debian/get-svn-source	2009-01-29 10:54:21 UTC (rev 7897)
+++ trunk/jsymphonic/debian/get-svn-source	2009-01-29 17:16:11 UTC (rev 7898)
@@ -8,7 +8,7 @@
 version="$1"
 package="jsymphonic"
 
-REP="https://symphonic.svn.sourceforge.net/svnroot/symphonic/trunk/jsymphonic"
+REP="http://symphonic.svn.sourceforge.net/svnroot/symphonic/jsymphonic/trunk/"
 
 tmpdir=`mktemp -d `
 curdir=`pwd`
@@ -16,20 +16,21 @@
 cd $tmpdir;
 echo -n "Getting revision... "
 revision=$(svn info "$REP" | grep Revision | grep -Eo '[0-9]+')
-echo "svn$revision"
+echo $revision
+fullversion="${version}svn$revision"
+echo "Getting $package-$fullversion"
 
 echo "Exporting source"
-dir="${package}-${version}+svn${revision}"
-tarball="${package}_${version}+svn${revision}.orig.tar.gz"
+dir="${package}-${fullversion}"
+tarball="${package}_${fullversion}.orig.tar.gz"
 svn export "$REP" "$dir"
 
 echo "Cleaning up source..."
-mv $dir/dist/READ* $dir
-rename 's/ //g' $dir/READ*
-rm -rf $dir/build $dir/dist
+echo "Print removing jar files:"
+find -name '*.jar' -print -delete
 
 echo "Making tarball"
-tar cvzf "$curdir/$tarball" "$dir"
+tar cvzf "$curdir/../$tarball" "$dir"
 
 echo "Cleaning up temporary files"
 cd $curdir

Modified: trunk/jsymphonic/debian/wrappers/jsymphonic
===================================================================
--- trunk/jsymphonic/debian/wrappers/jsymphonic	2009-01-29 10:54:21 UTC (rev 7897)
+++ trunk/jsymphonic/debian/wrappers/jsymphonic	2009-01-29 17:16:11 UTC (rev 7898)
@@ -5,6 +5,6 @@
 
 # We first look for sun's runtime, and then for all the rest
 find_java_runtime openjdk sun
-find_jars JSymphonic
+find_jars jsymphonic
 
-run_java org.naurd.media.jsymphonic.manager.JSymphonic "$@"
+run_java org.danizmax.jsymphonic.gui.JSymphonic "$@"