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

[etobi]

The following commit has been merged in the master branch:
commit 9813b48939fb759e144ecf2caed79a476f53f8b4
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/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

-- 
project-x packaging repository