[SCM] project-x packaging repository branch, master, updated. debian/0.91.0-1-1-g4118685

[etobi]

The following commit has been merged in the master branch:
commit 4118685fa10413d54a756d778041d68e0fac4ea7
Author: etobi <git at e-tobi.net>
Date:   Sat Jun 2 18:08:58 2012 +0200

    Install the correct ProjectX.jar, not the pre-built one from the upstream sources

diff --git a/MANIFEST.MF b/MANIFEST.MF
index f3ce170..6c541a1 100644
--- a/MANIFEST.MF
+++ b/MANIFEST.MF
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Main-Class: net.sourceforge.dvb.projectx.common.Start
 Created-By: 1.2.2 (Sun Microsystems Inc.)
-Class-Path: lib/commons-net-1.3.0.jar lib/jakarta-oro-2.0.8.jar
+Class-Path: /usr/share/java/commons-net.jar /usr/share/java/oro.jar
diff --git a/debian/changelog b/debian/changelog
index d7b059c..87595f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,18 @@
-project-x (0.91.0-1) UNRELEASED; urgency=low
+project-x (0.91.0-2) unstable; urgency=low
+
+  * Install the correct ProjectX.jar, not the pre-built one from the
+    upstream sources
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 02 Jun 2012 18:08:51 +0200
+
+project-x (0.91.0-1) unstable; urgency=low
 
   * New upstream release
   * Use source format 3.0 (quilt) now
   * Depend on default-jre | java6-runtime
   * Disabled 01_percentage-fix.patch
 
- -- Tobias Grimm <etobi at debian.org>  Thu, 24 May 2012 20:49:29 +0200
+ -- Tobias Grimm <etobi at debian.org>  Sat, 02 Jun 2012 18:08:02 +0200
 
 project-x (0.90.4+cvs20091114.1925.dfsg-1) unstable; urgency=low
 
diff --git a/debian/install b/debian/install
index 4154998..4d9e772 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,3 @@
-ProjectX.jar               usr/share/java
+result/ProjectX.jar        usr/share/java
 debian/bin/projectx        usr/bin/
 debian/projectx.desktop    usr/share/applications
diff --git a/debian/rules b/debian/rules
index f766be4..e3a5f40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,12 @@ JARNAME		= ProjectX.jar
 
 override_dh_auto_build-indep:
 	mkdir -p build
+	mkdir -p result
 	${JAVAC} -source 1.4 -target 1.4 -encoding iso8859-1 -classpath ${CLASSPATH} -O -g:none -d build @sources.lst
 	cp ./resources/* ./build
-	${JAR} cfvm ${JARNAME}  MANIFEST.MF -C build .
+	${JAR} cfvm result/${JARNAME}  MANIFEST.MF -C build .
 	dh_auto_build
+
+override_dh_auto_clean:
+	rm -rf build result
+	dh_auto_clean
diff --git a/src/net/sourceforge/dvb/projectx/common/Resource.java b/src/net/sourceforge/dvb/projectx/common/Resource.java
index 66447aa..12f3655 100644
--- a/src/net/sourceforge/dvb/projectx/common/Resource.java
+++ b/src/net/sourceforge/dvb/projectx/common/Resource.java
@@ -64,7 +64,7 @@ public class Resource extends Object {
 	private static final String PJX_RESOURCE_PREFIX = "pjxresources";
 
 	/** current working directory */
-	public static final String workdir = System.getProperty("user.dir");
+	public static final String workdir = System.getProperty("user.home");
 	
 	/** os dependent file separator */
 	public static final String filesep = System.getProperty("file.separator");
diff --git a/src/net/sourceforge/dvb/projectx/common/Settings.java b/src/net/sourceforge/dvb/projectx/common/Settings.java
index f9acd23..ab4401a 100644
--- a/src/net/sourceforge/dvb/projectx/common/Settings.java
+++ b/src/net/sourceforge/dvb/projectx/common/Settings.java
@@ -56,7 +56,7 @@ import net.sourceforge.dvb.projectx.xinput.XInputDirectory;
 public class Settings extends Object {
 
 	/** the default ini filename */
-	private static final String DEFAULT_INI = "X.ini";
+	private static final String DEFAULT_INI = ".project-x.ini";
 
 	/** the current ini filename */
 	private String inifile = "";

-- 
project-x packaging repository