debian/build.xml

@@ -10,7 +10,7 @@
 
     <target name="build">
         <mkdir dir="build/classes"/>
-        <javac srcdir=".." destdir="build/classes" classpathref="classpath"/>
+        <javac srcdir=".." destdir="build/classes" classpathref="classpath" excludes="**/Main.java"/>
         <mkdir dir="build/jar"/>
         <jar destfile="build/jar/java3ds-fileloader.jar" basedir="build/classes">
             <manifest>

debian/changelog

+java3ds-fileloader (1.2+dfsg-4) unstable; urgency=medium
+
+  * Team upload.
+  * No longer build the applet to fix the build failure with Java 11
+    (Closes: #915291)
+  * Build with the DH sequencer instead of CDBS
+  * Standards-Version updated to 4.4.0
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Thu, 12 Sep 2019 09:24:49 +0200
+
 java3ds-fileloader (1.2+dfsg-3) unstable; urgency=medium
 
   * Upload to unstable.

debian/compat

-10
+11

debian/control

@@ -3,11 +3,15 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: tony mancill <tmancill@debian.org>
-Build-Depends: debhelper (>= 10), cdbs, ant, default-jdk, maven-repo-helper,
- libjava3d-java
-Standards-Version: 4.0.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/java3ds-fileloader.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/java3ds-fileloader.git
+Build-Depends:
+ ant,
+ debhelper (>= 11),
+ default-jdk,
+ libjava3d-java,
+ maven-repo-helper
+Standards-Version: 4.4.0
+Vcs-Git: https://salsa.debian.org/java-team/java3ds-fileloader.git
+Vcs-Browser: https://salsa.debian.org/java-team/java3ds-fileloader
 Homepage: https://sourceforge.net/projects/java3dsloader/
 
 Package: java3ds-fileloader

debian/java3ds-fileloader.poms

+debian/pom.xml --java-lib --usj-name=java3ds-fileloader --artifact=debian/build/jar/java3ds-fileloader.jar

debian/rules

 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+	dh $@ --buildsystem=ant --with maven-repo-helper
 
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET := build
-DEB_ANT_BUILDFILE    := $(DEB_SRCDIR)/debian/build.xml
+override_dh_auto_build:
+	dh_auto_build -- -f debian/build.xml build
 
-TMPORIGDIR := $(DEB_SRCDIR)/debian/tmp-orig-source
-
-binary-post-install/java3ds-fileloader::
-	mh_installpom -pjava3ds-fileloader debian/pom.xml
-	mh_installjar -pjava3ds-fileloader -l -njava3ds-fileloader debian/pom.xml \
-		$(DEB_SRCDIR)/debian/build/jar/java3ds-fileloader.jar
-
-clean::
-	-rm -rf debian/tmp
-
-get-orig-source:
-	[ ! -d $(TMPORIGDIR) ] && mkdir $(TMPORIGDIR)
-	uscan --verbose --download-version $(DEB_UPSTREAM_VERSION) \
-		--force-download --rename --repack --destdir $(TMPORIGDIR)
-	mv $(TMPORIGDIR)/*gz .
-	rm -rf $(TMPORIGDIR)
+override_dh_auto_clean:
+	dh_auto_build -- -f debian/build.xml clean