[proguard] 02/13: Imported Debian patch 3.2-2

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository proguard.

commit 22a387c2d547016a2eda72813bed2f3cdd27a0af
Author: Sam Clegg <samo at debian.org>
Date:   Sat Jun 4 21:17:01 2005 +0100

    Imported Debian patch 3.2-2
---
 debian/changelog | 7 +++++++
 debian/rules     | 4 ++--
 proguard         | 2 +-
 proguardgui      | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a682586..c6d52df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+proguard (3.2-2) unstable; urgency=low
+
+  * fix java executable name in proguard and proguardgui shell
+    scripts (Closes: #311966)
+
+ -- Sam Clegg <samo at debian.org>  Sat,  4 Jun 2005 21:17:01 +0100
+
 proguard (3.2-1) unstable; urgency=low
 
   * Initial Release (Closes: #310044).
diff --git a/debian/rules b/debian/rules
index 907c9a5..dbbb2f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 JAVA_COMPILER = jikes-classpath +E +Z0
 JAR = jar
 
-#common-build::
 binary-indep:
 	mkdir -p build
+	mkdir -p lib
 	${JAVA_COMPILER} -d build/proguard -sourcepath src src/proguard/ProGuard.java
 	${JAVA_COMPILER} -d build/retrace -sourcepath src src/proguard/retrace/ReTrace.java
 	${JAVA_COMPILER} -d build/proguardgui -cp build/proguard -sourcepath src src/proguard/gui/ProGuardGUI.java
@@ -21,5 +21,5 @@ binary-indep:
 	cd src && ${JAR} uf ../lib/proguardgui.jar proguard/gui/vtitle.gif proguard/gui/arrow.gif proguard/gui/default.pro proguard/gui/GUIResources.properties proguard/gui/boilerplate.pro
 
 clean::
-	rm -f lib/*.jar
 	rm -rf build/
+	rm -rf lib/
diff --git a/proguard b/proguard
index d247507..5ffca5b 100644
--- a/proguard
+++ b/proguard
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec gij -jar /usr/share/java/proguard.jar $*
+exec java -jar /usr/share/java/proguard.jar $*
diff --git a/proguardgui b/proguardgui
index 366d8e5..88ace3d 100644
--- a/proguardgui
+++ b/proguardgui
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec kaffe -cp /usr/share/java/proguard.jar:/usr/share/java/proguardgui.jar proguard.gui.ProGuardGUI $*
+exec java -cp /usr/share/java/proguard.jar:/usr/share/java/proguardgui.jar proguard.gui.ProGuardGUI $*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/proguard.git