[jmapviewer] 01/02: Merge tag 'debian/1.17+dfsg-1' into jessie-backports
Bas Couwenberg
sebastic at debian.org
Mon Jul 18 10:18:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository jmapviewer.
commit cfed09254d164723b7a6b66be32391131d40e2cc
Merge: aeaec37 d2febe3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Jul 17 19:16:59 2016 +0200
Merge tag 'debian/1.17+dfsg-1' into jessie-backports
Conflicts:
debian/changelog
debian/changelog | 8 ++++++++
debian/control | 1 +
src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java | 3 ++-
src/org/openstreetmap/gui/jmapviewer/Demo.java | 2 +-
src/org/openstreetmap/gui/jmapviewer/OsmMercator.java | 2 +-
src/org/openstreetmap/gui/jmapviewer/Tile.java | 4 ++++
.../gui/jmapviewer/tilesources/ScanexTileSource.java | 4 ----
.../gui/jmapviewer/tilesources/TemplatedTMSTileSource.java | 6 +++---
8 files changed, 20 insertions(+), 10 deletions(-)
diff --cc debian/changelog
index db6a1d9,898a4a1..df0e467
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,18 @@@
+ jmapviewer (1.17+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Add Breaks: freeplane (<< 1.3.15-3~) to jmapviewer package,
+ those older versions lack support for the current JMapviewer API.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 11 Jul 2016 16:50:48 +0200
+
+jmapviewer (1.16+dfsg-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Update branch in gbp.conf & Vcs-Git URL.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 19 Jun 2016 21:21:30 +0200
+
jmapviewer (1.16+dfsg-1) unstable; urgency=medium
* New upstream release.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git
More information about the Pkg-grass-devel
mailing list