[pkg-java] r7025 - trunk/sun-vecmath/debian

[pere at alioth.debian.org]

Author: pere
Date: 2008-09-20 21:29:41 +0000 (Sat, 20 Sep 2008)
New Revision: 7025

Modified:
   trunk/sun-vecmath/debian/changelog
   trunk/sun-vecmath/debian/control
   trunk/sun-vecmath/debian/rules
Log:
Rename from sun-vecmath to vecmath-sun.

Modified: trunk/sun-vecmath/debian/changelog
===================================================================
--- trunk/sun-vecmath/debian/changelog	2008-09-20 15:55:11 UTC (rev 7024)
+++ trunk/sun-vecmath/debian/changelog	2008-09-20 21:29:41 UTC (rev 7025)
@@ -1,6 +1,6 @@
-sun-vecmath (1.5.2-1) unstable; urgency=low
+vecmath-sun (1.5.2-1) unstable; urgency=low
 
-  * Initial Release (closes: #)
+  * Initial Release (Closes: #).
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 19 Sep 2008 22:19:43 +0200
 

Modified: trunk/sun-vecmath/debian/control
===================================================================
--- trunk/sun-vecmath/debian/control	2008-09-20 15:55:11 UTC (rev 7024)
+++ trunk/sun-vecmath/debian/control	2008-09-20 21:29:41 UTC (rev 7025)
@@ -1,16 +1,17 @@
-Source: sun-vecmath
+Source: vecmath-sun
 Section: libs
 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
+Build-Depends: debhelper (>= 5), cdbs, quilt
+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
 Vcs-Browser: http://bollin.googlecode.com/svn/libjava3d-java/trunk
 XS-Autobuild: yes
 
-Package: libsun-vecmath-java
+Package: libvecmath-sun-java
 Architecture: all
 Depends:  java-gcj-compat | java1-runtime | java2-runtime
 Description: Java3D API (java library)

Modified: trunk/sun-vecmath/debian/rules
===================================================================
--- trunk/sun-vecmath/debian/rules	2008-09-20 15:55:11 UTC (rev 7024)
+++ trunk/sun-vecmath/debian/rules	2008-09-20 21:29:41 UTC (rev 7025)
@@ -4,18 +4,19 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-# Probably better to use /usr/lib/jvm/default-java ?
-JAVA_HOME            := /usr/lib/jvm/java-6-sun
+JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/default-java /usr/lib/jvm/java-6-sun
 
 DEB_JARS             := ant-launcher
 DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := jar
 DEB_BUILDDIR         := vecmath
 
-install/libsun-vecmath-java::
-	install -m 644 -D vecmath/build/opt/lib/ext/vecmath.jar debian/libsun-vecmath-java/usr/share/java/vecmath-$(DEB_UPSTREAM_VERSION).jar
-	ln -s vecmath-$(DEB_UPSTREAM_VERSION).jar debian/libsun-vecmath-java/usr/share/java/vecmath.jar
+PACKAGE              := libvecmath-sun-java
 
+install/$(PACKAGE)::
+	install -m 644 -D vecmath/build/opt/lib/ext/vecmath.jar debian/$(PACKAGE)/usr/share/java/vecmath-$(DEB_UPSTREAM_VERSION).jar
+	ln -s vecmath-$(DEB_UPSTREAM_VERSION).jar debian/$(PACKAGE)/usr/share/java/vecmath.jar
+
 clean::
 	$(RM) -r gluegen/build
 
@@ -27,5 +28,5 @@
 	cvs -d :pserver:guest at cvs.dev.java.net:/cvs login
 	mkdir source-cvs && cd source-cvs && \
 	    cvs -d :pserver:guest at cvs.dev.java.net:/cvs co -r $(CVS_TAG) vecmath
-	tar -zcv --exclude '*/CVS' --exclude .cvsignore -f ../sun-vecmath_$(CVS_VER).orig.tar.gz  source-cvs
+	tar -zcv --exclude '*/CVS' --exclude .cvsignore -f ../vecmath-sun_$(CVS_VER).orig.tar.gz  source-cvs
 	rm -rf source-cvs