[Git][java-team/mpj][master] 7 commits: debhelper 12

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Java Maintainers / mpj


Commits:
ed842389 by Andreas Tille at 2019-01-13T08:21:48Z
debhelper 12

- - - - -
a3315c0f by Andreas Tille at 2019-01-13T08:21:52Z
Point Vcs fields to salsa.debian.org

- - - - -
c961beed by Andreas Tille at 2019-01-13T08:21:52Z
Standards-Version: 4.3.0

- - - - -
b21b81a3 by Andreas Tille at 2019-01-13T08:21:52Z
Secure URI in copyright format

- - - - -
e69aaff7 by Andreas Tille at 2019-01-13T08:21:52Z
Remove trailing whitespace in debian/rules

- - - - -
bd2ef030 by Andreas Tille at 2019-01-13T09:24:41Z
Do not parse d/changelog

- - - - -
9ad8ed71 by Andreas Tille at 2019-01-13T10:28:01Z
Spelling, Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- debian/patches/use_debian_packaged_jars.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+mpj (0.44+dfsg-4) unstable; urgency=medium
+
+  * debhelper 12
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.3.0
+  * Secure URI in copyright format
+  * Remove trailing whitespace in debian/rules
+  * Do not parse d/changelog
+
+ -- Andreas Tille <tille at debian.org>  Sun, 13 Jan 2019 10:24:49 +0100
+
 mpj (0.44+dfsg-3) unstable; urgency=medium
 
   * Avoid name space conflict with libopenmpi-java since both packages


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-9
+12


=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Andreas Tille <tille at debian.org>
 Section: java
 Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 12~),
                javahelper,
                default-jdk (>= 1:1.6),
                ant,
@@ -12,9 +12,9 @@ Build-Depends: debhelper (>= 9),
                libcommons-cli-java,
                libcommons-codec-java,
                libcommons-io-java
-Standards-Version: 3.9.8
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/mpj.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/mpj.git
+Standards-Version: 4.3.0
+Vcs-Browser: https://salsa.debian.org/java-team/mpj
+Vcs-Git: https://salsa.debian.org/java-team/mpj.git
 Homepage: http://mpj-express.org/
 
 Package: libmpj-java


=====================================
debian/copyright
=====================================
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: MPJ Express
 Upstream-Contact: mpj-user at lists.reading.ac.uk
 Source: http://sourceforge.net/projects/mpjexpress/files/


=====================================
debian/patches/use_debian_packaged_jars.patch
=====================================
@@ -3,7 +3,7 @@ Last-Update: Thu, 24 Jul 2014 13:53:02 +0200
 Description: Use Debian packaged libraries
  - Set classpath to those Debian JARs which are used
  - Remove jetty from classpath which is actually not used and thus there
-   is no need to worry about its copyright explicitely
+   is no need to worry about its copyright explicitly
 
 --- a/build.xml
 +++ b/build.xml


=====================================
debian/rules
=====================================
@@ -1,7 +1,9 @@
 #!/usr/bin/make -f
 
 JAVA_HOME=/usr/lib/jvm/default-java
-DEBPKGNAME:=lib$(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')-java
+
+include /usr/share/dpkg/default.mk
+DEBPKGNAME:=lib$(DEB_SOURCE)-java
 BINDIR=debian/$(DEBPKGNAME)/usr/bin
 MPJ_HOME=/usr/share/mpj
 LIBDIR=debian/$(DEBPKGNAME)/$(MPJ_HOME)
@@ -41,7 +43,7 @@ override_dh_fixperms:
 #	ant -f test/build.xml
 #
 # Needs more work:
-#   
+#
 #    [javac] /build/mpj-0.44+dfsg/test/build.xml:7: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds
 #    [javac] Compiling 5 source files
 #    [javac] Note: /build/mpj-0.44+dfsg/test/jgf_mpj_benchmarks/jgfutil/JGFInstrumentor.java uses unchecked or unsafe operations.



View it on GitLab: https://salsa.debian.org/java-team/mpj/compare/4482bffebd470ca96966ef2bb7077faacf7387da...9ad8ed719f88b2fa634e208d55b5752d21eff211

-- 
View it on GitLab: https://salsa.debian.org/java-team/mpj/compare/4482bffebd470ca96966ef2bb7077faacf7387da...9ad8ed719f88b2fa634e208d55b5752d21eff211
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/20190113/f760abaa/attachment.html>