CVS libjcommon-java/debian

[Christian Bayle]

Update of /cvsroot/pkg-java/libjcommon-java/debian
In directory haydn:/tmp/cvs-serv23853/libjcommon-java/debian

Modified Files:
	changelog rules 
Log Message:
RELEASE_0_8_3-4


--- /cvsroot/pkg-java/libjcommon-java/debian/changelog	2003/07/22 19:59:38	1.2
+++ /cvsroot/pkg-java/libjcommon-java/debian/changelog	2005/04/28 21:04:56	1.3
@@ -1,3 +1,9 @@
+libjcommon-java (0.8.3-4) unstable; urgency=low
+
+  * Fixed FTBFS: ./debian_patch: Permission denied (Closes: #306636)
+
+ -- Christian Bayle <bayle@debian.org>  Thu, 28 Apr 2005 22:14:20 +0200
+
 libjcommon-java (0.8.3-3) unstable; urgency=low
 
   * Added dependancy on java2-runtime (Closes: #202400)
--- /cvsroot/pkg-java/libjcommon-java/debian/rules	2003/07/15 21:13:29	1.1
+++ /cvsroot/pkg-java/libjcommon-java/debian/rules	2005/04/28 21:04:56	1.2
@@ -4,10 +4,8 @@
 #export DH_VERBOSE=1
 
 # Build 
-export JAVA_HOME=/usr/lib/j2se/1.4
-export JAVA=/usr/lib/j2se/1.4/bin/java
-export JAVAC=/usr/lib/j2se/1.4/bin/javac
-export CLASSPATH=/usr/lib/j2se/1.4/jre/lib/rt.jar
+JAVA_HOME_DIRS=/usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.4-blackdown
+export JAVA_HOME ?= $(shell for j in $(JAVA_HOME_DIRS); do [ -d "$$j" ] && echo $$j && exit 0; done)
 
 export LIBRARY = $(shell head -1 debian/control | sed 's/Source. lib\(.*\)-java/\1/')
 export VERSION = $(shell head -1 debian/changelog | sed 's/.*(\(.*\)-.*).*/\1/' )
@@ -20,7 +18,7 @@
 	dh_testdir
 	# Add here commands to configure the package.
 	tar xvzf $(LIBRARY)-$(VERSION).tar.gz
-	./debian_patch $(SRCDIR)/ant/build.xml
+	sh ./debian_patch $(SRCDIR)/ant/build.xml
 	touch configure-stamp