[Git][debian-gis-team/jmapviewer][bookworm-backports] 6 commits: New upstream version 2.22+dfsg
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Thu Sep 5 04:33:11 BST 2024
Bas Couwenberg pushed to branch bookworm-backports at Debian GIS Project / jmapviewer
Commits:
f1be1d32 by Bas Couwenberg at 2024-08-30T17:24:41+02:00
New upstream version 2.22+dfsg
- - - - -
db2e7b1b by Bas Couwenberg at 2024-08-30T17:24:41+02:00
Update upstream source from tag 'upstream/2.22+dfsg'
Update to upstream version '2.22+dfsg'
with Debian dir ddaa24a3e9002ddd54adfc948dd03b047254a08d
- - - - -
db7adc6d by Bas Couwenberg at 2024-08-30T17:24:54+02:00
New upstream release.
- - - - -
ea7063c0 by Bas Couwenberg at 2024-08-30T17:25:50+02:00
Set distribution to unstable.
- - - - -
9c8e2e6c by Bas Couwenberg at 2024-09-05T05:24:38+02:00
Merge tag 'debian/2.22+dfsg-1' into bookworm-backports
releasing package jmapviewer version 2.22+dfsg-1
- - - - -
0df0d081 by Bas Couwenberg at 2024-09-05T05:24:46+02:00
Rebuild for bookworm-backports.
- - - - -
3 changed files:
- debian/changelog
- src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
- − src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java.rej
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+jmapviewer (2.22+dfsg-1~bpo12+1) bookworm-backports; urgency=medium
+
+ * Rebuild for bookworm-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 05 Sep 2024 05:24:41 +0200
+
+jmapviewer (2.22+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 30 Aug 2024 17:25:39 +0200
+
jmapviewer (2.21+dfsg-1~bpo12+1) bookworm-backports; urgency=medium
* Rebuild for bookworm-backports.
=====================================
src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
=====================================
@@ -273,7 +273,7 @@ public class BingAerialTileSource extends TMSTileSource {
List<Attribution> r = parseAttributionText(xml);
LOG.log(Level.FINE, "Successfully loaded Bing attribution data.");
return r;
- } catch (IOException ex) {
+ } catch (IllegalArgumentException | IOException ex) {
LOG.log(Level.SEVERE, String.format("Could not connect to Bing API. Will retry in %d seconds.", waitTimeSec));
LOG.log(Level.FINE, ex.getMessage(), ex);
Thread.sleep(TimeUnit.SECONDS.toMillis(waitTimeSec));
=====================================
src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java.rej deleted
=====================================
@@ -1,25 +0,0 @@
-@@ -286,14 +286,16 @@
- }
- }
- }
-- try {
-- return attributions.get();
-- } catch (ExecutionException ex) {
-- throw new JMapViewerRuntimeException(ex);
-- } catch (InterruptedException ign) {
-- LOG.log(Level.SEVERE, "InterruptedException: {0}", ign.getMessage());
-- LOG.log(Level.FINE, ign.getMessage(), ign);
-- Thread.currentThread().interrupt();
-+ if (attributions.isDone()) {
-+ try {
-+ return attributions.get();
-+ } catch (ExecutionException ex) {
-+ throw new JMapViewerRuntimeException(ex);
-+ } catch (InterruptedException ign) {
-+ LOG.log(Level.SEVERE, "InterruptedException: {0}", ign.getMessage());
-+ LOG.log(Level.FINE, ign.getMessage(), ign);
-+ Thread.currentThread().interrupt();
-+ }
- }
- return null;
- }
View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/-/compare/d79058a4778be273915b689352b3707d3832c9f2...0df0d0815f44a3c6a82291a999ac9950e8d26d5a
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/-/compare/d79058a4778be273915b689352b3707d3832c9f2...0df0d0815f44a3c6a82291a999ac9950e8d26d5a
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/20240905/c9a55543/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list