diff -Nru java3ds-fileloader-1.2+dfsg/debian/build.xml java3ds-fileloader-1.2+dfsg/debian/build.xml --- java3ds-fileloader-1.2+dfsg/debian/build.xml 2017-06-26 00:02:43.000000000 +0000 +++ java3ds-fileloader-1.2+dfsg/debian/build.xml 2019-09-12 06:53:01.000000000 +0000 @@ -10,7 +10,7 @@ - + diff -Nru java3ds-fileloader-1.2+dfsg/debian/changelog java3ds-fileloader-1.2+dfsg/debian/changelog --- java3ds-fileloader-1.2+dfsg/debian/changelog 2017-06-26 00:02:43.000000000 +0000 +++ java3ds-fileloader-1.2+dfsg/debian/changelog 2019-09-12 07:24:49.000000000 +0000 @@ -1,3 +1,15 @@ +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 Thu, 12 Sep 2019 09:24:49 +0200 + java3ds-fileloader (1.2+dfsg-3) unstable; urgency=medium * Upload to unstable. diff -Nru java3ds-fileloader-1.2+dfsg/debian/compat java3ds-fileloader-1.2+dfsg/debian/compat --- java3ds-fileloader-1.2+dfsg/debian/compat 2017-06-26 00:02:43.000000000 +0000 +++ java3ds-fileloader-1.2+dfsg/debian/compat 2019-09-12 06:52:40.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru java3ds-fileloader-1.2+dfsg/debian/control java3ds-fileloader-1.2+dfsg/debian/control --- java3ds-fileloader-1.2+dfsg/debian/control 2017-06-26 00:02:43.000000000 +0000 +++ java3ds-fileloader-1.2+dfsg/debian/control 2019-09-12 07:16:48.000000000 +0000 @@ -3,11 +3,15 @@ Priority: optional Maintainer: Debian Java Maintainers Uploaders: tony mancill -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 diff -Nru java3ds-fileloader-1.2+dfsg/debian/copyright java3ds-fileloader-1.2+dfsg/debian/copyright --- java3ds-fileloader-1.2+dfsg/debian/copyright 2017-06-26 00:02:43.000000000 +0000 +++ java3ds-fileloader-1.2+dfsg/debian/copyright 2019-09-12 07:16:23.000000000 +0000 @@ -6,7 +6,7 @@ Files: * Copyright: 2005-2009, Microcrowd License: LGPL - On Debian systems the full text of the GNU Lesser General Public + On Debian systems the full text of the GNU Lesser General Public License can be found in the `/usr/share/common-licenses/LGPL' file. @@ -14,6 +14,6 @@ Copyright: 2009, Gabriele Giacone <1o5g4r8o@gmail.com> 2017, tony mancill License: GPL-3+ - On Debian systems the full text of the GNU General Public + On Debian systems the full text of the GNU General Public License can be found in the `/usr/share/common-licenses/GPL-3' file. diff -Nru java3ds-fileloader-1.2+dfsg/debian/java3ds-fileloader.poms java3ds-fileloader-1.2+dfsg/debian/java3ds-fileloader.poms --- java3ds-fileloader-1.2+dfsg/debian/java3ds-fileloader.poms 1970-01-01 00:00:00.000000000 +0000 +++ java3ds-fileloader-1.2+dfsg/debian/java3ds-fileloader.poms 2019-09-12 06:52:40.000000000 +0000 @@ -0,0 +1 @@ +debian/pom.xml --java-lib --usj-name=java3ds-fileloader --artifact=debian/build/jar/java3ds-fileloader.jar diff -Nru java3ds-fileloader-1.2+dfsg/debian/rules java3ds-fileloader-1.2+dfsg/debian/rules --- java3ds-fileloader-1.2+dfsg/debian/rules 2017-06-26 00:02:43.000000000 +0000 +++ java3ds-fileloader-1.2+dfsg/debian/rules 2019-09-12 06:52:40.000000000 +0000 @@ -1,25 +1,10 @@ #!/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