This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch jessie-backports in repository jmapviewer.
commit 4a416f6ea086361f37c4cdc5d7b75434050ec827 Merge: c9b046b 6b085eb Author: Bas Couwenberg <[email protected]> Date: Thu Aug 18 10:08:16 2016 +0200 Merge tag 'debian/2.0+dfsg-1' into jessie-backports Conflicts: debian/changelog Readme.txt | 11 ++-- build.xml | 6 +- debian/changelog | 26 ++++++++ debian/control | 4 +- debian/copyright | 15 +++-- debian/jmapviewer.1.xml | 2 +- debian/jmapviewer.lintian-overrides | 3 + debian/source/lintian-overrides | 0 debian/upstream/metadata | 6 +- debian/watch | 2 +- .../gui/jmapviewer/DefaultMapController.java | 18 +++-- src/org/openstreetmap/gui/jmapviewer/Demo.java | 5 +- .../openstreetmap/gui/jmapviewer/JMapViewer.java | 12 ++-- .../gui/jmapviewer/MemoryTileCache.java | 5 ++ src/org/openstreetmap/gui/jmapviewer/Tile.java | 7 ++ src/org/openstreetmap/gui/jmapviewer/TileXY.java | 10 +-- .../gui/jmapviewer/events/JMVCommandEvent.java | 4 -- .../jmapviewer/interfaces/TileLoaderListener.java | 4 ++ src/org/openstreetmap/gui/jmapviewer/package.html | 2 +- .../tilesources/AbstractMapQuestTileSource.java | 66 ------------------- .../tilesources/MapQuestOpenAerialTileSource.java | 23 ------- .../tilesources/MapQuestOsmTileSource.java | 19 ------ .../jmapviewer/tilesources/ScanexTileSource.java | 76 ++++++++++++++++++++-- 23 files changed, 165 insertions(+), 161 deletions(-) diff --cc debian/changelog index 67d5539,2691e7b..f7436c2 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,29 +1,35 @@@ + jmapviewer (2.0+dfsg-1) unstable; urgency=medium + + * Move from experimental to unstable. + + -- Bas Couwenberg <[email protected]> Fri, 12 Aug 2016 13:36:31 +0200 + + jmapviewer (2.0+dfsg-1~exp1) experimental; urgency=medium + + * New upstream release. + - switch to Java 8 + * Update JDK & JRE dependencies to require at least version 1.8. + * Update copyright file, changes: + - Update copyright years for several copyright holders + - Add Wiktor Niesiobędzki to copyright holders + * Switch more URLs to HTTPS. + * Add lintian override for incompatible-java-bytecode-format. + + -- Bas Couwenberg <[email protected]> Mon, 08 Aug 2016 10:04:50 +0200 + + jmapviewer (1.18+dfsg-1~exp1) experimental; urgency=medium + + * New upstream release. + - Remove MapQuest Open + + -- Bas Couwenberg <[email protected]> Tue, 19 Jul 2016 01:52:01 +0200 + +jmapviewer (1.17+dfsg-1~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + + -- Bas Couwenberg <[email protected]> Sun, 17 Jul 2016 19:17:08 +0200 + jmapviewer (1.17+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 _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
