[pkg-java] r11838 - in trunk/jsymphonic/debian: . patches

[Vincent Fourmond]

Author: fourmond
Date: 2010-03-11 22:59:52 +0000 (Thu, 11 Mar 2010)
New Revision: 11838

Modified:
   trunk/jsymphonic/debian/build.xml
   trunk/jsymphonic/debian/changelog
   trunk/jsymphonic/debian/patches/10-config-file.diff
Log:
[jsymphonic] New upstream SVN snapshot; almost ready, I would say...

Modified: trunk/jsymphonic/debian/build.xml
===================================================================
--- trunk/jsymphonic/debian/build.xml	2010-03-11 21:30:29 UTC (rev 11837)
+++ trunk/jsymphonic/debian/build.xml	2010-03-11 22:59:52 UTC (rev 11838)
@@ -27,6 +27,7 @@
     <copy todir="${builddir}">
       <fileset dir="${srcdir}">
 	<include name="**/resources/*" />
+	<include name="**/*.png" />
       </fileset>
     </copy>
   </target>

Modified: trunk/jsymphonic/debian/changelog
===================================================================
--- trunk/jsymphonic/debian/changelog	2010-03-11 21:30:29 UTC (rev 11837)
+++ trunk/jsymphonic/debian/changelog	2010-03-11 22:59:52 UTC (rev 11838)
@@ -1,3 +1,12 @@
+jsymphonic (0.3.0.Ode.To.Freedom+svn387-1) experimental; urgency=low
+
+  * SVN snapshot based on the new upstream release
+  * Update debian/build.xml to also ship included PNG files
+  * Rewrote debian/patches/10-config-file.diff to take care of the new
+    location for the configuration file.
+
+ -- Vincent Fourmond <fourmond at debian.org>  Thu, 11 Mar 2010 23:59:08 +0100
+
 jsymphonic (0.3.0beta+svn321-1) unstable; urgency=medium
 
   * New SVN snapshot (though not the most recent one), now getting rid of

Modified: trunk/jsymphonic/debian/patches/10-config-file.diff
===================================================================
--- trunk/jsymphonic/debian/patches/10-config-file.diff	2010-03-11 21:30:29 UTC (rev 11837)
+++ trunk/jsymphonic/debian/patches/10-config-file.diff	2010-03-11 22:59:52 UTC (rev 11838)
@@ -5,31 +5,25 @@
 ## DP: in $HOME
 
 @DPATCH@
-Index: jsymphonic-0.3.0beta+svn321/src/org/danizmax/jsymphonic/gui/JSymphonicWindow.java
+Index: jsymphonic-0.3.0.Ode.To.Freedom+svn387/src/org/danizmax/jsymphonic/gui/settings/SettingsHandler.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;
+--- jsymphonic-0.3.0.Ode.To.Freedom+svn387.orig/src/org/danizmax/jsymphonic/gui/settings/SettingsHandler.java	2010-03-11 23:54:44.579327812 +0100
++++ jsymphonic-0.3.0.Ode.To.Freedom+svn387/src/org/danizmax/jsymphonic/gui/settings/SettingsHandler.java	2010-03-11 23:55:23.198996492 +0100
+@@ -40,7 +40,7 @@
+  */
+ public class SettingsHandler {
  
-     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);
+-    public static String CONFIG_FILE_NAME = "JSymphonic.conf";
++    public static String CONFIG_FILE_NAME;
+     public static int WINDOW_STATE_MINI = 0;
+     public static int WINDOW_STATE_NORMAL = 1;
+ 
+@@ -76,6 +76,8 @@
+     private Properties applicationProps;
+ 
+     public SettingsHandler(){
++	CONFIG_FILE_NAME = System.getProperty("user.home") + "/" + 
++	    ".jsymphonic.conf";
+         defaultProps = new Properties();
+         defaultProps.setProperty("Language", language);
+         defaultProps.setProperty("Theme", theme);