CVS libpixie-java/debian

[Christian Bayle]

Update of /cvsroot/pkg-java/libpixie-java/debian
In directory haydn:/tmp/cvs-serv24096/libpixie-java/debian

Modified Files:
	changelog rules 
Log Message:
RELEASE_20030705-4


--- /cvsroot/pkg-java/libpixie-java/debian/changelog	2003/07/22 19:52:36	1.2
+++ /cvsroot/pkg-java/libpixie-java/debian/changelog	2005/04/28 21:09:10	1.3
@@ -1,3 +1,9 @@
+libpixie-java (20030705-4) unstable; urgency=high
+
+  * Fixed FTBFS: ./debian_patch: Permission denied (Closes: #306749) 
+
+ -- Christian Bayle <bayle@debian.org>  Thu, 28 Apr 2005 22:07:56 +0200
+
 libpixie-java (20030705-3) unstable; urgency=low
 
   * Added dependancy on java2-runtime (Closes: #202401) 
--- /cvsroot/pkg-java/libpixie-java/debian/rules	2003/07/15 21:23:27	1.1
+++ /cvsroot/pkg-java/libpixie-java/debian/rules	2005/04/28 21:09:10	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=pixie
 export VERSION=$(shell ls pixie-*.tar.gz | sed 's/pixie-\(.*\).tar.gz/\1/' )
@@ -21,7 +19,7 @@
 	# Add here commands to configure the package.
 	mkdir $(SRCDIR)
 	tar xvzf pixie-$(VERSION).tar.gz
-	./debian_patch $(SRCDIR)/ant/build.xml
+	sh ./debian_patch $(SRCDIR)/ant/build.xml
 	touch configure-stamp