[Git][java-team/plm][master] 2 commits: Acknoledge Gilles' patch, and update Vcs-Git: and Homepage:

[Martin Quinson]

Martin Quinson pushed to branch master at Debian Java Maintainers / plm


Commits:
dde610c4 by Martin Quinson at 2020-05-17T08:40:46+02:00
Acknoledge Gilles' patch, and update Vcs-Git: and Homepage:

- - - - -
8bf44cb7 by Martin Quinson at 2020-05-17T08:55:01+02:00
Do not hardcode Java 7 in the helper script

openjdk-7 was removed from testing and unstable since 2016-04-15 and I
guess that this package was broken for new installs since then :(

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/plm.sh


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,14 @@
-plm (2.6+repack-3.1) UNRELEASED; urgency=medium
+plm (2.6+repack-4) UNRELEASED; urgency=medium
 
-  * Non-maintainer upload.
-  * Tentative patch to build against json-simple 3
+  [ Gilles Filippini ]
+  * Build against json-simple 2 or 3, depending on what's available.
+    (Closes: #960632).
 
- -- Gilles Filippini <pini at debian.org>  Thu, 14 May 2020 18:05:12 +0200
+  [ Martin Quinson ]
+  * Point vcs-git to salsa, and update upstream homepage.
+  * Java 7 was hardcoded in the launcher script :(
+
+ -- Martin Quinson <mquinson at debian.org>  Sun, 17 May 2020 08:37:53 +0200
 
 plm (2.6+repack-3) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -8,9 +8,8 @@ Build-Depends-Indep: default-jdk, scala, libmiglayout-java, librsyntaxtextarea-j
   jython, libgettext-ant-tasks-java, imagemagick,
   libmockito-java
 Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-java/plm.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/plm.git
-Homepage: http://www.loria.fr/~quinson/Teaching/PLM/
+Vcs-Git: https://salsa.debian.org/java-team/plm.git
+Homepage: http://people.irisa.fr/Martin.Quinson/Teaching/PLM/
 
 Package: plm
 Architecture: all


=====================================
debian/plm.sh
=====================================
@@ -1,6 +1,9 @@
 #!/bin/sh
 #
 #
+
+set -e
+
 . /usr/lib/java-wrappers/java-wrappers.sh
 
 # Jython compiles java bytecode into python bytecode in advance; it needs a user-writable directory to cache it
@@ -15,7 +18,7 @@ if [ -n "$JAVA_CMD" ] && [ "x$JAVA_CMD" != x. ] ; then
 fi	
 
 # We depend on the openjdk runtime 
-find_java_runtime openjdk7
+find_java_runtime
 
 # Request jython and friends.
 # (I'd like to have it used only if found, but this does not work yet: as we build-dep on jython, jh_build adds it to the depends)



View it on GitLab: https://salsa.debian.org/java-team/plm/-/compare/402c61e66a6695250b080a6640bae3b02eabf23d...8bf44cb71ae16787c323f94f5ed5b5bc6e059f6a

-- 
View it on GitLab: https://salsa.debian.org/java-team/plm/-/compare/402c61e66a6695250b080a6640bae3b02eabf23d...8bf44cb71ae16787c323f94f5ed5b5bc6e059f6a
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/20200517/624661fb/attachment.html>