[Git][debian-gis-team/jmapviewer][master] 5 commits: New upstream version 2.7+dfsg

[Bas Couwenberg]

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


Commits:
ea1ae726 by Bas Couwenberg at 2018-03-26T07:37:45+02:00
New upstream version 2.7+dfsg
- - - - -
55931765 by Bas Couwenberg at 2018-03-26T07:37:47+02:00
Merge tag 'upstream/2.7+dfsg'

Upstream version 2.7+dfsg

- - - - -
5d1cc67d by Bas Couwenberg at 2018-03-26T07:38:06+02:00
New upstream release.

- - - - -
cbd507a1 by Bas Couwenberg at 2018-03-26T07:39:30+02:00
Add lintian override for vcs-deprecated-in-debian-infrastructure.

- - - - -
5f3954ff by Bas Couwenberg at 2018-03-26T07:39:42+02:00
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- + debian/source/lintian-overrides
- src/org/openstreetmap/gui/jmapviewer/Coordinate.java
- src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jmapviewer (2.7+dfsg-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Add lintian override for vcs-deprecated-in-debian-infrastructure.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 26 Mar 2018 07:39:33 +0200
+
 jmapviewer (2.6+dfsg-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/source/lintian-overrides
=====================================
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,3 @@
+# Package not officially migrated to Salsa yet.
+jmapviewer source: vcs-deprecated-in-debian-infrastructure * https://anonscm.debian.org/*
+


=====================================
src/org/openstreetmap/gui/jmapviewer/Coordinate.java
=====================================
--- a/src/org/openstreetmap/gui/jmapviewer/Coordinate.java
+++ b/src/org/openstreetmap/gui/jmapviewer/Coordinate.java
@@ -11,7 +11,7 @@ import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
 
 /**
  * This class encapsulates a Point2D.Double and provide access
- * via <tt>lat</tt> and <tt>lon</tt>.
+ * via <code>lat</code> and <code>lon</code>.
  *
  * @author Jan Peter Stotz
  *


=====================================
src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
=====================================
--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
+++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
@@ -161,9 +161,7 @@ public class BingAerialTileSource extends TMSTileSource {
         } catch (SAXException e) {
             System.err.println("Could not parse Bing aerials attribution metadata.");
             e.printStackTrace();
-        } catch (ParserConfigurationException e) {
-            e.printStackTrace();
-        } catch (XPathExpressionException e) {
+        } catch (ParserConfigurationException | XPathExpressionException | NumberFormatException e) {
             e.printStackTrace();
         }
         return null;
@@ -216,7 +214,7 @@ public class BingAerialTileSource extends TMSTileSource {
 
     @Override
     public String getAttributionImageURL() {
-        return "http://opengeodata.org/microsoft-imagery-details";
+        return "https://opengeodata.org/microsoft-imagery-details";
     }
 
     @Override
@@ -226,7 +224,7 @@ public class BingAerialTileSource extends TMSTileSource {
 
     @Override
     public String getTermsOfUseURL() {
-        return "http://opengeodata.org/microsoft-imagery-details";
+        return "https://opengeodata.org/microsoft-imagery-details";
     }
 
     protected Callable<List<Attribution>> getAttributionLoaderCallable() {



View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/compare/7dbb7b6e719312f2f80ebf4ae2585c15714b288e...5f3954ff7e1df4986f9cabbe045e4302e528f7ec

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/compare/7dbb7b6e719312f2f80ebf4ae2585c15714b288e...5f3954ff7e1df4986f9cabbe045e4302e528f7ec
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180326/4d1130f7/attachment-0001.html>