[Git][debian-gis-team/mkgmap][master] 5 commits: Add openjdk-11 to JAVA_CMDS list.

[Bas Couwenberg]

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


Commits:
0271e13c by Bas Couwenberg at 2018-11-01T06:28:51Z
Add openjdk-11 to JAVA_CMDS list.

- - - - -
75df9f40 by Bas Couwenberg at 2018-11-01T07:48:11Z
New upstream version 0.0.0+svn4245
- - - - -
00dd1fd6 by Bas Couwenberg at 2018-11-01T07:48:16Z
Merge tag 'upstream/0.0.0+svn4245'

Upstream version 0.0.0+svn4245

- - - - -
3a91c544 by Bas Couwenberg at 2018-11-01T07:48:33Z
New upstream SVN snapshot.

- - - - -
2ded6c77 by Bas Couwenberg at 2018-11-01T07:49:24Z
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- debian/mkgmap.sh
- resources/mkgmap-version.properties
- src/uk/me/parabola/mkgmap/reader/osm/SeaGenerator.java


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+mkgmap (0.0.0+svn4245-1) unstable; urgency=medium
+
+  * New upstream SVN snapshot.
+  * Add openjdk-11 to JAVA_CMDS list.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 01 Nov 2018 08:49:11 +0100
+
 mkgmap (0.0.0+svn4244-1) unstable; urgency=medium
 
   * New upstream SVN snapshot.


=====================================
debian/mkgmap.sh
=====================================
@@ -9,6 +9,7 @@ ALTERNATIVE_JDK="`readlink -n -f /etc/alternatives/java`"
 ARCH="`dpkg --print-architecture`"
 
 JAVA_CMDS="$JAVA_HOME/bin/java"
+JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java"
 JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk-$ARCH/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"


=====================================
resources/mkgmap-version.properties
=====================================
@@ -1,2 +1,2 @@
-svn.version: 4244
-build.timestamp: 2018-09-24T08:38:12+0100
+svn.version: 4245
+build.timestamp: 2018-10-19T06:22:23+0100


=====================================
src/uk/me/parabola/mkgmap/reader/osm/SeaGenerator.java
=====================================
@@ -462,6 +462,7 @@ public class SeaGenerator extends OsmReadingHooksAdaptor {
 			// add a copy of this way to be able to draw it as a shape
 			Way shapeWay = new Way(way.getOriginalId(), way.getPoints());
 			shapeWay.setFakeId();
+			shapeWay.copyTags(way);
 			// change the tag so that only special rules looking for it are firing
 			shapeWay.deleteTag("natural"); 
 			shapeWay.addTag("mkgmap:removed_natural",naturalVal); 



View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap/compare/d2e760dbbd37f46f800d1d2a887bc85d48e2bf55...2ded6c77c3fe5acd626d39d375f9da5f684cb7a4

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap/compare/d2e760dbbd37f46f800d1d2a887bc85d48e2bf55...2ded6c77c3fe5acd626d39d375f9da5f684cb7a4
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-grass-devel/attachments/20181102/7d22c449/attachment-0001.html>