[java3d] 02/77: Rename source package to java3d.

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository java3d.

commit 54d31da3d8bd39d49d1f74015de2fbedb2b81645
Author: Petter Reinholdtsen <pere at debian.org>
Date:   Sun Sep 21 03:08:08 2008 +0000

    Rename source package to java3d.
---
 debian/changelog |  4 ++--
 debian/control   | 19 ++++++++++++++++---
 debian/rules     | 35 +++++++++++++++++------------------
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9ad72c9..1862095 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-libjava3d-java (0.0.cvs.20080919-1) unstable; urgency=low
+libjava3d-java (0.0.cvs.20080816-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 968a352..6b016eb 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ 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, ant-optional, 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
@@ -14,16 +15,28 @@ Package: libjava3d-java
 Architecture: all
 Suggests: libjava3d-java-doc
 Depends:  java-gcj-compat | java1-runtime | java2-runtime, libjava3d-jni (>= ${source:Version}),
- antlr
-Description: Java3D API (java library)
+ libsun-vecmath-java
+Description: Java 3D API (java library)
+ The Java 3D API enables the creation of three-dimensional graphics applications
+ and Internet-based 3D applets. It provides high-level constructs for creating and
+ manipulation 3D geometry and building the structures used in rendering that geometry.
+ With this software, you can efficiently define and render very large virtual worlds.
 
 Package: libjava3d-jni
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Java3D API (java jni library)
+ The Java 3D API enables the creation of three-dimensional graphics applications
+ and Internet-based 3D applets. It provides high-level constructs for creating and
+ manipulation 3D geometry and building the structures used in rendering that geometry.
+ With this software, you can efficiently define and render very large virtual worlds.
 
 Package: libjava3d-java-doc
 Architecture: all
 Section: doc
 Suggests: libjava3d-java
 Description: Documentation for the Java3D API
+ The Java 3D API enables the creation of three-dimensional graphics applications
+ and Internet-based 3D applets. It provides high-level constructs for creating and
+ manipulation 3D geometry and building the structures used in rendering that geometry.
+ With this software, you can efficiently define and render very large virtual worlds.
diff --git a/debian/rules b/debian/rules
index 04d60a4..d029513 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,33 +4,32 @@ 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 vecmath1.2
+DEB_JARS             := ant-launcher ant-nodeps vecmath
 DEB_ANT_CLEAN_TARGET := clean
-DEB_ANT_BUILD_TARGET := jar
+DEB_ANT_BUILD_TARGET := jar # docs
 DEB_BUILDDIR         := j3d-core
 
 install/libjava3d-java::
-	install -m 644 -D java3d/build/java3d.jar debian/libjava3d-java/usr/share/java/java3d-$(DEB_UPSTREAM_VERSION).jar
-	ln -s java3d-$(DEB_UPSTREAM_VERSION).jar debian/libjava3d-java/usr/share/java/java3d.jar
-	install -m 644 -D gluegen/build/gluegen-rt.jar debian/libjava3d-java/usr/share/java/gluegen-rt-$(DEB_UPSTREAM_VERSION).jar
-	ln -s gluegen-rt-$(DEB_UPSTREAM_VERSION).jar debian/libjava3d-java/usr/share/java/gluegen-rt.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
 
 install/libjava3d-jni::
-	install -m 644 -D java3d/build/obj/libjava3d.so debian/libjava3d-jni/usr/lib/jni/libjava3d.so
-	install -m 644 -D java3d/build/obj/libjava3d_awt.so debian/libjava3d-jni/usr/lib/jni/libjava3d_awt.so
-# Commented since Cg is not available under Debian
-#	install -m 644 -D java3d/build/obj/libjava3d_cg.so debian/libjava3d-jni/usr/lib/jni/libjava3d_cg.so
-	install -m 644 -D gluegen/build/obj/libgluegen-rt.so debian/libjava3d-jni/usr/lib/jni/libgluegen-rt.so
+	install -m 644 -D j3d-core/build/default/opt/native/libj3dcore-ogl.so \
+	    debian/libjava3d-jni/usr/lib/jni/libj3dcore-ogl.so
 
 clean::
-	$(RM) -r gluegen/build
 
+DEB_VER := 0.0.cvs.2008816
 get-orig-source::
-	-uscan --upstream-version 0
+	@ echo "Password for the guest CVS user is an empty password (press [enter])"
 	cvs -d :pserver:guest at cvs.dev.java.net:/cvs login
-	cvs -d :pserver:guest at cvs.dev.java.net:/cvs co j3d-core j3d-core-utils
-#  vecmath
-	tar -cv --exclude '*/CVS' --exclude .cvsignore -f ../libjava3d-java-0.0.cvs.20080913.orig.tar.gz j3d-core j3d-core-utils
+	mkdir source-cvs
+	cd source-cvs && cvs -d :pserver:guest at cvs.dev.java.net:/cvs co j3d-core j3d-core-utils
+	tar -zcv --exclude '*/CVS' --exclude .cvsignore \
+	    -f ../libjava3d-java_$(DEB_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/java3d.git