[SCM] project-x packaging repository branch, master, updated. debian/0.91.0-2-1-g87cf1b6
etobi
git at e-tobi.net
Sat Jun 2 17:55:54 UTC 2012
The following commit has been merged in the master branch:
commit 87cf1b6ce3636af0ef66c35b251eea60af38803e
Author: etobi <git at e-tobi.net>
Date: Sat Jun 2 19:54:39 2012 +0200
Fixed debian/rules
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/rules b/debian/rules
index e3a5f40..49d014e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ JARNAME = ProjectX.jar
%:
dh $@
-override_dh_auto_build-indep:
+override_dh_auto_build:
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
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
More information about the pkg-vdr-dvb-changes
mailing list