[vecmath] 06/58: Rename from sun-vecmath to vecmath-sun.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository vecmath.

commit 841850e2654d86174bb1ad4f6e638165237d8bd1
Author: Petter Reinholdtsen <pere at debian.org>
Date:   Sat Sep 20 21:43:29 2008 +0000

    Rename from sun-vecmath to vecmath-sun.
---
 debian/changelog |  4 ++--
 debian/control   |  7 ++++---
 debian/rules     | 13 +++++++------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 47986bb..32698b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
 
diff --git a/debian/control b/debian/control
index 311956a..6b13aa2 100644
--- a/debian/control
+++ b/debian/control
@@ -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)
diff --git a/debian/rules b/debian/rules
index 9aed74d..b6ee49c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,17 +4,18 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 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 @@ get-orig-source::
 	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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/vecmath.git