This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer.
commit 0f9a1bd62235af303c8fe7ef2a62b1bd2380049d Author: Bas Couwenberg <[email protected]> Date: Tue Jan 31 07:36:49 2017 +0100 Add patch from upstream SVN repository. --- debian/changelog | 6 ++++ debian/patches/series | 1 + ...mmutable-and-cannot-have-non-final-fields.patch | 35 ++++++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/debian/changelog b/debian/changelog index d780a77..3548f6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +jmapviewer (2.0+dfsg-3) UNRELEASED; urgency=medium + + * Add patch from upstream SVN repository. + + -- Bas Couwenberg <[email protected]> Tue, 31 Jan 2017 07:36:28 +0100 + jmapviewer (2.0+dfsg-2) unstable; urgency=medium * Include epoch in default-jdk version requirement. diff --git a/debian/patches/series b/debian/patches/series index 4cb61d5..cdf25aa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ svn-r32821_Use-visitor-pattern-for-painting-tiles.patch svn-r33034_Use-images-supporting-transpracency-for-placeholders-loaded-from-cache.patch svn-r33079_Fix-NarrowingCompoundAssignment.patch svn-r33081_Use-TimeUnit-instead-of-combinations.patch +svn-r33128_enums-should-be-immutable-and-cannot-have-non-final-fields.patch diff --git a/debian/patches/svn-r33128_enums-should-be-immutable-and-cannot-have-non-final-fields.patch b/debian/patches/svn-r33128_enums-should-be-immutable-and-cannot-have-non-final-fields.patch new file mode 100644 index 0000000..eb77625 --- /dev/null +++ b/debian/patches/svn-r33128_enums-should-be-immutable-and-cannot-have-non-final-fields.patch @@ -0,0 +1,35 @@ +Description: error-prone - enums should be immutable, and cannot have non-final fields +Author: donvip +Origin: https://trac.openstreetmap.org/changeset/33128/subversion + +--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java ++++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java +@@ -29,8 +29,8 @@ public class ScanexTileSource extends TM + IRS("irs", "/TileSender.ashx?ModeKey=tile&MapName=F7B8CF651682420FA1749D894C8AD0F6&LayerName=BAC78D764F0443BD9AF93E7A998C9F5B"), + SPOT("spot", "/TileSender.ashx?ModeKey=tile&MapName=F7B8CF651682420FA1749D894C8AD0F6&LayerName=F51CE95441284AF6B2FC319B609C7DEC"); + +- private String name; +- private String uri; ++ private final String name; ++ private final String uri; + + ScanexLayer(String name, String uri) { + this.name = name; +@@ -124,7 +124,7 @@ public class ScanexTileSource extends TM + @Override + public ICoordinate xyToLatLon(int x, int y, int zoom) { + return new Coordinate( +- tileYToLat((double) y, zoom), ++ tileYToLat(y, zoom), + osmMercator.xToLon(x, zoom) + ); + } +@@ -140,7 +140,7 @@ public class ScanexTileSource extends TM + @Override + public ICoordinate tileXYToLatLon(int x, int y, int zoom) { + return new Coordinate( +- tileYToLat((double) y, zoom), ++ tileYToLat(y, zoom), + osmMercator.xToLon(x * getTileSize(), zoom) + ); + } -- 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
