[Plplot-cvs] plplot/debian changelog,1.118,1.119 rules,1.62,1.63

[Rafael L. <rla...@us...>]

Update of /cvsroot/plplot/plplot/debian
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28572

Modified Files:
	changelog rules 
Log Message:
* debian/rules: Set JAVA_HOME to /usr/lib/jvm/java-gcj


Index: rules
===================================================================
RCS file: /cvsroot/plplot/plplot/debian/rules,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- rules	5 Jun 2006 18:09:19 -0000	1.62
+++ rules	5 Jun 2006 21:51:20 -0000	1.63
@@ -12,6 +12,7 @@
 #export DH_VERBOSE=1
 
 include /usr/share/octave/debian/defs.make
+include /usr/share/dpatch/dpatch.make
 
 version		:= $(shell perl debian/get-upstream-version.pl < configure.ac)
 libpkg          := libplplot9
@@ -25,10 +26,6 @@
 debinfo		:= $(debshr)/info
 debex		:= $(debshr)/plplot$(version)/examples
 
-javasetup	:= --with-java-home=/usr/lib/gcc/i486-linux-gnu/4.1.2
-
-include /usr/share/dpatch/dpatch.make
-
 autotools: autotools-stamp
 autotools-stamp:
 	-rm -f config.sub config.guess
@@ -44,8 +41,8 @@
                     --without-rpath --with-prebuiltdoc		\
                     --with-pthreads --with-ltdlsystem		\
                     --disable-linuxvga  --enable-psttf		\
-		    --enable-f95 --enable-psttfc $(javasetup)	\
-		    --enable-pdl
+		    --enable-f95 --enable-psttfc --enable-pdl	\
+		    --with-java-home=/usr/lib/jvm/java-gcj
 	touch config-stamp
 
 build: build-stamp

Index: changelog
===================================================================
RCS file: /cvsroot/plplot/plplot/debian/changelog,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- changelog	5 Jun 2006 18:09:18 -0000	1.118
+++ changelog	5 Jun 2006 21:51:20 -0000	1.119
@@ -4,8 +4,9 @@
     java-gcj-compat-dev, which will be default java environment for
     building packages soon (thanks to Michael Koch <kon...@gm...>
     for the hint)
+  * debian/rules: Set JAVA_HOME to /usr/lib/jvm/java-gcj
 
- -- Rafael Laboissiere <ra...@de...>  Mon,  5 Jun 2006 19:07:48 +0200
+ --
 
 plplot (5.6.1-1) unstable; urgency=low