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

[pere at alioth.debian.org]

Author: pere
Date: 2008-09-20 12:22:10 +0000 (Sat, 20 Sep 2008)
New Revision: 7019

Modified:
   trunk/libjava3d-java/debian/control
   trunk/libjava3d-java/debian/rules
Log:
Fix get-orig-source target and try to get javah build working.

Modified: trunk/libjava3d-java/debian/control
===================================================================
--- trunk/libjava3d-java/debian/control	2008-09-20 09:33:18 UTC (rev 7018)
+++ trunk/libjava3d-java/debian/control	2008-09-20 12:22:10 UTC (rev 7019)
@@ -3,7 +3,7 @@
 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, default-jdk-builddep | sun-java6-jdk, libsun-vecmath-java
 Standards-Version: 3.8.0
 Homepage: http://java3d.dev.java.net
 Vcs-Cvs: :pserver:guest at cvs.dev.java.net:/cvs
@@ -14,7 +14,7 @@
 Architecture: all
 Suggests: libjava3d-java-doc
 Depends:  java-gcj-compat | java1-runtime | java2-runtime, libjava3d-jni (>= ${source:Version}),
- antlr
+ libsun-vecmath-java
 Description: Java3D API (java library)
 
 Package: libjava3d-jni

Modified: trunk/libjava3d-java/debian/rules
===================================================================
--- trunk/libjava3d-java/debian/rules	2008-09-20 09:33:18 UTC (rev 7018)
+++ trunk/libjava3d-java/debian/rules	2008-09-20 12:22:10 UTC (rev 7019)
@@ -7,7 +7,9 @@
 # Probably better to use /usr/lib/jvm/default-java ?
 JAVA_HOME            := /usr/lib/jvm/java-6-sun
 
-DEB_JARS             := ant-launcher vecmath1.2
+JAVAH := /usr/lib/jvm/java-6-sun/bin/javah
+
+DEB_JARS             := ant-launcher vecmath
 DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := jar
 DEB_BUILDDIR         := j3d-core
@@ -35,8 +37,7 @@
 # Hm, should the vecmath source also be built?  There is a replacement
 # library already in Debian from before the SUN library became free
 # software.
-	mkdir source && cd source && cvs -d :pserver:guest at cvs.dev.java.net:/cvs co j3d-core j3d-core-utils
-	(cd source && tar -cv --exclude '*/CVS' --exclude .cvsignore -f - \
-	    j3d-core j3d-core-utils \
-	) > ../libjava3d-java_0.0.cvs.20080913.orig.tar.gz
-	rm -rf source
+	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_0.0.cvs.20080913.orig.tar.gz source-cvs
+	rm -rf source-cvs