Bas Couwenberg pushed to branch master at Debian GIS Project / mkgmapgui

Commits:
1ca7082d by Bas Couwenberg at 2018-04-01T11:58:42+02:00
Add openjdk-9 to JAVA_CMDS list.

- - - - -
86dc7062 by Bas Couwenberg at 2018-04-01T11:59:53+02:00
Update watch file to use HTTPS.

- - - - -
932bd715 by Bas Couwenberg at 2018-04-01T12:08:11+02:00
Add autopkgtest to test installability.

- - - - -
42f740fc by Bas Couwenberg at 2018-04-01T12:08:11+02:00
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- debian/mkgmapgui.sh
- + debian/tests/control
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,15 @@
-mkgmapgui (1.1.ds-7) UNRELEASED; urgency=medium
+mkgmapgui (1.1.ds-7) unstable; urgency=medium
 
   * Change priority from extra to optional.
   * Bump Standards-Version to 4.1.3, changes: priority.
   * Strip trailing whitespace from control file.
   * Update copyright-format URL to use HTTPS.
   * Update Vcs-* URLs for Salsa.
+  * Add openjdk-9 to JAVA_CMDS list.
+  * Update watch file to use HTTPS.
+  * Add autopkgtest to test installability.
 
- -- Mònica Ramírez Arceda <mon...@debian.org>  Sun, 24 Sep 2017 13:11:31 +0200
+ -- Bas Couwenberg <sebas...@debian.org>  Sun, 01 Apr 2018 12:00:04 +0200
 
 mkgmapgui (1.1.ds-6) unstable; urgency=medium
 


=====================================
debian/mkgmapgui.sh
=====================================
--- a/debian/mkgmapgui.sh
+++ b/debian/mkgmapgui.sh
@@ -12,6 +12,7 @@ ARCH="`dpkg --print-architecture`"
 # If OpenJDK is only available headless, do not try it
 if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then
    JAVA_CMDS="$JAVA_HOME/bin/java"
+   JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java"
    JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java"
    JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java"
    JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-6-openjdk/bin/java 
/usr/lib/jvm/java-6-openjdk-$ARCH/bin/java /usr/lib/jvm/java-6-sun/bin/java"


=====================================
debian/tests/control
=====================================
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,3 @@
+# Test installability
+Depends: @
+Test-Command: /bin/true


=====================================
debian/watch
=====================================
--- a/debian/watch
+++ b/debian/watch
@@ -3,5 +3,5 @@ opts=\
 dversionmangle=s/[\+\.](debian|dfsg|ds|deb)\d*$//,\
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
 repacksuffix=.ds \
-http://activityworkshop.net/software/mkgmapgui/ \
+https://activityworkshop.net/software/mkgmapgui/ \
 mkgmapgui_(\d.*?)\.jar



View it on GitLab: 
https://salsa.debian.org/debian-gis-team/mkgmapgui/compare/f58c5e24f5cb02c110c5559922a6376ac236f9eb...42f740fc4daea151a8e5a093230b0888adf2c71f

---
View it on GitLab: 
https://salsa.debian.org/debian-gis-team/mkgmapgui/compare/f58c5e24f5cb02c110c5559922a6376ac236f9eb...42f740fc4daea151a8e5a093230b0888adf2c71f
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to