[java3d] 72/77: Build with the DH sequencer instead of CDBS

[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 1c03db8c4237a911330c090dedafe972fbd46d3c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 8 10:20:49 2018 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog            |  1 +
 debian/control              |  2 +-
 debian/libjava3d-java.jlibs |  2 ++
 debian/rules                | 37 ++++++++++++++++---------------------
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 894e617..326cba4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ java3d (1.5.2+dfsg-12) UNRELEASED; urgency=medium
     and invalid-short-name-in-dep5-copyright in debian/copyright.
 
   [ Emmanuel Bourg ]
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.3
   * Switch to debhelper level 11
diff --git a/debian/control b/debian/control
index bbe68f6..434b853 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,10 @@ Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>,
  Emmanuel Bourg <ebourg at apache.org>,
  Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 11),
- cdbs,
  default-jdk,
  ant-optional,
  libvecmath-java,
+ javahelper,
  mesa-common-dev,
  libgl1-mesa-dev,
  libxext-dev,
diff --git a/debian/libjava3d-java.jlibs b/debian/libjava3d-java.jlibs
new file mode 100644
index 0000000..f01e01a
--- /dev/null
+++ b/debian/libjava3d-java.jlibs
@@ -0,0 +1,2 @@
+j3d-core/build/default/opt/lib/ext/j3dcore.jar
+j3d-core/build/default/opt/lib/ext/j3dutils.jar
diff --git a/debian/rules b/debian/rules
index 2357342..8505b3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,33 +3,28 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND = -Wall
 include /usr/share/dpkg/buildflags.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-nodeps vecmath
-DEB_ANT_BUILDFILE    := j3d-core/build.xml
-DEB_ANT_CLEAN_TARGET := clean
-DEB_ANT_BUILD_TARGET := echo jar docs
-DEB_ANT_ARGS         := -Dbuild.type=fcs
-
-install/libjava3d-java::
-	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 j3d-core/build/default/opt/native/libj3dcore-ogl.so \
-	    debian/libjava3d-jni/usr/lib/jni/libj3dcore-ogl.so
 
-install/libjava3d-java-doc::
+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
+
+override_dh_auto_clean:
+	dh_auto_build -- -f j3d-core/build.xml clean
+
+override_dh_auto_install-indep:
 	mkdir -p debian/libjava3d-java-doc/usr/share/doc/libjava3d-java-doc
 	platform=`cd j3d-core; ant echo | grep platform | sed -e 's/.*= //'` ; \
 	cp -r j3d-core/build/$$platform/javadocs/docs-public \
 	    debian/libjava3d-java-doc/usr/share/doc/libjava3d-java-doc/api
 
+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)

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