[pkg-java] r7022 - trunk/libjava3d-java/debian

[pere at alioth.debian.org]

Author: pere
Date: 2008-09-20 13:48:19 +0000 (Sat, 20 Sep 2008)
New Revision: 7022

Modified:
   trunk/libjava3d-java/debian/control
   trunk/libjava3d-java/debian/rules
Log:
Fix install rule.  Prefer openjdk-6-jdk over default-jdk-builddep and accept sun-java6-jdk as well.

Modified: trunk/libjava3d-java/debian/control
===================================================================
--- trunk/libjava3d-java/debian/control	2008-09-20 13:37:19 UTC (rev 7021)
+++ trunk/libjava3d-java/debian/control	2008-09-20 13:48:19 UTC (rev 7022)
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Petter Reinholdtsen <pere at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk-builddep | sun-java6-jdk, libsun-vecmath-java
+Build-Depends: debhelper (>= 5), cdbs, quilt, libsun-vecmath-java
+Build-Depends-Indep: openjdk-6-jdk | default-jdk-builddep | sun-java6-jdk
 Standards-Version: 3.8.0
 Homepage: http://java3d.dev.java.net
 Vcs-Cvs: :pserver:guest at cvs.dev.java.net:/cvs

Modified: trunk/libjava3d-java/debian/rules
===================================================================
--- trunk/libjava3d-java/debian/rules	2008-09-20 13:37:19 UTC (rev 7021)
+++ trunk/libjava3d-java/debian/rules	2008-09-20 13:48:19 UTC (rev 7022)
@@ -4,18 +4,16 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun /usr/lib/jvm/default-java
+JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/default-java /usr/lib/jvm/java-6-sun
 
-JAVAH := /usr/lib/jvm/java-6-sun/bin/javah
-
 DEB_JARS             := ant-launcher ant-nodeps vecmath
 DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := jar
 DEB_BUILDDIR         := j3d-core
 
 install/libjava3d-java::
-	for jar in j3dcore j3dutils ; do \
-	    install -m 644 -D java3d/build/default/opt/lib/ext/$$jar.jar debian/libjava3d-java/usr/share/java/$$jar-$(DEB_UPSTREAM_VERSION).jar; \
+	set -e ; for jar in j3dcore j3dutils ; do \
+	    install -m 644 -D j3d-core/build/default/opt/lib/ext/$$jar.jar debian/libjava3d-java/usr/share/java/$$jar-$(DEB_UPSTREAM_VERSION).jar; \
 	    ln -s $$jar-$(DEB_UPSTREAM_VERSION).jar debian/libjava3d-java/usr/share/java/$$jar.jar ; \
 	done