[pkg-java] r10795 - in trunk/jsymphonic/debian: . patches wrappers
Vincent Fourmond
fourmond at alioth.debian.org
Sat Oct 10 20:35:44 UTC 2009
Author: fourmond
Date: 2009-10-10 20:35:44 +0000 (Sat, 10 Oct 2009)
New Revision: 10795
Added:
trunk/jsymphonic/debian/patches/20-fix-isocountry.dpatch
Modified:
trunk/jsymphonic/debian/changelog
trunk/jsymphonic/debian/control
trunk/jsymphonic/debian/get-svn-source
trunk/jsymphonic/debian/patches/00list
trunk/jsymphonic/debian/patches/10-config-file.dpatch
trunk/jsymphonic/debian/rules
trunk/jsymphonic/debian/wrappers/jsymphonic
Log:
[jsymphonic] Pulled new upstream release from SVN repository + adapted quite a few things as a consequence...
Modified: trunk/jsymphonic/debian/changelog
===================================================================
--- trunk/jsymphonic/debian/changelog 2009-10-10 19:56:48 UTC (rev 10794)
+++ trunk/jsymphonic/debian/changelog 2009-10-10 20:35:44 UTC (rev 10795)
@@ -1,3 +1,13 @@
+jsymphonic (0.3.0beta+svn320-1) UNRELEASED; urgency=low
+
+ * New upstream SVN snapshot
+ * Refresh 10-config-file
+ * Add 20-fix-isocountry to fix a compilation problem
+ * Now depends on libswing-layout-java:
+ - updated debian/{control,rules} and debian/wrappers/jsymphonic
+
+ -- Vincent Fourmond <fourmond at debian.org> Sat, 10 Oct 2009 21:59:46 +0200
+
jsymphonic (0.3.0alpha1+svn268-1) unstable; urgency=low
* Pulling in new upstream SVN revision
Modified: trunk/jsymphonic/debian/control
===================================================================
--- trunk/jsymphonic/debian/control 2009-10-10 19:56:48 UTC (rev 10794)
+++ trunk/jsymphonic/debian/control 2009-10-10 20:35:44 UTC (rev 10795)
@@ -4,7 +4,7 @@
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, dpatch
-Build-Depends-Indep: openjdk-6-jdk
+Build-Depends-Indep: openjdk-6-jdk, libswing-layout-java
Standards-Version: 3.8.0
Homepage: http://sourceforge.net/projects/symphonic/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jsymphonic
@@ -14,7 +14,7 @@
Package: jsymphonic
Architecture: all
Depends: openjdk-6-jre | java6-runtime, java-wrappers (>= 0.1.11),
- ${misc:Depends}
+ ${misc:Depends}, libswing-layout-java
Recommends: ffmpeg
Suggests: pmount
Description: File manager for Sony's MP3 players
Modified: trunk/jsymphonic/debian/get-svn-source
===================================================================
--- trunk/jsymphonic/debian/get-svn-source 2009-10-10 19:56:48 UTC (rev 10794)
+++ trunk/jsymphonic/debian/get-svn-source 2009-10-10 20:35:44 UTC (rev 10795)
@@ -1,27 +1,42 @@
#!/bin/sh
-# Script to export the source code of jsymphonic from its SVN repository,
-# and repackage that into a decent .orig tarball...
+# Script to export the source code of jsymphonic from its SVN
+# repository, and repackage that into a decent .orig tarball...
version="$1"
+revision="$2"
package="jsymphonic"
+if [ -z "$version" ]; then
+ echo <<EOF
+Usage:
+
+ debian/get-svn-source version [revision]
+
+ revision can be ommitted.
+EOF
+ exit 1;
+fi
+
REP="http://symphonic.svn.sourceforge.net/svnroot/symphonic/jsymphonic/trunk/"
tmpdir=`mktemp -d `
curdir=`pwd`
cd $tmpdir;
-echo -n "Getting revision... "
-revision=$(svn info "$REP" | grep Revision | grep -Eo '[0-9]+')
-echo $revision
-fullversion="${version}svn$revision"
+if [ -z "$revision" ]; then
+ echo -n "Getting revision... "
+ revision=$(svn info "$REP" | grep Revision | grep -Eo '[0-9]+')
+else
+ echo "Using user-specified revision $revision"
+fi
+fullversion="${version}+svn$revision"
echo "Getting $package-$fullversion"
echo "Exporting source"
dir="${package}-${fullversion}"
tarball="${package}_${fullversion}.orig.tar.gz"
-svn export "$REP" "$dir"
+svn export -r"$revision" "$REP" "$dir"
echo "Cleaning up source..."
echo "Print removing jar files:"
Modified: trunk/jsymphonic/debian/patches/00list
===================================================================
--- trunk/jsymphonic/debian/patches/00list 2009-10-10 19:56:48 UTC (rev 10794)
+++ trunk/jsymphonic/debian/patches/00list 2009-10-10 20:35:44 UTC (rev 10795)
@@ -1 +1,2 @@
-10-config-file
\ No newline at end of file
+10-config-file
+20-fix-isocountry
\ No newline at end of file
Modified: trunk/jsymphonic/debian/patches/10-config-file.dpatch
===================================================================
--- trunk/jsymphonic/debian/patches/10-config-file.dpatch 2009-10-10 19:56:48 UTC (rev 10794)
+++ trunk/jsymphonic/debian/patches/10-config-file.dpatch 2009-10-10 20:35:44 UTC (rev 10795)
@@ -5,24 +5,24 @@
## DP: in $HOME
@DPATCH@
-diff -urNad jsymphonic-0.3.0alpha1+svn252~/src/org/danizmax/jsymphonic/gui/JSymphonicWindow.java jsymphonic-0.3.0alpha1+svn252/src/org/danizmax/jsymphonic/gui/JSymphonicWindow.java
---- jsymphonic-0.3.0alpha1+svn252~/src/org/danizmax/jsymphonic/gui/JSymphonicWindow.java 2009-01-20 12:38:13.000000000 +0100
-+++ jsymphonic-0.3.0alpha1+svn252/src/org/danizmax/jsymphonic/gui/JSymphonicWindow.java 2009-01-29 20:50:43.000000000 +0100
-@@ -52,11 +52,11 @@
- */
- public class JSymphonicWindow extends javax.swing.JFrame {
+diff -urNad jsymphonic-0.3.0beta+svn365~/src/org/danizmax/jsymphonic/gui/JSymphonicWindow.java jsymphonic-0.3.0beta+svn365/src/org/danizmax/jsymphonic/gui/JSymphonicWindow.java
+--- jsymphonic-0.3.0beta+svn365~/src/org/danizmax/jsymphonic/gui/JSymphonicWindow.java 2009-10-06 17:29:22.000000000 +0200
++++ jsymphonic-0.3.0beta+svn365/src/org/danizmax/jsymphonic/gui/JSymphonicWindow.java 2009-10-10 21:14:25.000000000 +0200
+@@ -76,11 +76,11 @@
+ private JTabbedPane localTabbedPane;
+
private static Logger logger = Logger.getLogger("org.danizmax.jsymphonic.gui");
- private static String configFile = "JSymphonic.xml";
+ private static String configFile;
private static FileHandler fileLogHandler;
-
+ private static GuiLogHandler glHandler;
//Log file settings
- private static String logFileName= "JSymphonic.log";
-+ private static String logFileName = ".jsymphonic.log";
++ private static String logFileName= ".jsymphonic.log";
private static int byteSizeLimit = 1000000;
private static int numOfLogFiles = 1;
private static boolean append = true;
-@@ -82,6 +82,9 @@
+@@ -110,6 +110,9 @@
/** Creates new form JSymphonicWindow */
public JSymphonicWindow() {
@@ -31,4 +31,4 @@
+
logger.setLevel(Level.ALL);
//config file has to be loaded before anything!!!
- //lgui = new Log2Gui(logTextArea);
+ //lgui = new Log2Gui(logTextArea);
Added: trunk/jsymphonic/debian/patches/20-fix-isocountry.dpatch
===================================================================
--- trunk/jsymphonic/debian/patches/20-fix-isocountry.dpatch (rev 0)
+++ trunk/jsymphonic/debian/patches/20-fix-isocountry.dpatch 2009-10-10 20:35:44 UTC (rev 10795)
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20-fix-isocountry.dpatch by <fourmond at debian.org>
+##
+## DP: It seems that encoding or settings problems make compilation of
+## DP: src/org/jaudiotagger/tag/reference/ISOCountry.java fail. This
+## DP: is an attempt to fix that.
+
+ at DPATCH@
+diff -urNad jsymphonic-0.3.0beta+svn365~/src/org/jaudiotagger/tag/reference/ISOCountry.java jsymphonic-0.3.0beta+svn365/src/org/jaudiotagger/tag/reference/ISOCountry.java
+--- jsymphonic-0.3.0beta+svn365~/src/org/jaudiotagger/tag/reference/ISOCountry.java 2009-04-16 16:15:19.000000000 +0200
++++ jsymphonic-0.3.0beta+svn365/src/org/jaudiotagger/tag/reference/ISOCountry.java 2009-10-10 21:25:34.000000000 +0200
+@@ -108,7 +108,7 @@
+ THE_DEMOCRATIC_REPUBLIC_OF_CONGO("CD", "The Democratic Republic Of Congo"),
+ COOK_ISLANDS("CK", "Cook Islands"),
+ COSTA_RICA("CR", "Costa Rica"),
+- CôTE_D_IVOIRE("CI", "Ivory Coast"),
++ COTE_D_IVOIRE("CI", "Ivory Coast"),
+ CROATIA("HR", "Croatia"),
+ CUBA("CU", "Cuba"),
+ CYPRUS("CY", "Cyprus"),
+@@ -233,11 +233,11 @@
+ PORTUGAL("PT", "Portugal"),
+ PUERTO_RICO("PR", "Puerto Rico"),
+ QATAR("QA", "Qatar"),
+- RéUNION("RE", "Union"),
++ REUNION("RE", "Union"),
+ ROMANIA("RO", "Romania"),
+ RUSSIAN_FEDERATION("RU", "Russia"),
+ RWANDA("RW", "Rwanda"),
+- SAINT_BARTHéLEMY("BL", "Lemy"),
++ SAINT_BARTHELEMY("BL", "Lemy"),
+ SAINT_HELENA("SH", "St Helena"),
+ SAINT_KITTS_AND_NEVIS("KN", "St Kitts and Nevis"),
+ SAINT_LUCIA("LC", "St Lucia"),
Property changes on: trunk/jsymphonic/debian/patches/20-fix-isocountry.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/jsymphonic/debian/rules
===================================================================
--- trunk/jsymphonic/debian/rules 2009-10-10 19:56:48 UTC (rev 10794)
+++ trunk/jsymphonic/debian/rules 2009-10-10 20:35:44 UTC (rev 10795)
@@ -18,8 +18,9 @@
DEB_BUILDDIR := .
DEB_ANT_BUILDFILE := debian/build.xml
DEB_ANT_CLEAN_TARGET := clean
+DEB_JARS := swing-layout
-ANT_ARGS := -DPACKAGE_VERSION=$(VERSION)
+ANT_ARGS := -DPACKAGE_VERSION=$(VERSION)
target=debian/jsymphonic
target_dir=$(target)/usr/share/java
Modified: trunk/jsymphonic/debian/wrappers/jsymphonic
===================================================================
--- trunk/jsymphonic/debian/wrappers/jsymphonic 2009-10-10 19:56:48 UTC (rev 10794)
+++ trunk/jsymphonic/debian/wrappers/jsymphonic 2009-10-10 20:35:44 UTC (rev 10795)
@@ -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 swing-layout jsymphonic
run_java org.danizmax.jsymphonic.gui.JSymphonic "$@"
More information about the pkg-java-commits
mailing list