[java3d] 40/77: java3d 1.5.2

[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 83c0227f0b052e2f1eec0258533f0ff6634ccc4f
Author: Onkar Shinde <onkarshinde at ubuntu.com>
Date:   Thu Aug 6 05:48:51 2009 +0000

    java3d 1.5.2
---
 debian/changelog | 25 +++++++++++++++++++++++--
 debian/control   |  6 +++---
 debian/rules     | 20 ++++++++------------
 debian/watch     |  4 ++--
 4 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dca7f45..d3760d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-java3d (1.5.2+cvs20090309+dfsg-1) UNRELEASED; urgency=low
+java3d (1.5.2+dfsg-1) unstable; urgency=low
 
   [ Sylvestre Ledru ]
   * Change version number scheme to match upstream.
@@ -11,7 +11,28 @@ java3d (1.5.2+cvs20090309+dfsg-1) UNRELEASED; urgency=low
     + Update DEB_VER.
   * debian/watch: Added dversionmangle to remove .dfsg from version.
 
- -- Jonny Lamb <jonny at debian.org>  Mon, 09 Mar 2009 00:31:20 +0000
+  [ Onkar Shinde ]
+  * debian/control
+    - Use default-jdk build dependency since now default-jdk is openjdk.
+    - Remove default-jdk-builddep build dependency since we are not building
+      any -gcj package.
+    - Change runtime dependency to default-jre | java5-runtime as per the JVM
+      target version specified in build.xml.
+    - Change standards version to 3.8.2. No change needed.
+  * debian/rules
+    - Update JAVA_HOME to correspond to default-jdk.
+    - Remove unnecessary references to ant-launcher jar file.
+    - Add ant-optional to list of jar files.
+    - Use cvs export instead of checkout. Doesn't need user interaction.
+    - Use the release tag instead of getting latest files in cvs.
+      Release tag is derived from upstream version.
+    - Change directory name where code is checked out from cvs to the usual
+      <package>-<version> format.
+  * debian/watch
+    - Simplify the expression for zip file name. Use uversionmangle for proper
+      version matching.
+
+ -- Jonny Lamb <jonny at debian.org>  Thu, 06 Aug 2009 01:37:56 +0530
 
 java3d (0.0.cvs.20090202.dfsg-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f138db2..694c789 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Petter Reinholdtsen <pere at debian.org>, Jonny Lamb 
  <jonny at debian.org>, Sylvestre Ledru <sylvestre.ledru at inria.fr>
 Build-Depends: debhelper (>= 5), cdbs, ant-optional, libvecmath-java, mesa-common-dev, libgl1-mesa-dev, libxext-dev, libxt-dev
-Build-Depends-Indep: openjdk-6-jdk | default-jdk-builddep | sun-java6-jdk
-Standards-Version: 3.8.0
+Build-Depends-Indep: default-jdk
+Standards-Version: 3.8.2
 Homepage: http://java3d.dev.java.net
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/java3d/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/java3d/
@@ -16,7 +16,7 @@ DM-Upload-Allowed: yes
 Package: libjava3d-java
 Architecture: all
 Suggests: libjava3d-java-doc
-Depends: ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime, libjava3d-jni (>= ${source:Version}),
+Depends: ${misc:Depends}, default-jre | java5-runtime, libjava3d-jni (>= ${source:Version}),
  libvecmath-java
 Description: Java 3D API (java library)
  The Java 3D API enables the creation of three-dimensional graphics
diff --git a/debian/rules b/debian/rules
index 7811a27..5fadb39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
-DEB_JARS             := ant-launcher ant-nodeps vecmath
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_JARS             := ant-optional vecmath
 DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := jar docs
 DEB_BUILDDIR         := j3d-core
@@ -26,15 +26,11 @@ install/libjava3d-java-doc::
 	cp -r j3d-core/build/$$platform/javadocs/docs-public \
 	    debian/libjava3d-java-doc/usr/share/doc/libjava3d-java-doc/api
 
-clean::
-
-DEB_VER := 1.5.2+cvs20090309+dfsg
+CVS_TAG=rel-$(subst .,_,$(subst +dfsg,,$(DEB_UPSTREAM_VERSION)))-fcs
 get-orig-source::
-	@ echo "Password for the guest CVS user is an empty password (press [enter])"
-	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 j3d-core j3d-core-utils
-	tar -zcv --exclude '*/CVS' --exclude .cvsignore \
+	mkdir -p java3d-$(DEB_UPSTREAM_VERSION)
+	cd java3d-$(DEB_UPSTREAM_VERSION) && cvs -d :pserver:guest at cvs.dev.java.net:/cvs export -r $(CVS_TAG) j3d-core j3d-core-utils
+	tar -zcv --exclude .cvsignore \
 	    --exclude unzipsfx \
-	    -f ../java3d_$(DEB_VER).orig.tar.gz source-cvs
-	rm -rf source-cvs
+	    -f ../java3d_$(DEB_UPSTREAM_VERSION).orig.tar.gz java3d-$(DEB_UPSTREAM_VERSION)
+	rm -rf java3d-$(DEB_UPSTREAM_VERSION)
diff --git a/debian/watch b/debian/watch
index 8b9a5e8..90ee572 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\.dfsg// \
-https://java3d.dev.java.net/binary-builds.html .*/j3d-(\d)_(\d)_(\d)-src.zip
+opts="uversionmangle=s/_/./g,dversionmangle=s/\+dfsg//" \
+https://java3d.dev.java.net/binary-builds.html .*/j3d-([\d_]+)-src.zip

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