[Git][debian-gis-team/jmapviewer][master] 6 commits: New upstream version 2.16+dfsg
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Thu Feb 10 04:56:09 GMT 2022
Bas Couwenberg pushed to branch master at Debian GIS Project / jmapviewer
Commits:
2589e326 by Bas Couwenberg at 2022-02-10T05:48:38+01:00
New upstream version 2.16+dfsg
- - - - -
f8116689 by Bas Couwenberg at 2022-02-10T05:48:40+01:00
Update upstream source from tag 'upstream/2.16+dfsg'
Update to upstream version '2.16+dfsg'
with Debian dir 9227b90f87e95e3e0d8f42577785966e1ed0b234
- - - - -
3ef105d4 by Bas Couwenberg at 2022-02-10T05:48:54+01:00
New upstream release.
- - - - -
a0ff0168 by Bas Couwenberg at 2022-02-10T05:50:30+01:00
Update copyright file.
- - - - -
2ad7ec4b by Bas Couwenberg at 2022-02-10T05:50:53+01:00
Refresh patches.
- - - - -
2743fe9d by Bas Couwenberg at 2022-02-10T05:51:03+01:00
Set distribution to unstable.
- - - - -
7 changed files:
- Readme.txt
- build.xml
- debian/changelog
- debian/copyright
- debian/patches/01-build_less.patch
- debian/patches/03-use-installed-library-in-demo.patch
- src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
Changes:
=====================================
Readme.txt
=====================================
@@ -2,7 +2,7 @@ JMapViewer
(c) 2007, Tim Haussmann
(c) 2008-2012, Jan Peter Stotz
-(c) 2009-2018, Dirk Stöcker
+(c) 2009-2022, Dirk Stöcker
(c) 2009, Stefan Zeller
(c) 2009, Karl Guggisberg
(c) 2009, Dave Hansen
@@ -10,15 +10,15 @@ JMapViewer
(c) 2010-2011, Michael Vigovsky
(c) 2011-2017, Paul Hartmann
(c) 2011-2016, Gleb Smirnoff
-(c) 2011-2021, Vincent Privat
+(c) 2011-2022, Vincent Privat
(c) 2011, Jason Huntley
-(c) 2012-2016, Simon Legner
+(c) 2012-2020, Simon Legner
(c) 2012, Teemu Koskinen
(c) 2012, Jiri Klement
(c) 2013, Matt Hoover
(c) 2013, Alexei Kasatkin
(c) 2013, Galo Higueras
-(c) 2015-2016, Wiktor Niesiobędzki
+(c) 2015-2019, Wiktor Niesiobędzki
(c) 2017, Robert Scott
This work bases partly on the JOSM plugin "Slippy Map Chooser" by Tim Haussmann
=====================================
build.xml
=====================================
@@ -9,14 +9,20 @@
<property name="jacoco.inclnolocationclasses" value="false" />
<!-- For Java specific stuff by version -->
<condition property="isJava9"><matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" /></condition>
- <condition property="isJava10"><matches string="${ant.java.version}" pattern="1[0-9]" /></condition>
- <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]" /></condition>
- <condition property="isJava12"><matches string="${ant.java.version}" pattern="1[2-9]" /></condition>
- <condition property="isJava13"><matches string="${ant.java.version}" pattern="1[3-9]" /></condition>
- <!-- Disable jacoco on Java 13+, see https://github.com/jacoco/jacoco/pull/738 -->
+ <condition property="isJava10"><matches string="${ant.java.version}" pattern="(1|2)[0-9]" /></condition>
+ <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]|[2-9][0-9]" /></condition>
+ <condition property="isJava12"><matches string="${ant.java.version}" pattern="1[2-9]|[2-9][0-9]" /></condition>
+ <condition property="isJava13"><matches string="${ant.java.version}" pattern="1[3-9]|[2-9][0-9]" /></condition>
+ <condition property="isJava14"><matches string="${ant.java.version}" pattern="1[4-9]|[2-9][0-9]" /></condition>
+ <condition property="isJava16"><matches string="${ant.java.version}" pattern="1[6-9]|[2-9][0-9]" /></condition>
+ <condition property="isJava18"><matches string="${ant.java.version}" pattern="1[8-9]|[2-9][0-9]" /></condition>
+ <condition property="isJava19"><matches string="${ant.java.version}" pattern="19|[2-9][0-9]" /></condition>
+ <condition property="isJava20"><matches string="${ant.java.version}" pattern="[2-9][0-9]" /></condition>
+ <condition property="isJava21"><matches string="${ant.java.version}" pattern="2[1-9]|[3-9][0-9]" /></condition>
+ <!-- Disable jacoco on Java 18+, see https://github.com/jacoco/jacoco/pull/1132 -->
<condition property="coverageByDefault">
<not>
- <isset property="isJava13"/>
+ <isset property="isJava18"/>
</not>
</condition>
<path id="test.classpath">
=====================================
debian/changelog
=====================================
@@ -1,9 +1,12 @@
-jmapviewer (2.15+dfsg-2) UNRELEASED; urgency=medium
+jmapviewer (2.16+dfsg-1) unstable; urgency=medium
+ * New upstream release.
* Bump Standards-Version to 4.6.0, no changes.
* Bump debhelper compat to 12, no changes.
+ * Update copyright file.
+ * Refresh patches.
- -- Bas Couwenberg <sebastic at debian.org> Wed, 08 Sep 2021 16:31:54 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 10 Feb 2022 05:50:55 +0100
jmapviewer (2.15+dfsg-1) unstable; urgency=medium
=====================================
debian/copyright
=====================================
@@ -20,12 +20,12 @@ Copyright: 2007, Tim Haussmann
2013, Alexei Kasatkin
2013, Galo Higueras
2011-2016, Gleb Smirnoff
- 2012-2016, Simon Legner
- 2015-2016, Wiktor Niesiobędzki
2011-2017, Paul Hartmann
2017, Robert Scott
- 2009-2018, Dirk Stöcker
- 2011-2021, Vincent Privat
+ 2015-2019, Wiktor Niesiobędzki
+ 2012-2020, Simon Legner
+ 2009-2022, Dirk Stöcker
+ 2011-2022, Vincent Privat
License: GPL-2+
Files: src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java
=====================================
debian/patches/01-build_less.patch
=====================================
@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -26,7 +26,7 @@
+@@ -32,7 +32,7 @@
<pathelement location="bin"/>
</path>
=====================================
debian/patches/03-use-installed-library-in-demo.patch
=====================================
@@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -87,7 +87,7 @@
+@@ -93,7 +93,7 @@
<jar destfile="JMapViewer_Demo.jar" filesetmanifest="mergewithoutmain">
<manifest>
<attribute name="Main-Class" value="org.openstreetmap.gui.jmapviewer.Demo" />
=====================================
src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
=====================================
@@ -53,12 +53,6 @@ public class TemplatedTMSTileSource extends TMSTileSource implements TemplatedTi
private static final Pattern PATTERN_API_KEY = Pattern.compile("\\{apikey\\}");
private static final Pattern PATTERN_PARAM = Pattern.compile("\\{((?:\\d+-)?z(?:oom)?(:?[+-]\\d+)?|x|y|!y|-y|switch:([^}]+))\\}");
- /**
- * Pattern used only for compatibility with older JOSM clients. To remove end of 2020, with an update of JOSM wiki
- * @deprecated to remove end of 2020
- */
- @Deprecated
- private static final Pattern PATTERN_API_KEY_COMPATIBILITY = Pattern.compile("_apiKey_");
// CHECKSTYLE.ON: SingleSpaceSeparator
private static final Pattern[] ALL_PATTERNS = {
@@ -107,10 +101,10 @@ public class TemplatedTMSTileSource extends TMSTileSource implements TemplatedTi
replacePattern((matcher, output) -> {
try {
matcher.appendReplacement(output, FeatureAdapter.retrieveApiKey(imageryId));
- } catch (IOException e) {
+ } catch (IOException | RuntimeException e) {
throw new IllegalArgumentException(e);
}
- }, PATTERN_API_KEY, PATTERN_API_KEY_COMPATIBILITY);
+ }, PATTERN_API_KEY);
}
// Capturing group pattern on zoom values
m = PATTERN_ZOOM.matcher(baseUrl);
View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/-/compare/e5c6803153af88457fd11bbf207850472c95c550...2743fe9d16bc33f51a5ceae9e4fd85458949cd66
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/-/compare/e5c6803153af88457fd11bbf207850472c95c550...2743fe9d16bc33f51a5ceae9e4fd85458949cd66
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/20220210/6de66b65/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list