This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer.
commit fe5510990ad77d08ff64c8ceb5793e22e45d0830 Author: Bas Couwenberg <[email protected]> Date: Mon May 1 18:55:36 2017 +0200 Drop patches included upstream. --- debian/changelog | 1 + debian/patches/series | 5 ---- ...21_Use-visitor-pattern-for-painting-tiles.patch | 15 ---------- ...acency-for-placeholders-loaded-from-cache.patch | 16 ---------- ...vn-r33079_Fix-NarrowingCompoundAssignment.patch | 19 ------------ ...3081_Use-TimeUnit-instead-of-combinations.patch | 16 ---------- ...mmutable-and-cannot-have-non-final-fields.patch | 35 ---------------------- 7 files changed, 1 insertion(+), 106 deletions(-) diff --git a/debian/changelog b/debian/changelog index 018db9c..0621723 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ jmapviewer (2.1+dfsg-1) UNRELEASED; urgency=medium * New upstream release. + * Drop patches included upstream. -- Bas Couwenberg <[email protected]> Mon, 01 May 2017 18:53:57 +0200 diff --git a/debian/patches/series b/debian/patches/series index cdf25aa..32e8c24 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,2 @@ 01-build_less.patch 03-use-installed-library-in-demo.patch -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-r32821_Use-visitor-pattern-for-painting-tiles.patch b/debian/patches/svn-r32821_Use-visitor-pattern-for-painting-tiles.patch deleted file mode 100644 index b95727d..0000000 --- a/debian/patches/svn-r32821_Use-visitor-pattern-for-painting-tiles.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: fix #13222 - Use visitor pattern for painting tiles (patch by michael2402) - gsoc-core -Author: michael2402 -Origin: https://trac.openstreetmap.org/changeset/32821/subversion - ---- a/src/org/openstreetmap/gui/jmapviewer/Tile.java -+++ b/src/org/openstreetmap/gui/jmapviewer/Tile.java -@@ -228,7 +228,7 @@ public class Tile { - } - - /** -- * @return tile indexes as TileXY object -+ * @return tile indexes of the top left corner as TileXY object - */ - public TileXY getTileXY() { - return new TileXY(xtile, ytile); diff --git a/debian/patches/svn-r33034_Use-images-supporting-transpracency-for-placeholders-loaded-from-cache.patch b/debian/patches/svn-r33034_Use-images-supporting-transpracency-for-placeholders-loaded-from-cache.patch deleted file mode 100644 index c3ebd20..0000000 --- a/debian/patches/svn-r33034_Use-images-supporting-transpracency-for-placeholders-loaded-from-cache.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Use images supporting transpracency for placeholders loaded from cache. -Author: wiktorn -Bug: http://josm.openstreetmap.de/intertrac/ticket%3A13778 -Origin: https://trac.openstreetmap.org/changeset/33034/subversion - ---- a/src/org/openstreetmap/gui/jmapviewer/Tile.java -+++ b/src/org/openstreetmap/gui/jmapviewer/Tile.java -@@ -126,7 +126,7 @@ public class Tile { - final CachedCallable<BufferedImage> tmpImage = new CachedCallable<>(new Callable<BufferedImage>() { - @Override - public BufferedImage call() throws Exception { -- return new BufferedImage(source.getTileSize(), source.getTileSize(), BufferedImage.TYPE_INT_RGB); -+ return new BufferedImage(source.getTileSize(), source.getTileSize(), BufferedImage.TYPE_INT_ARGB); - } - }); - diff --git a/debian/patches/svn-r33079_Fix-NarrowingCompoundAssignment.patch b/debian/patches/svn-r33079_Fix-NarrowingCompoundAssignment.patch deleted file mode 100644 index a5a6955..0000000 --- a/debian/patches/svn-r33079_Fix-NarrowingCompoundAssignment.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Fix http://errorprone.info/bugpattern/NarrowingCompoundAssignment -Author: simon04 -Origin: https://trac.openstreetmap.org/changeset/33079/subversion - ---- a/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java -+++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java -@@ -303,10 +303,10 @@ public class BingAerialTileSource extend - char digit = 48; - int mask = 1 << (i - 1); - if ((tilex & mask) != 0) { -- digit += 1; -+ digit += (char) 1; - } - if ((tiley & mask) != 0) { -- digit += 2; -+ digit += (char) 2; - } - k.append(digit); - } diff --git a/debian/patches/svn-r33081_Use-TimeUnit-instead-of-combinations.patch b/debian/patches/svn-r33081_Use-TimeUnit-instead-of-combinations.patch deleted file mode 100644 index 00db724..0000000 --- a/debian/patches/svn-r33081_Use-TimeUnit-instead-of-combinations.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Use TimeUnit instead of combinations of 1000/60/60/24 -Author: simon04 -Bug: http://josm.openstreetmap.de/intertrac/ticket%3A13376 -Origin: https://trac.openstreetmap.org/changeset/33081/subversion - ---- a/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java -+++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java -@@ -243,7 +243,7 @@ public class BingAerialTileSource extend - return r; - } catch (IOException ex) { - System.err.println("Could not connect to Bing API. Will retry in " + waitTimeSec + " seconds."); -- Thread.sleep(waitTimeSec * 1000L); -+ Thread.sleep(TimeUnit.SECONDS.toMillis(waitTimeSec)); - waitTimeSec *= 2; - } - } 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 deleted file mode 100644 index eb77625..0000000 --- a/debian/patches/svn-r33128_enums-should-be-immutable-and-cannot-have-non-final-fields.patch +++ /dev/null @@ -1,35 +0,0 @@ -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
