[pkg-java] r11818 - in trunk/jsymphonic/debian: . patches source
Vincent Fourmond
fourmond at alioth.debian.org
Mon Mar 8 20:52:02 UTC 2010
Author: fourmond
Date: 2010-03-08 20:51:54 +0000 (Mon, 08 Mar 2010)
New Revision: 11818
Added:
trunk/jsymphonic/debian/patches/10-config-file.diff
trunk/jsymphonic/debian/patches/20-fix-isocountry.diff
trunk/jsymphonic/debian/patches/series
trunk/jsymphonic/debian/source/
trunk/jsymphonic/debian/source/format
Removed:
trunk/jsymphonic/debian/README.source
trunk/jsymphonic/debian/new-upstream
trunk/jsymphonic/debian/patches/00list
trunk/jsymphonic/debian/patches/10-config-file.dpatch
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/rules
trunk/jsymphonic/debian/watch
Log:
[jsymphonic] Fix the serious problem of stray .class files laying around + switch to format 3.0 (quilt)
Deleted: trunk/jsymphonic/debian/README.source
===================================================================
--- trunk/jsymphonic/debian/README.source 2010-03-07 23:43:42 UTC (rev 11817)
+++ trunk/jsymphonic/debian/README.source 2010-03-08 20:51:54 UTC (rev 11818)
@@ -1,7 +0,0 @@
-Note about the source package of jsymphonic
-
-This package uses dpatch to manage all modifications to the upstream
-source. See /usr/share/doc/dpatch/README.source.gz to get more information
-on how to use it.
-
- -- Vincent Fourmond <fourmond at debian.org>, Sun, 11 Oct 2009 02:19:43 +0200
Modified: trunk/jsymphonic/debian/changelog
===================================================================
--- trunk/jsymphonic/debian/changelog 2010-03-07 23:43:42 UTC (rev 11817)
+++ trunk/jsymphonic/debian/changelog 2010-03-08 20:51:54 UTC (rev 11818)
@@ -1,3 +1,19 @@
+jsymphonic (0.3.0beta+svn321-1) unstable; urgency=medium
+
+ * New SVN snapshot (though not the most recent one), now getting rid of
+ precompiled classes (closes: #572949)
+ * Switching to source format 3.0 (quilt)
+ * Updated watchfile to correctly detect newer versions (note that the
+ newer version hasn't been packaged yet)
+ * Urgency medium to fix RC bug in testing
+ * Updated the debian/get-orig-svn to be more verbose about what it
+ removes and to remove precompiled .class files
+ * Conforms to standards 3.8.4
+ * Dropping build-depends on dpatch, now useless
+ * Dropping debian/README.source, now useless too
+
+ -- Vincent Fourmond <fourmond at debian.org> Mon, 08 Mar 2010 21:44:53 +0100
+
jsymphonic (0.3.0beta+svn320-1) unstable; urgency=low
* New upstream SVN snapshot
Modified: trunk/jsymphonic/debian/control
===================================================================
--- trunk/jsymphonic/debian/control 2010-03-07 23:43:42 UTC (rev 11817)
+++ trunk/jsymphonic/debian/control 2010-03-08 20:51:54 UTC (rev 11818)
@@ -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, dpatch
+Build-Depends: cdbs, debhelper (>= 7), ant
Build-Depends-Indep: openjdk-6-jdk, libswing-layout-java
-Standards-Version: 3.8.3
+Standards-Version: 3.8.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
Modified: trunk/jsymphonic/debian/get-svn-source
===================================================================
--- trunk/jsymphonic/debian/get-svn-source 2010-03-07 23:43:42 UTC (rev 11817)
+++ trunk/jsymphonic/debian/get-svn-source 2010-03-08 20:51:54 UTC (rev 11818)
@@ -27,23 +27,33 @@
if [ -z "$revision" ]; then
echo -n "Getting revision... "
revision=$(svn info "$REP" | grep Revision | grep -Eo '[0-9]+')
+ echo $revision
else
echo "Using user-specified revision $revision"
fi
+echo
fullversion="${version}+svn$revision"
echo "Getting $package-$fullversion"
echo "Exporting source"
dir="${package}-${fullversion}"
-tarball="${package}_${fullversion}.orig.tar.gz"
+tarball="${package}_${fullversion}.orig.tar.bz2"
svn export -r"$revision" "$REP" "$dir"
+echo
+echo '---------------------------------------------------------------'
+echo
echo "Cleaning up source..."
-echo "Print removing jar files:"
+echo
+echo "Removing jar files:"
find -name '*.jar' -print -delete
+echo "Removing precompiled class files"
+find -name '*.class' -print -delete
+
+echo
echo "Making tarball"
-tar cvzf "$curdir/../$tarball" "$dir"
+tar cvjf "$curdir/../$tarball" "$dir"
echo "Cleaning up temporary files"
cd $curdir
Deleted: trunk/jsymphonic/debian/new-upstream
===================================================================
--- trunk/jsymphonic/debian/new-upstream 2010-03-07 23:43:42 UTC (rev 11817)
+++ trunk/jsymphonic/debian/new-upstream 2010-03-08 20:51:54 UTC (rev 11818)
@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# new-upstream: copyright 2009 by Vincent Fourmond.
-# This script simply repackages the original jarball into a real tarball.
-#
-# Called by uscan; from uscan(1):
-#
-# Finally, if a third parameter (an action) is given in the watchfile
-# line, this is taken as the name of a command, and the command
-# command --upstream-version version filename
-#
-# is executed, using either the original file or the symlink name.
-#
-# Thanks to Sam Morris <sam at robots.org.uk> for giving me the idea
-
-version=$2
-filename=$3
-
-dir=`mktemp -d`
-target_dir=$dir/jsymphonic-$version
-
-# We repackage the upstream source zip file:
-mkdir -p $target_dir
-unzip "$filename" -d "$target_dir"
-origname=jsymphonic_$version.orig.tar.gz
-
-echo "Renaming the source directory"
-mv $target_dir/JSy*/ $target_dir/src
-
-
-# We repackage excluding the lib/ subdir
-cd $dir
-echo "Creating archive"
-tar cvz -f $origname jsymphon*
-cd -
-# We remove any file already existing there: it might be a symlink.
-rm -f $orginame
-mv $dir/$origname ..
Deleted: trunk/jsymphonic/debian/patches/00list
===================================================================
--- trunk/jsymphonic/debian/patches/00list 2010-03-07 23:43:42 UTC (rev 11817)
+++ trunk/jsymphonic/debian/patches/00list 2010-03-08 20:51:54 UTC (rev 11818)
@@ -1,2 +0,0 @@
-10-config-file
-20-fix-isocountry
\ No newline at end of file
Copied: trunk/jsymphonic/debian/patches/10-config-file.diff (from rev 11810, trunk/jsymphonic/debian/patches/10-config-file.dpatch)
===================================================================
--- trunk/jsymphonic/debian/patches/10-config-file.diff (rev 0)
+++ trunk/jsymphonic/debian/patches/10-config-file.diff 2010-03-08 20:51:54 UTC (rev 11818)
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-config-file.dpatch by <fourmond at debian.org>
+##
+## DP: Fix log file and configuration files to end up as hidden files
+## DP: in $HOME
+
+ at DPATCH@
+Index: jsymphonic-0.3.0beta+svn321/src/org/danizmax/jsymphonic/gui/JSymphonicWindow.java
+===================================================================
+--- jsymphonic-0.3.0beta+svn321.orig/src/org/danizmax/jsymphonic/gui/JSymphonicWindow.java 2009-06-01 17:51:55.000000000 +0200
++++ jsymphonic-0.3.0beta+svn321/src/org/danizmax/jsymphonic/gui/JSymphonicWindow.java 2010-03-08 21:36:11.379202577 +0100
+@@ -75,11 +75,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 int byteSizeLimit = 1000000;
+ private static int numOfLogFiles = 1;
+ private static boolean append = true;
+@@ -109,6 +109,9 @@
+
+ /** Creates new form JSymphonicWindow */
+ public JSymphonicWindow() {
++ // First thing, we setup log file and config file locations
++ configFile = System.getProperty("user.home") + "/" + ".jsymphonic.xml";
++
+ logger.setLevel(Level.ALL);
+ //config file has to be loaded before anything!!!
+ //lgui = new Log2Gui(logTextArea);
Deleted: trunk/jsymphonic/debian/patches/10-config-file.dpatch
===================================================================
--- trunk/jsymphonic/debian/patches/10-config-file.dpatch 2010-03-07 23:43:42 UTC (rev 11817)
+++ trunk/jsymphonic/debian/patches/10-config-file.dpatch 2010-03-08 20:51:54 UTC (rev 11818)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-config-file.dpatch by <fourmond at debian.org>
-##
-## DP: Fix log file and configuration files to end up as hidden files
-## DP: in $HOME
-
- at DPATCH@
-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 int byteSizeLimit = 1000000;
- private static int numOfLogFiles = 1;
- private static boolean append = true;
-@@ -110,6 +110,9 @@
-
- /** Creates new form JSymphonicWindow */
- public JSymphonicWindow() {
-+ // First thing, we setup log file and config file locations
-+ configFile = System.getProperty("user.home") + "/" + ".jsymphonic.xml";
-+
- logger.setLevel(Level.ALL);
- //config file has to be loaded before anything!!!
- //lgui = new Log2Gui(logTextArea);
Copied: trunk/jsymphonic/debian/patches/20-fix-isocountry.diff (from rev 11810, trunk/jsymphonic/debian/patches/20-fix-isocountry.dpatch)
===================================================================
--- trunk/jsymphonic/debian/patches/20-fix-isocountry.diff (rev 0)
+++ trunk/jsymphonic/debian/patches/20-fix-isocountry.diff 2010-03-08 20:51:54 UTC (rev 11818)
@@ -0,0 +1,35 @@
+#! /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@
+Index: jsymphonic-0.3.0beta+svn321/src/org/jaudiotagger/tag/reference/ISOCountry.java
+===================================================================
+--- jsymphonic-0.3.0beta+svn321.orig/src/org/jaudiotagger/tag/reference/ISOCountry.java 2009-04-16 16:15:19.000000000 +0200
++++ jsymphonic-0.3.0beta+svn321/src/org/jaudiotagger/tag/reference/ISOCountry.java 2010-03-08 21:36:11.387197154 +0100
+@@ -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"),
Deleted: trunk/jsymphonic/debian/patches/20-fix-isocountry.dpatch
===================================================================
--- trunk/jsymphonic/debian/patches/20-fix-isocountry.dpatch 2010-03-07 23:43:42 UTC (rev 11817)
+++ trunk/jsymphonic/debian/patches/20-fix-isocountry.dpatch 2010-03-08 20:51:54 UTC (rev 11818)
@@ -1,34 +0,0 @@
-#! /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"),
Copied: trunk/jsymphonic/debian/patches/series (from rev 11810, trunk/jsymphonic/debian/patches/00list)
===================================================================
--- trunk/jsymphonic/debian/patches/series (rev 0)
+++ trunk/jsymphonic/debian/patches/series 2010-03-08 20:51:54 UTC (rev 11818)
@@ -0,0 +1,2 @@
+10-config-file.diff
+20-fix-isocountry.diff
Modified: trunk/jsymphonic/debian/rules
===================================================================
--- trunk/jsymphonic/debian/rules 2010-03-07 23:43:42 UTC (rev 11817)
+++ trunk/jsymphonic/debian/rules 2010-03-08 20:51:54 UTC (rev 11818)
@@ -10,7 +10,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+# include /usr/share/cdbs/1/rules/dpatch.mk
JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk
ANT_HOME := /usr/share/ant
Added: trunk/jsymphonic/debian/source/format
===================================================================
--- trunk/jsymphonic/debian/source/format (rev 0)
+++ trunk/jsymphonic/debian/source/format 2010-03-08 20:51:54 UTC (rev 11818)
@@ -0,0 +1 @@
+3.0 (quilt)
Modified: trunk/jsymphonic/debian/watch
===================================================================
--- trunk/jsymphonic/debian/watch 2010-03-07 23:43:42 UTC (rev 11817)
+++ trunk/jsymphonic/debian/watch 2010-03-08 20:51:54 UTC (rev 11818)
@@ -1,3 +1,3 @@
version=3
-opts=dversionmangle=s/\.dfsg// \
-http://sf.net/symphonic/JSymphonic_(.*)-Sources.zip debian debian/new-upstream
+opts=dversionmangle=s/\.dfsg//,uversionmangle=s/_/./g \
+http://sf.net/symphonic/JSymphonic_v?(.*)-Sources.zip
More information about the pkg-java-commits
mailing list