debian/changelog

+java3d (1.5.2+dfsg-15) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 10 (Closes: #898669)
+  * Standards-Version updated to 4.1.4
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Tue, 15 May 2018 01:25:26 +0200
+
 java3d (1.5.2+dfsg-14) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -16,9 +16,9 @@ Build-Depends:
  libxext-dev,
  libxt-dev,
  mesa-common-dev
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/java3d.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/java3d.git
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/java3d.git
+Vcs-Browser: https://salsa.debian.org/java-team/java3d
 Homepage: http://java3d.java.net
 
 Package: libjava3d-java

debian/patches/series

@@ -7,3 +7,4 @@
 06_java-compat.patch
 typedef.patch
 07_java9_compatibility.patch
+08_java10_compatibility.patch

debian/rules

@@ -10,7 +10,7 @@ export CLASSPATH=/usr/share/java/vecmath.jar
 	dh $@ --buildsystem=ant --with javahelper
 
 override_dh_auto_build:
-	dh_auto_build -- -f j3d-core/build.xml -Dbuild.type=fcs echo jar docs
+	dh_auto_build -- -f j3d-core/build.xml -Dbuild.type=fcs -DjavahBuild.notRequired=true echo jar docs
 
 override_dh_auto_clean:
 	dh_auto_build -- -f j3d-core/build.xml clean
@@ -24,12 +24,3 @@ override_dh_auto_install-indep:
 override_dh_auto_install-arch:
 	install -m 644 -D j3d-core/build/default/opt/native/libj3dcore-ogl.so \
 	    debian/libjava3d-jni/usr/lib/jni/libj3dcore-ogl.so
-
-CVS_TAG=rel-$(subst .,_,$(subst +dfsg,,$(DEB_UPSTREAM_VERSION)))-fcs
-get-orig-source::
-	mkdir -p java3d-$(DEB_UPSTREAM_VERSION)
-	cd java3d-$(DEB_UPSTREAM_VERSION) && cvs -d :pserver:guest@cvs.dev.java.net:/cvs export -r $(CVS_TAG) j3d-core j3d-core-utils
-	tar -zcv --exclude .cvsignore \
-	    --exclude unzipsfx \
-	    -f ../java3d_$(DEB_UPSTREAM_VERSION).orig.tar.gz java3d-$(DEB_UPSTREAM_VERSION)
-	rm -rf java3d-$(DEB_UPSTREAM_VERSION)