[Git][java-team/java3ds-fileloader][master] 7 commits: Standards-Version updated to 4.4.0

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / java3ds-fileloader


Commits:
cb3cf7c7 by Emmanuel Bourg at 2019-09-12T06:52:36Z
Standards-Version updated to 4.4.0

- - - - -
306b022c by Emmanuel Bourg at 2019-09-12T06:52:40Z
Switch to debhelper level 11

- - - - -
7a0adc1c by Emmanuel Bourg at 2019-09-12T06:52:40Z
Use salsa.debian.org Vcs-* URLs

- - - - -
721571c8 by Emmanuel Bourg at 2019-09-12T06:53:00Z
Build with the DH sequencer instead of CDBS

- - - - -
d2c7e9e1 by Emmanuel Bourg at 2019-09-12T06:53:15Z
No longer build the applet to fix the build failure with Java 11 (Closes: #915291)

- - - - -
308e5c4c by Emmanuel Bourg at 2019-09-12T07:16:53Z
Wrap and sort

- - - - -
9df02135 by Emmanuel Bourg at 2019-09-12T07:25:01Z
Upload to unstable

- - - - -


7 changed files:

- debian/build.xml
- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- + debian/java3ds-fileloader.poms
- debian/rules


Changes:

=====================================
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
=====================================
@@ -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 <ebourg at apache.org>  Thu, 12 Sep 2019 09:24:49 +0200
+
 java3ds-fileloader (1.2+dfsg-3) unstable; urgency=medium
 
   * Upload to unstable.


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
@@ -3,11 +3,15 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: tony mancill <tmancill at 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/copyright
=====================================
@@ -6,7 +6,7 @@ Source: http://sourceforge.net/projects/java3dsloader/
 Files: *
 Copyright: 2005-2009, Microcrowd <http://www.microcrowd.com/>
 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 @@ Files: debian/*
 Copyright: 2009, Gabriele Giacone <1o5g4r8o at gmail.com>
            2017, tony mancill <tmancill at debian.org>
 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.


=====================================
debian/java3ds-fileloader.poms
=====================================
@@ -0,0 +1 @@
+debian/pom.xml --java-lib --usj-name=java3ds-fileloader --artifact=debian/build/jar/java3ds-fileloader.jar


=====================================
debian/rules
=====================================
@@ -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



View it on GitLab: https://salsa.debian.org/java-team/java3ds-fileloader/compare/fb3ad3b2067c61decbbd8263e762c27f7b48f8e8...9df02135dc66fed6466acdef9992ca16acbf53b0

-- 
View it on GitLab: https://salsa.debian.org/java-team/java3ds-fileloader/compare/fb3ad3b2067c61decbbd8263e762c27f7b48f8e8...9df02135dc66fed6466acdef9992ca16acbf53b0
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190912/763fe312/attachment.html>