[Git][debian-gis-team/mkgmap][master] 4 commits: New upstream version 0.0.0+svn4807

[Bas Couwenberg (@sebastic)]

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


Commits:
46380fb7 by Bas Couwenberg at 2021-10-01T05:56:15+02:00
New upstream version 0.0.0+svn4807
- - - - -
692436ed by Bas Couwenberg at 2021-10-01T05:56:31+02:00
Update upstream source from tag 'upstream/0.0.0+svn4807'

Update to upstream version '0.0.0+svn4807'
with Debian dir 2031cf8d7b574a95e8828bbd568876c2fe459992
- - - - -
94a0bfa6 by Bas Couwenberg at 2021-10-01T05:58:42+02:00
New upstream SVN snapshot.

- - - - -
2c74ad90 by Bas Couwenberg at 2021-10-01T05:59:13+02:00
Set distribution to unstable.

- - - - -


3 changed files:

- debian/changelog
- resources/mkgmap-version.properties
- src/uk/me/parabola/mkgmap/main/Main.java


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,10 @@
-mkgmap (0.0.0+svn4806-2) UNRELEASED; urgency=medium
+mkgmap (0.0.0+svn4807-1) unstable; urgency=medium
 
+  * New upstream SVN snapshot.
   * Bump Standards-Version to 4.6.0, no changes.
   * Bump debhelper compat to 12, no changes.
 
- -- Bas Couwenberg <sebastic at debian.org>  Wed, 08 Sep 2021 16:41:58 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 01 Oct 2021 05:59:00 +0200
 
 mkgmap (0.0.0+svn4806-1) unstable; urgency=medium
 


=====================================
resources/mkgmap-version.properties
=====================================
@@ -1,2 +1,2 @@
-svn.version: 4806
-build.timestamp: 2021-08-10T09:45:55+0100
+svn.version: 4807
+build.timestamp: 2021-09-14T09:45:24+0100


=====================================
src/uk/me/parabola/mkgmap/main/Main.java
=====================================
@@ -19,11 +19,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
-import java.nio.charset.StandardCharsets;
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryPoolMXBean;
 import java.lang.management.MemoryType;
 import java.lang.management.MemoryUsage;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.time.Duration;
 import java.time.Instant;
@@ -613,7 +613,7 @@ public class Main implements ArgumentProcessor {
 		for (Combiner c : combiners)
 			c.init(args);
 
-		filenames.removeIf(f -> f == null || f.isCancelled());
+		filenames.removeIf(f -> f == null || f.getFilename() == null || f.isCancelled());
 
 		final Map<String, Integer> nameToHex = new HashMap<>();
 		for (FilenameTask f : filenames) {



View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap/-/compare/27398bc376b09a65f4a2427b4156e4cb810a8a80...2c74ad90c3379908f8c4504160529972c2adf792

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap/-/compare/27398bc376b09a65f4a2427b4156e4cb810a8a80...2c74ad90c3379908f8c4504160529972c2adf792
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/20211001/0931478c/attachment-0001.htm>