[Git][debian-gis-team/mkgmap-splitter][master] 5 commits: Update watch file to fix filenamemangle.

[Bas Couwenberg (@sebastic)]

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


Commits:
cff08c96 by Bas Couwenberg at 2021-09-01T05:45:57+02:00
Update watch file to fix filenamemangle.

- - - - -
7b278101 by Bas Couwenberg at 2021-09-01T05:47:10+02:00
New upstream version 0.0.0+svn642
- - - - -
a3faa7af by Bas Couwenberg at 2021-09-01T05:47:13+02:00
Update upstream source from tag 'upstream/0.0.0+svn642'

Update to upstream version '0.0.0+svn642'
with Debian dir 4c520815740e335954459a9d84c431727d330b97
- - - - -
8f43f3e8 by Bas Couwenberg at 2021-09-01T05:47:47+02:00
New upstream SVN snapshot.

- - - - -
e4279199 by Bas Couwenberg at 2021-09-01T05:49:58+02:00
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- debian/watch
- resources/splitter-version.properties
- src/org/openstreetmap/osmosis/core/filter/common/PolygonFileReader.java


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+mkgmap-splitter (0.0.0+svn642-1) unstable; urgency=medium
+
+  * New upstream SVN snapshot.
+  * Update watch file to fix filenamemangle.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 01 Sep 2021 05:49:46 +0200
+
 mkgmap-splitter (0.0.0+svn615-2) unstable; urgency=medium
 
   * No-change rebuild for source-only upload.


=====================================
debian/watch
=====================================
@@ -2,6 +2,6 @@ version=4
 opts=\
 uversionmangle=s/(\d+)/0.0.0+svn$1/,\
 downloadurlmangle=s/\.zip/-src.tar.gz/,\
-filenamemangle=s/\/download\/splitter-r([\d]+)\.zip/splitter-r$1-src.tar.gz/ \
+filenamemangle=s/.*\/download\/splitter-r([\d]+)\.zip/splitter-r$1-src.tar.gz/ \
 https://www.mkgmap.org.uk/download/splitter.html \
 (?:.*)/download/splitter-r([\d]+).zip


=====================================
resources/splitter-version.properties
=====================================
@@ -1,2 +1,2 @@
-svn.version: 615
-build.timestamp: 2021-06-30T10:03:46+0100
+svn.version: 642
+build.timestamp: 2021-08-10T14:31:18+0100


=====================================
src/org/openstreetmap/osmosis/core/filter/common/PolygonFileReader.java
=====================================
@@ -252,9 +252,11 @@ public class PolygonFileReader {
 		if (beginPoint != null) {
 			polygonPath.moveTo(beginPoint[0], beginPoint[1]);
 		}
-		
 		// Convert the path into an area and return.
-		return new Area(polygonPath);
+		Area area = new Area(polygonPath);
+		if (!area.isSingular())
+			throw new OsmosisRuntimeException("Invalid polygon ring in polygon-file, possibly self-intersecting");
+		return area;
 	}
 	
 	



View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap-splitter/-/compare/404b6870ea75e5e94caafeb19763b21adac1356c...e42791991c201669d448f6085c5fa10081552c2b

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap-splitter/-/compare/404b6870ea75e5e94caafeb19763b21adac1356c...e42791991c201669d448f6085c5fa10081552c2b
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/20210901/0dbf0493/attachment-0001.htm>