[jmapviewer] annotated tag upstream/1.11+dfsg created (now faf2062)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/1.11+dfsg in repository jmapviewer. at faf2062 (tag) tagging 37824042229b2c8adc494283042d069ed9d63c58 (commit) replaces upstream/1.10+dfsg tagged by Bas Couwenberg on Fri Oct 9 10:37:59 2015 +0200 - Log - Upstream version 1.11+dfsg Bas Couwenberg (1): Imported Upstream version 1.11+dfsg --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processing of jmapviewer_1.11+dfsg-1~exp1_amd64.changes
jmapviewer_1.11+dfsg-1~exp1_amd64.changes uploaded successfully to localhost along with the files: jmapviewer_1.11+dfsg-1~exp1.dsc jmapviewer_1.11+dfsg.orig.tar.gz jmapviewer_1.11+dfsg-1~exp1.debian.tar.xz jmapviewer_1.11+dfsg-1~exp1_all.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] branch master updated (cd7695b -> 56af69e)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository jmapviewer. from cd7695b Fix upstream version extraction from changelog. new 346f2a4 Imported Upstream version 1.09+dfsg new 85ed565 Merge tag 'upstream/1.09+dfsg' new 4fdb8d2 Imported Upstream version 1.10+dfsg new 1ac3034 Merge tag 'upstream/1.10+dfsg' new 3782404 Imported Upstream version 1.11+dfsg new a00ca5e Merge tag 'upstream/1.11+dfsg' new db3838f New upstream release. new 9df0547 Update Vcs-Browser URL to use HTTPS. new 812dc4c Remove reference to removed patch from README.Debian. new 82a5ce2 Refresh patches. new 44997ff Enable parallel builds. new ad688e1 Drop unused lintian override for incompatible-java-bytecode-format. new 56af69e Set distribution to experimental. The 13 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: build.xml | 48 - debian/README.Debian | 1 - debian/changelog | 8 + debian/control | 2 +- debian/jmapviewer.lintian-overrides| 2 - debian/patches/01-build_less.patch | 3 +- .../patches/03-use-installed-library-in-demo.patch | 3 +- debian/rules | 2 +- .../gui/jmapviewer/AbstractLayer.java | 51 +++-- .../gui/jmapviewer/AttributionSupport.java | 4 +- .../openstreetmap/gui/jmapviewer/Coordinate.java | 8 +- .../gui/jmapviewer/DefaultMapController.java | 25 ++- src/org/openstreetmap/gui/jmapviewer/Demo.java | 60 +++--- .../gui/jmapviewer/FeatureAdapter.java | 22 ++- .../openstreetmap/gui/jmapviewer/JMapViewer.java | 220 +++-- .../gui/jmapviewer/JMapViewerTree.java | 86 +--- .../gui/jmapviewer/JobDispatcher.java | 176 - src/org/openstreetmap/gui/jmapviewer/Layer.java| 23 ++- .../openstreetmap/gui/jmapviewer/LayerGroup.java | 46 +++-- .../gui/jmapviewer/MapMarkerCircle.java| 90 +++-- .../openstreetmap/gui/jmapviewer/MapMarkerDot.java | 10 +- .../gui/jmapviewer/MapObjectImpl.java | 58 -- .../gui/jmapviewer/MapPolygonImpl.java | 17 +- .../gui/jmapviewer/MapRectangleImpl.java | 14 +- .../gui/jmapviewer/MemoryTileCache.java| 49 +++-- .../openstreetmap/gui/jmapviewer/OsmMercator.java | 87 +--- .../gui/jmapviewer/OsmTileLoader.java | 160 +-- src/org/openstreetmap/gui/jmapviewer/Style.java| 21 +- src/org/openstreetmap/gui/jmapviewer/Tile.java | 198 +++ .../gui/jmapviewer/TileController.java | 11 +- src/org/openstreetmap/gui/jmapviewer/TileXY.java | 57 ++ .../jmapviewer/checkBoxTree/CheckBoxNodeData.java | 12 +- .../checkBoxTree/CheckBoxNodeEditor.java | 9 +- .../jmapviewer/checkBoxTree/CheckBoxNodePanel.java | 12 +- .../checkBoxTree/CheckBoxNodeRenderer.java | 56 +++--- .../gui/jmapviewer/checkBoxTree/CheckBoxTree.java | 148 -- .../gui/jmapviewer/events/JMVCommandEvent.java | 2 +- .../gui/jmapviewer/interfaces/Attributed.java | 4 +- .../jmapviewer/interfaces/CachedTileLoader.java| 2 +- .../gui/jmapviewer/interfaces/ICoordinate.java | 12 +- .../interfaces/JMapViewerEventListener.java| 2 +- .../gui/jmapviewer/interfaces/MapMarker.java | 26 ++- .../gui/jmapviewer/interfaces/MapObject.java | 29 ++- .../gui/jmapviewer/interfaces/MapPolygon.java | 20 +- .../gui/jmapviewer/interfaces/MapRectangle.java| 6 +- .../jmapviewer/interfaces/TemplatedTileSource.java | 18 ++ .../gui/jmapviewer/interfaces/TileCache.java | 8 +- .../jmapviewer/interfaces/TileClearController.java | 2 +- .../gui/jmapviewer/interfaces/TileJob.java | 8 +- .../gui/jmapviewer/interfaces/TileLoader.java | 8 +- .../jmapviewer/interfaces/TileLoaderListener.java | 2 +- .../gui/jmapviewer/interfaces/TileSource.java | 188 +++--- src/org/openstreetmap/gui/jmapviewer/package.html | 4 +- .../tilesources/AbstractMapQuestTileSource.java| 9 +- .../tilesources/AbstractOsmTileSource.java | 12 +- .../tilesources/AbstractTMSTileSource.java | 183 ++--- .../jmapviewer/tilesources/AbstractTileSource.java | 13 +- .../tilesources/BingAerialTileSource.java | 67 --- .../tilesources/MapQuestOpenAerialTileSource.java | 4 +-
[jmapviewer] 05/13: Imported Upstream version 1.11+dfsg
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer. commit 37824042229b2c8adc494283042d069ed9d63c58 Author: Bas CouwenbergDate: Fri Oct 9 10:37:59 2015 +0200 Imported Upstream version 1.11+dfsg --- build.xml | 2 +- .../openstreetmap/gui/jmapviewer/JMapViewer.java | 36 ++-- .../gui/jmapviewer/JobDispatcher.java | 183 - .../gui/jmapviewer/OsmTileLoader.java | 10 +- src/org/openstreetmap/gui/jmapviewer/Tile.java | 11 +- .../gui/jmapviewer/TileController.java | 9 +- .../gui/jmapviewer/events/JMVCommandEvent.java | 2 +- .../gui/jmapviewer/interfaces/TileLoader.java | 6 + .../gui/jmapviewer/interfaces/TileSource.java | 114 - .../tilesources/AbstractMapQuestTileSource.java| 9 +- .../tilesources/AbstractTMSTileSource.java | 40 - .../tilesources/BingAerialTileSource.java | 13 +- .../gui/jmapviewer/tilesources/OsmTileSource.java | 10 -- .../jmapviewer/tilesources/ScanexTileSource.java | 23 --- .../gui/jmapviewer/tilesources/TMSTileSource.java | 5 - 15 files changed, 50 insertions(+), 423 deletions(-) diff --git a/build.xml b/build.xml index 573115e..49c98c4 100644 --- a/build.xml +++ b/build.xml @@ -77,7 +77,7 @@ + classpath="tools/checkstyle/checkstyle-6.11-all.jar"/> diff --git a/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java b/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java index b3d1fc5..8602f33 100644 --- a/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java +++ b/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java @@ -81,7 +81,7 @@ public class JMapViewer extends JPanel implements TileLoaderListener { protected JButton zoomInButton; protected JButton zoomOutButton; -public static enum ZOOM_BUTTON_STYLE { +public enum ZOOM_BUTTON_STYLE { HORIZONTAL, VERTICAL } @@ -102,17 +102,26 @@ public class JMapViewer extends JPanel implements TileLoaderListener { * retrieving the tiles. */ public JMapViewer() { -this(new MemoryTileCache(), 8); +this(new MemoryTileCache()); new DefaultMapController(this); } /** * Creates a new {@link JMapViewer} instance. * @param tileCache The cache where to store tiles - * @param downloadThreadCount The number of parallel threads for retrieving the tiles + * @deprecated @param downloadThreadCount not used anymore */ +@Deprecated public JMapViewer(TileCache tileCache, int downloadThreadCount) { -JobDispatcher.setMaxWorkers(downloadThreadCount); +this(tileCache); +} + +/** + * Creates a new {@link JMapViewer} instance. + * @param tileCache The cache where to store tiles + * + */ +public JMapViewer(TileCache tileCache) { tileSource = new OsmTileSource.Mapnik(); tileController = new TileController(tileSource, tileCache, this); mapMarkerList = Collections.synchronizedList(new LinkedList()); @@ -456,25 +465,6 @@ public class JMapViewer extends JPanel implements TileLoaderListener { /** * Calculates the position on the map of a given coordinate * - * @param lat Latitude - * @param offset Offset respect Latitude - * @param checkOutside check if the point is outside the displayed area - * @return Integer the radius in pixels - * @deprecated use {@link #getLatOffset(double, double, double, boolean)} - */ -@Deprecated -public Integer getLatOffset(double lat, double offset, boolean checkOutside) { -int y = tileSource.latToY(lat + offset, zoom); -y -= center.y - getHeight() / 2; -if (checkOutside && (y < 0 || y > getHeight())) { -return null; -} -return y; -} - -/** - * Calculates the position on the map of a given coordinate - * * @param marker MapMarker object that define the x,y coordinate * @param p coordinate * @return Integer the radius in pixels diff --git a/src/org/openstreetmap/gui/jmapviewer/JobDispatcher.java b/src/org/openstreetmap/gui/jmapviewer/JobDispatcher.java deleted file mode 100644 index e689151..000 --- a/src/org/openstreetmap/gui/jmapviewer/JobDispatcher.java +++ /dev/null @@ -1,183 +0,0 @@ -// License: GPL. For details, see Readme.txt file. -package org.openstreetmap.gui.jmapviewer; - -import java.util.concurrent.BlockingDeque; -import java.util.concurrent.LinkedBlockingDeque; -import java.util.concurrent.TimeUnit; - -import org.openstreetmap.gui.jmapviewer.interfaces.TileJob; - -/** - * A generic class that processes a list of {@link Runnable} one-by-one using - * one or more {@link Thread}-instances. The number of instances varies between - * 1
[jmapviewer] 13/13: Set distribution to experimental.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer. commit 56af69ed51e667d87e795ee252f63ab4375572f3 Author: Bas CouwenbergDate: Fri Oct 9 10:54:05 2015 +0200 Set distribution to experimental. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 898128e..ef95b5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -jmapviewer (1.11+dfsg-1) UNRELEASED; urgency=medium +jmapviewer (1.11+dfsg-1~exp1) experimental; urgency=medium * New upstream release. * Update Vcs-Browser URL to use HTTPS. * Enable parallel builds. - -- Bas Couwenberg Fri, 09 Oct 2015 10:38:04 +0200 + -- Bas Couwenberg Fri, 09 Oct 2015 10:53:46 +0200 jmapviewer (1.08+dfsg-1~exp1) experimental; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] 02/03: pristine-tar data for jmapviewer_1.10+dfsg.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository jmapviewer. commit 394fa78e48ab5d20dd257697474d4042be4f9910 Author: Bas CouwenbergDate: Fri Oct 9 10:37:54 2015 +0200 pristine-tar data for jmapviewer_1.10+dfsg.orig.tar.gz --- jmapviewer_1.10+dfsg.orig.tar.gz.delta | Bin 0 -> 62889 bytes jmapviewer_1.10+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/jmapviewer_1.10+dfsg.orig.tar.gz.delta b/jmapviewer_1.10+dfsg.orig.tar.gz.delta new file mode 100644 index 000..6067b18 Binary files /dev/null and b/jmapviewer_1.10+dfsg.orig.tar.gz.delta differ diff --git a/jmapviewer_1.10+dfsg.orig.tar.gz.id b/jmapviewer_1.10+dfsg.orig.tar.gz.id new file mode 100644 index 000..04b704c --- /dev/null +++ b/jmapviewer_1.10+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +22d23e85b61c0051389abf95dd76b6b649f1b23f -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] branch upstream updated (9cc6595 -> 3782404)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository jmapviewer. from 9cc6595 Imported Upstream version 1.08+dfsg new 346f2a4 Imported Upstream version 1.09+dfsg new 4fdb8d2 Imported Upstream version 1.10+dfsg new 3782404 Imported Upstream version 1.11+dfsg The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: build.xml | 48 - .../gui/jmapviewer/AbstractLayer.java | 51 +++-- .../gui/jmapviewer/AttributionSupport.java | 4 +- .../openstreetmap/gui/jmapviewer/Coordinate.java | 8 +- .../gui/jmapviewer/DefaultMapController.java | 25 ++- src/org/openstreetmap/gui/jmapviewer/Demo.java | 60 +++--- .../gui/jmapviewer/FeatureAdapter.java | 22 ++- .../openstreetmap/gui/jmapviewer/JMapViewer.java | 220 +++-- .../gui/jmapviewer/JMapViewerTree.java | 86 +--- .../gui/jmapviewer/JobDispatcher.java | 176 - src/org/openstreetmap/gui/jmapviewer/Layer.java| 23 ++- .../openstreetmap/gui/jmapviewer/LayerGroup.java | 46 +++-- .../gui/jmapviewer/MapMarkerCircle.java| 90 +++-- .../openstreetmap/gui/jmapviewer/MapMarkerDot.java | 10 +- .../gui/jmapviewer/MapObjectImpl.java | 58 -- .../gui/jmapviewer/MapPolygonImpl.java | 17 +- .../gui/jmapviewer/MapRectangleImpl.java | 14 +- .../gui/jmapviewer/MemoryTileCache.java| 49 +++-- .../openstreetmap/gui/jmapviewer/OsmMercator.java | 87 +--- .../gui/jmapviewer/OsmTileLoader.java | 160 +-- src/org/openstreetmap/gui/jmapviewer/Style.java| 21 +- src/org/openstreetmap/gui/jmapviewer/Tile.java | 198 +++ .../gui/jmapviewer/TileController.java | 11 +- src/org/openstreetmap/gui/jmapviewer/TileXY.java | 57 ++ .../jmapviewer/checkBoxTree/CheckBoxNodeData.java | 12 +- .../checkBoxTree/CheckBoxNodeEditor.java | 9 +- .../jmapviewer/checkBoxTree/CheckBoxNodePanel.java | 12 +- .../checkBoxTree/CheckBoxNodeRenderer.java | 56 +++--- .../gui/jmapviewer/checkBoxTree/CheckBoxTree.java | 148 -- .../gui/jmapviewer/events/JMVCommandEvent.java | 2 +- .../gui/jmapviewer/interfaces/Attributed.java | 4 +- .../jmapviewer/interfaces/CachedTileLoader.java| 2 +- .../gui/jmapviewer/interfaces/ICoordinate.java | 12 +- .../interfaces/JMapViewerEventListener.java| 2 +- .../gui/jmapviewer/interfaces/MapMarker.java | 26 ++- .../gui/jmapviewer/interfaces/MapObject.java | 29 ++- .../gui/jmapviewer/interfaces/MapPolygon.java | 20 +- .../gui/jmapviewer/interfaces/MapRectangle.java| 6 +- .../jmapviewer/interfaces/TemplatedTileSource.java | 18 ++ .../gui/jmapviewer/interfaces/TileCache.java | 8 +- .../jmapviewer/interfaces/TileClearController.java | 2 +- .../gui/jmapviewer/interfaces/TileJob.java | 8 +- .../gui/jmapviewer/interfaces/TileLoader.java | 8 +- .../jmapviewer/interfaces/TileLoaderListener.java | 2 +- .../gui/jmapviewer/interfaces/TileSource.java | 188 +++--- src/org/openstreetmap/gui/jmapviewer/package.html | 4 +- .../tilesources/AbstractMapQuestTileSource.java| 9 +- .../tilesources/AbstractOsmTileSource.java | 12 +- .../tilesources/AbstractTMSTileSource.java | 183 ++--- .../jmapviewer/tilesources/AbstractTileSource.java | 13 +- .../tilesources/BingAerialTileSource.java | 67 --- .../tilesources/MapQuestOpenAerialTileSource.java | 4 +- .../tilesources/MapQuestOsmTileSource.java | 6 +- .../gui/jmapviewer/tilesources/OsmTileSource.java | 29 +-- .../jmapviewer/tilesources/ScanexTileSource.java | 128 +--- .../gui/jmapviewer/tilesources/TMSTileSource.java | 19 +- .../tilesources/TemplatedTMSTileSource.java| 109 ++ .../gui/jmapviewer/tilesources/TileSourceInfo.java | 178 + 58 files changed, 1820 insertions(+), 1056 deletions(-) delete mode 100644 src/org/openstreetmap/gui/jmapviewer/JobDispatcher.java create mode 100644 src/org/openstreetmap/gui/jmapviewer/TileXY.java create mode 100644 src/org/openstreetmap/gui/jmapviewer/interfaces/TemplatedTileSource.java create mode 100644 src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org
[jmapviewer] 10/13: Refresh patches.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer. commit 82a5ce25caa1678b8c649b001994559cadf150b9 Author: Bas CouwenbergDate: Fri Oct 9 10:53:39 2015 +0200 Refresh patches. --- debian/patches/01-build_less.patch| 3 ++- debian/patches/03-use-installed-library-in-demo.patch | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/patches/01-build_less.patch b/debian/patches/01-build_less.patch index 946860b..17eed95 100644 --- a/debian/patches/01-build_less.patch +++ b/debian/patches/01-build_less.patch @@ -5,13 +5,14 @@ Last-Update: 2011-11-19 Adjustment to the ant build.xml file. Only building the components required for this Debian package. + --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ -- +- + diff --git a/debian/patches/03-use-installed-library-in-demo.patch b/debian/patches/03-use-installed-library-in-demo.patch index 62c24a9..f6c56d0 100644 --- a/debian/patches/03-use-installed-library-in-demo.patch +++ b/debian/patches/03-use-installed-library-in-demo.patch @@ -5,6 +5,7 @@ Last-Update: 2013-03-15 Adjustment to the ant build.xml file. Using the system wide jmapviewer.jar library for the JMapViewer_Demo application. + --- a/build.xml +++ b/build.xml @@ -50,7 +50,7 @@ @@ -12,7 +13,7 @@ library for the JMapViewer_Demo application. - -+ ++ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] 01/13: Imported Upstream version 1.09+dfsg
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer. commit 346f2a4261a089fcc2ea7cd90d2e804a3d3cf4eb Author: Bas CouwenbergDate: Fri Oct 9 10:37:46 2015 +0200 Imported Upstream version 1.09+dfsg --- .../openstreetmap/gui/jmapviewer/JMapViewer.java | 2 +- .../openstreetmap/gui/jmapviewer/OsmMercator.java | 60 ++--- .../gui/jmapviewer/OsmTileLoader.java | 14 +- src/org/openstreetmap/gui/jmapviewer/Tile.java | 50 ++- .../gui/jmapviewer/interfaces/TileJob.java | 6 + .../gui/jmapviewer/interfaces/TileSource.java | 25 +++- src/org/openstreetmap/gui/jmapviewer/package.html | 2 +- .../tilesources/AbstractOsmTileSource.java | 6 +- .../tilesources/AbstractTMSTileSource.java | 77 --- .../jmapviewer/tilesources/AbstractTileSource.java | 8 +- .../tilesources/BingAerialTileSource.java | 9 +- .../jmapviewer/tilesources/ScanexTileSource.java | 10 +- .../gui/jmapviewer/tilesources/TMSTileSource.java | 14 +- .../tilesources/TemplatedTMSTileSource.java| 22 +--- .../gui/jmapviewer/tilesources/TileSourceInfo.java | 143 + 15 files changed, 369 insertions(+), 79 deletions(-) diff --git a/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java b/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java index b1aa19f..e70ca00 100644 --- a/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java +++ b/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java @@ -584,7 +584,7 @@ public class JMapViewer extends JPanel implements TileLoaderListener { tile = tileController.getTile(tilex, tiley, zoom); } if (tile != null) { -tile.paint(g, posx, posy); +tile.paint(g, posx, posy, tilesize, tilesize); if (tileGridVisible) { g.drawRect(posx, posy, tilesize, tilesize); } diff --git a/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java b/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java index f0a7bcd..0556783 100644 --- a/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java +++ b/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java @@ -10,31 +10,59 @@ package org.openstreetmap.gui.jmapviewer; */ public class OsmMercator { -public static int TILE_SIZE = 256; +/** + * default tile size + */ +public static int DEFAUL_TILE_SIZE = 256; +/** maximum latitude (north) for mercator display */ public static final double MAX_LAT = 85.05112877980659; +/** minimum latitude (south) for mercator display */ public static final double MIN_LAT = -85.05112877980659; -private static double EARTH_RADIUS = 6378137; // equatorial earth radius for EPSG:3857 (Mercator) +/** equatorial earth radius for EPSG:3857 (Mercator) */ +private static double EARTH_RADIUS = 6378137; + +/** + * instance with tile size of 256 for easy conversions + */ +public static final OsmMercator MERCATOR_256 = new OsmMercator(); + +/** tile size of the displayed tiles */ +private int tileSize = DEFAUL_TILE_SIZE; + +/** + * Creates instance with default tile size of 256 + */ +public OsmMercator() { +} + +/** + * Creates instance with provided tile size. + * @param tileSize + */ +public OsmMercator(int tileSize) { +this.tileSize = tileSize; +} -public static double radius(int aZoomlevel) { -return (TILE_SIZE * (1 << aZoomlevel)) / (2.0 * Math.PI); +public double radius(int aZoomlevel) { +return (tileSize * (1 << aZoomlevel)) / (2.0 * Math.PI); } /** * Returns the absolut number of pixels in y or x, defined as: 2^Zoomlevel * - * TILE_WIDTH where TILE_WIDTH is the width of a tile in pixels + * tileSize where tileSize is the width of a tile in pixels * * @param aZoomlevel zoom level to request pixel data * @return number of pixels */ -public static int getMaxPixels(int aZoomlevel) { -return TILE_SIZE * (1 << aZoomlevel); +public int getMaxPixels(int aZoomlevel) { +return tileSize * (1 << aZoomlevel); } -public static int falseEasting(int aZoomlevel) { +public int falseEasting(int aZoomlevel) { return getMaxPixels(aZoomlevel) / 2; } -public static int falseNorthing(int aZoomlevel) { +public int falseNorthing(int aZoomlevel) { return (-1 * getMaxPixels(aZoomlevel) / 2); } @@ -50,7 +78,7 @@ public class OsmMercator { * @return the distance * @author Jason Huntley */ -public static double getDistance(int x1, int y1, int x2, int y2, int zoomLevel) { +public double getDistance(int x1, int y1, int x2, int y2, int zoomLevel) {
[jmapviewer] 03/03: pristine-tar data for jmapviewer_1.11+dfsg.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository jmapviewer. commit 18cb8e1dc4379d41136c4deabdcbe9c749ed4acf Author: Bas CouwenbergDate: Fri Oct 9 10:37:59 2015 +0200 pristine-tar data for jmapviewer_1.11+dfsg.orig.tar.gz --- jmapviewer_1.11+dfsg.orig.tar.gz.delta | Bin 0 -> 48239 bytes jmapviewer_1.11+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/jmapviewer_1.11+dfsg.orig.tar.gz.delta b/jmapviewer_1.11+dfsg.orig.tar.gz.delta new file mode 100644 index 000..bb0cb09 Binary files /dev/null and b/jmapviewer_1.11+dfsg.orig.tar.gz.delta differ diff --git a/jmapviewer_1.11+dfsg.orig.tar.gz.id b/jmapviewer_1.11+dfsg.orig.tar.gz.id new file mode 100644 index 000..8923faf --- /dev/null +++ b/jmapviewer_1.11+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +1b09ada9466928a5f8afbc3f8b02fb995c7caa02 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] annotated tag upstream/1.10+dfsg created (now 5deebcd)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/1.10+dfsg in repository jmapviewer. at 5deebcd (tag) tagging 4fdb8d2e186233ed9139b22b78937e244615cc9b (commit) replaces upstream/1.09+dfsg tagged by Bas Couwenberg on Fri Oct 9 10:37:54 2015 +0200 - Log - Upstream version 1.10+dfsg Bas Couwenberg (1): Imported Upstream version 1.10+dfsg --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] 11/13: Enable parallel builds.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer. commit 44997ff78946a1e3d6b4e4cb959aa5978eec23d7 Author: Bas CouwenbergDate: Fri Oct 9 10:56:33 2015 +0200 Enable parallel builds. --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 99ed522..898128e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ jmapviewer (1.11+dfsg-1) UNRELEASED; urgency=medium * New upstream release. * Update Vcs-Browser URL to use HTTPS. + * Enable parallel builds. -- Bas Couwenberg Fri, 09 Oct 2015 10:38:04 +0200 diff --git a/debian/rules b/debian/rules index 3e37384..c2aa347 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://') %: - dh $@ + dh $@ --parallel override_dh_auto_clean: rm -rf $(CURDIR)/bin/* -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] 08/13: Update Vcs-Browser URL to use HTTPS.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer. commit 9df0547956ef743f0bf8a7f35c0ca2fed0344965 Author: Bas CouwenbergDate: Fri Oct 9 10:44:15 2015 +0200 Update Vcs-Browser URL to use HTTPS. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6c75e44..99ed522 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ jmapviewer (1.11+dfsg-1) UNRELEASED; urgency=medium * New upstream release. + * Update Vcs-Browser URL to use HTTPS. -- Bas Couwenberg Fri, 09 Oct 2015 10:38:04 +0200 diff --git a/debian/control b/debian/control index ea9583a..0dbc4a8 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9~), docbook-xml, xsltproc Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/jmapviewer.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/jmapviewer.git Vcs-Git: git://anonscm.debian.org/pkg-grass/jmapviewer.git Homepage: https://wiki.openstreetmap.org/wiki/JMapViewer -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] 06/13: Merge tag 'upstream/1.11+dfsg'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer. commit a00ca5ee57902e0e3c15ad892207726c60d62c8c Merge: 1ac3034 3782404 Author: Bas CouwenbergDate: Fri Oct 9 10:37:59 2015 +0200 Merge tag 'upstream/1.11+dfsg' Upstream version 1.11+dfsg build.xml | 2 +- .../openstreetmap/gui/jmapviewer/JMapViewer.java | 36 ++-- .../gui/jmapviewer/JobDispatcher.java | 183 - .../gui/jmapviewer/OsmTileLoader.java | 10 +- src/org/openstreetmap/gui/jmapviewer/Tile.java | 11 +- .../gui/jmapviewer/TileController.java | 9 +- .../gui/jmapviewer/events/JMVCommandEvent.java | 2 +- .../gui/jmapviewer/interfaces/TileLoader.java | 6 + .../gui/jmapviewer/interfaces/TileSource.java | 114 - .../tilesources/AbstractMapQuestTileSource.java| 9 +- .../tilesources/AbstractTMSTileSource.java | 40 - .../tilesources/BingAerialTileSource.java | 13 +- .../gui/jmapviewer/tilesources/OsmTileSource.java | 10 -- .../jmapviewer/tilesources/ScanexTileSource.java | 23 --- .../gui/jmapviewer/tilesources/TMSTileSource.java | 5 - 15 files changed, 50 insertions(+), 423 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] annotated tag upstream/1.09+dfsg created (now afa9b22)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/1.09+dfsg in repository jmapviewer. at afa9b22 (tag) tagging 346f2a4261a089fcc2ea7cd90d2e804a3d3cf4eb (commit) replaces upstream/1.08+dfsg tagged by Bas Couwenberg on Fri Oct 9 10:37:47 2015 +0200 - Log - Upstream version 1.09+dfsg Bas Couwenberg (1): Imported Upstream version 1.09+dfsg --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] branch pristine-tar updated (33f762a -> 18cb8e1)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository jmapviewer. from 33f762a pristine-tar data for jmapviewer_1.08+dfsg.orig.tar.gz new 9de441c pristine-tar data for jmapviewer_1.09+dfsg.orig.tar.gz new 394fa78 pristine-tar data for jmapviewer_1.10+dfsg.orig.tar.gz new 18cb8e1 pristine-tar data for jmapviewer_1.11+dfsg.orig.tar.gz The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: jmapviewer_1.09+dfsg.orig.tar.gz.delta | Bin 0 -> 45246 bytes jmapviewer_1.09+dfsg.orig.tar.gz.id| 1 + jmapviewer_1.10+dfsg.orig.tar.gz.delta | Bin 0 -> 62889 bytes jmapviewer_1.10+dfsg.orig.tar.gz.id| 1 + jmapviewer_1.11+dfsg.orig.tar.gz.delta | Bin 0 -> 48239 bytes jmapviewer_1.11+dfsg.orig.tar.gz.id| 1 + 6 files changed, 3 insertions(+) create mode 100644 jmapviewer_1.09+dfsg.orig.tar.gz.delta create mode 100644 jmapviewer_1.09+dfsg.orig.tar.gz.id create mode 100644 jmapviewer_1.10+dfsg.orig.tar.gz.delta create mode 100644 jmapviewer_1.10+dfsg.orig.tar.gz.id create mode 100644 jmapviewer_1.11+dfsg.orig.tar.gz.delta create mode 100644 jmapviewer_1.11+dfsg.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] 01/03: pristine-tar data for jmapviewer_1.09+dfsg.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository jmapviewer. commit 9de441c8c7906fe5490ed63535c4bb3a7b691281 Author: Bas CouwenbergDate: Fri Oct 9 10:37:47 2015 +0200 pristine-tar data for jmapviewer_1.09+dfsg.orig.tar.gz --- jmapviewer_1.09+dfsg.orig.tar.gz.delta | Bin 0 -> 45246 bytes jmapviewer_1.09+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/jmapviewer_1.09+dfsg.orig.tar.gz.delta b/jmapviewer_1.09+dfsg.orig.tar.gz.delta new file mode 100644 index 000..19360cb Binary files /dev/null and b/jmapviewer_1.09+dfsg.orig.tar.gz.delta differ diff --git a/jmapviewer_1.09+dfsg.orig.tar.gz.id b/jmapviewer_1.09+dfsg.orig.tar.gz.id new file mode 100644 index 000..b928e7d --- /dev/null +++ b/jmapviewer_1.09+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +61324306949dc7b2f0b2e32fcd2576991e0f0577 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] 07/13: New upstream release.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer. commit db3838fb1e7b94ed9d4105981f66aa51e692897d Author: Bas CouwenbergDate: Fri Oct 9 10:43:46 2015 +0200 New upstream release. --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4ff3c61..6c75e44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +jmapviewer (1.11+dfsg-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Bas Couwenberg Fri, 09 Oct 2015 10:38:04 +0200 + jmapviewer (1.08+dfsg-1~exp1) experimental; 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 Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] 04/13: Merge tag 'upstream/1.10+dfsg'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer. commit 1ac303443b092d456064716eee4f4edae30b8f88 Merge: 85ed565 4fdb8d2 Author: Bas CouwenbergDate: Fri Oct 9 10:37:54 2015 +0200 Merge tag 'upstream/1.10+dfsg' Upstream version 1.10+dfsg build.xml | 48 - .../gui/jmapviewer/AbstractLayer.java | 51 +++-- .../gui/jmapviewer/AttributionSupport.java | 4 +- .../openstreetmap/gui/jmapviewer/Coordinate.java | 8 +- .../gui/jmapviewer/DefaultMapController.java | 25 ++- src/org/openstreetmap/gui/jmapviewer/Demo.java | 60 +++--- .../gui/jmapviewer/FeatureAdapter.java | 22 ++- .../openstreetmap/gui/jmapviewer/JMapViewer.java | 210 - .../gui/jmapviewer/JMapViewerTree.java | 86 + .../gui/jmapviewer/JobDispatcher.java | 69 --- src/org/openstreetmap/gui/jmapviewer/Layer.java| 23 ++- .../openstreetmap/gui/jmapviewer/LayerGroup.java | 46 +++-- .../gui/jmapviewer/MapMarkerCircle.java| 90 +++-- .../openstreetmap/gui/jmapviewer/MapMarkerDot.java | 10 +- .../gui/jmapviewer/MapObjectImpl.java | 58 -- .../gui/jmapviewer/MapPolygonImpl.java | 17 +- .../gui/jmapviewer/MapRectangleImpl.java | 14 +- .../gui/jmapviewer/MemoryTileCache.java| 49 +++-- .../openstreetmap/gui/jmapviewer/OsmMercator.java | 39 ++-- .../gui/jmapviewer/OsmTileLoader.java | 164 +--- src/org/openstreetmap/gui/jmapviewer/Style.java| 21 ++- src/org/openstreetmap/gui/jmapviewer/Tile.java | 141 ++ .../gui/jmapviewer/TileController.java | 4 +- src/org/openstreetmap/gui/jmapviewer/TileXY.java | 57 ++ .../jmapviewer/checkBoxTree/CheckBoxNodeData.java | 12 +- .../checkBoxTree/CheckBoxNodeEditor.java | 9 +- .../jmapviewer/checkBoxTree/CheckBoxNodePanel.java | 12 +- .../checkBoxTree/CheckBoxNodeRenderer.java | 56 +++--- .../gui/jmapviewer/checkBoxTree/CheckBoxTree.java | 148 +-- .../gui/jmapviewer/interfaces/Attributed.java | 4 +- .../jmapviewer/interfaces/CachedTileLoader.java| 2 +- .../gui/jmapviewer/interfaces/ICoordinate.java | 12 +- .../interfaces/JMapViewerEventListener.java| 2 +- .../gui/jmapviewer/interfaces/MapMarker.java | 26 ++- .../gui/jmapviewer/interfaces/MapObject.java | 29 ++- .../gui/jmapviewer/interfaces/MapPolygon.java | 20 +- .../gui/jmapviewer/interfaces/MapRectangle.java| 6 +- .../jmapviewer/interfaces/TemplatedTileSource.java | 18 ++ .../gui/jmapviewer/interfaces/TileCache.java | 8 +- .../jmapviewer/interfaces/TileClearController.java | 2 +- .../gui/jmapviewer/interfaces/TileJob.java | 4 +- .../gui/jmapviewer/interfaces/TileLoader.java | 2 +- .../jmapviewer/interfaces/TileLoaderListener.java | 2 +- .../gui/jmapviewer/interfaces/TileSource.java | 175 +++-- src/org/openstreetmap/gui/jmapviewer/package.html | 2 +- .../tilesources/AbstractOsmTileSource.java | 8 +- .../tilesources/AbstractTMSTileSource.java | 158 ++-- .../jmapviewer/tilesources/AbstractTileSource.java | 7 +- .../tilesources/BingAerialTileSource.java | 51 +++-- .../tilesources/MapQuestOpenAerialTileSource.java | 4 +- .../tilesources/MapQuestOsmTileSource.java | 6 +- .../gui/jmapviewer/tilesources/OsmTileSource.java | 21 +-- .../jmapviewer/tilesources/ScanexTileSource.java | 109 ++- .../tilesources/TemplatedTMSTileSource.java| 87 +++-- .../gui/jmapviewer/tilesources/TileSourceInfo.java | 79 +--- 55 files changed, 1622 insertions(+), 775 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] 09/13: Remove reference to removed patch from README.Debian.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer. commit 812dc4c725a5173e316f8765415584a0080a7081 Author: Bas CouwenbergDate: Fri Oct 9 10:47:04 2015 +0200 Remove reference to removed patch from README.Debian. --- debian/README.Debian | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/README.Debian b/debian/README.Debian index 77f0235..5c67c93 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -8,6 +8,5 @@ the GPL, but the Bing logo is most likely not. In order not to require the inclusion of the bing_maps.png file in the jmapviewer package, the image is downloaded using the URL provided in the BrandLogoUri attribute of the attribution response. -(see patches/04-bing-logo.patch for details) -- Felix Natter Tue, 21 Oct 2014 20:29:00 +0100 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] 12/13: Drop unused lintian override for incompatible-java-bytecode-format.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer. commit ad688e1a9357b50e3aba588629c4a87a98488568 Author: Bas CouwenbergDate: Fri Oct 9 11:24:59 2015 +0200 Drop unused lintian override for incompatible-java-bytecode-format. --- debian/jmapviewer.lintian-overrides | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/jmapviewer.lintian-overrides b/debian/jmapviewer.lintian-overrides index ba06a40..3a255fa 100644 --- a/debian/jmapviewer.lintian-overrides +++ b/debian/jmapviewer.lintian-overrides @@ -1,5 +1,3 @@ # this is a convenience jar for /usr/bin/jmapviewer which only contains Main-Class and Class-Path jmapviewer binary: codeless-jar usr/share/jmapviewer/JMapViewer_Demo.jar -# OpenJDK 7 is required -jmapviewer: incompatible-java-bytecode-format Java7 version (Class format: 51) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] 02/13: Merge tag 'upstream/1.09+dfsg'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer. commit 85ed565f7745fb4358c1272bfcc45d4509cd66a7 Merge: cd7695b 346f2a4 Author: Bas CouwenbergDate: Fri Oct 9 10:37:47 2015 +0200 Merge tag 'upstream/1.09+dfsg' Upstream version 1.09+dfsg .../openstreetmap/gui/jmapviewer/JMapViewer.java | 2 +- .../openstreetmap/gui/jmapviewer/OsmMercator.java | 60 ++--- .../gui/jmapviewer/OsmTileLoader.java | 14 +- src/org/openstreetmap/gui/jmapviewer/Tile.java | 50 ++- .../gui/jmapviewer/interfaces/TileJob.java | 6 + .../gui/jmapviewer/interfaces/TileSource.java | 25 +++- src/org/openstreetmap/gui/jmapviewer/package.html | 2 +- .../tilesources/AbstractOsmTileSource.java | 6 +- .../tilesources/AbstractTMSTileSource.java | 77 --- .../jmapviewer/tilesources/AbstractTileSource.java | 8 +- .../tilesources/BingAerialTileSource.java | 9 +- .../jmapviewer/tilesources/ScanexTileSource.java | 10 +- .../gui/jmapviewer/tilesources/TMSTileSource.java | 14 +- .../tilesources/TemplatedTMSTileSource.java| 22 +--- .../gui/jmapviewer/tilesources/TileSourceInfo.java | 143 + 15 files changed, 369 insertions(+), 79 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] tag debian/1.11+dfsg-1.exp1 created (now 56af69e)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/1.11+dfsg-1.exp1 in repository jmapviewer. at 56af69e (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
jmapviewer_1.11+dfsg-1~exp1_amd64.changes ACCEPTED into experimental
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Fri, 09 Oct 2015 10:53:46 +0200 Source: jmapviewer Binary: jmapviewer Architecture: source all Version: 1.11+dfsg-1~exp1 Distribution: experimental Urgency: medium Maintainer: Debian GIS ProjectChanged-By: Bas Couwenberg Description: jmapviewer - Java OpenStreetMap Tile Viewer Changes: jmapviewer (1.11+dfsg-1~exp1) experimental; urgency=medium . * New upstream release. * Update Vcs-Browser URL to use HTTPS. * Enable parallel builds. Checksums-Sha1: e6320d2588e13961adbf361690848deae5d9d79a 2127 jmapviewer_1.11+dfsg-1~exp1.dsc bc4f6853b3ea969e61c5d550c294ae4ce3558e41 65692 jmapviewer_1.11+dfsg.orig.tar.gz 8fd416543fff24a4e45d5019c8ca5b7aec617aa7 6860 jmapviewer_1.11+dfsg-1~exp1.debian.tar.xz d03f53374364eb45a770b15aa53eac925653db7f 130628 jmapviewer_1.11+dfsg-1~exp1_all.deb Checksums-Sha256: 94bc97024735c33adbb2b0ba49fd96c99b4ba3f14c702fc00db6ba1c6a866d40 2127 jmapviewer_1.11+dfsg-1~exp1.dsc 07642aaa1fb1fe15ce6d584ed8bf28ed9dcb05ca15c354256992707d5cffb85b 65692 jmapviewer_1.11+dfsg.orig.tar.gz bf50f35a8ccba108456f87acbf9d325cbe30a48104b8688f28da471d5d0b8da3 6860 jmapviewer_1.11+dfsg-1~exp1.debian.tar.xz 72676a1d2dc86f7b95a5cfafe0c2945f27f780dff6fa9f228af2cdd65db88ece 130628 jmapviewer_1.11+dfsg-1~exp1_all.deb Files: c9f6273eece352ea475205b27cfcf4f9 2127 utils optional jmapviewer_1.11+dfsg-1~exp1.dsc e900522ecfde4902874a0d3d5fbfa4e8 65692 utils optional jmapviewer_1.11+dfsg.orig.tar.gz 992ea6bf6ebf7f114a9de63d0b867e96 6860 utils optional jmapviewer_1.11+dfsg-1~exp1.debian.tar.xz 23fb5d64f165bd488466f399d6bdd612 130628 utils optional jmapviewer_1.11+dfsg-1~exp1_all.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJWF4t/AAoJEGdQ8QrojUrxGcIQALfUc2SGcRIsHSbaX9mcm7E6 TsJ8K1SB6W9dDSKWE4CrkIAMO3k2Ht5k3OhX2O1KVgCM3m6f6Wf2C3P9sOhLE0BW iGg+lC/2mISvLnfXMtWz4bDwR4wYCmScyl1gu36XukluJoBPCkXnq1HfCKLu+cNd GqcTjhzUZdefVbF0qNe5e0HJ5Ebq3sOCm48PGoIBbtyTSr2RRNG8rMmZbeT+3eKf YvODfBNjdPS3AhHbViA7RwN/mJz8jx7rxuT4yzQYesU7gzY05ccCbgUMwlVD2AX2 fs8q3fvDuym4J0oWdMdfAgdoxwf0o4fNSVimdJxF4m/e93Ph4J/0xk3QgiF/Z45J 55Ini30pNUC++Rj6f0A5wLP+wQ/2QnG2EPBR6QgzZPvxtGBsdUCzP0KZviU6j+bv t7ImnwBXcbzL/F2ltBuWqLxrq3s0nZr/18EI6LUFAlHPr1GKxSQ7kCPSsR1oERia TckHNGUp4xKjbcz3seTg+agKjFsYFAJQoe3mXB2AGeRRA12XBFMquv5iuxSme0+j 2q1DOACtxCO5OuyE+wFT/u6SNeoA4xpLzSWhJvyuhlbcIdYhRMhfVCE+aTFwoSlL LawfjyPvvbtuPWcS9OHmOswtEd+WkYCf7BB9Q+XY4eycQjlOH2Q5o2GLsyPJcTpq q5V2O/8vrEOlXVoOKT7I =bn58 -END PGP SIGNATURE- Thank you for your contribution to Debian. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] branch master updated (df91478 -> b626fb1)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository josm-plugins. from df91478 Move from experimental to unstable. new fa9c814 Update SVN URLs to use HTTPS. new 2bc6a04 Imported Upstream version 0.0.svn31608+ds1 new dc6f548 Merge tag 'upstream/0.0.svn31608+ds1' new 8696dcc New upstream SVN snapshot. new 37f7291 Bump JOSM dependency to 8800. new 6c997c7 Update Vcs-Browser & Homepage URLs to use HTTPS. new eb51a30 Mark patches as Forwarded: not-needed. new f3a0019 Enable parallel builds. new 1408bfe Update copyright file. new 0cc9511 Drop obsolete README.source. new b4746e7 Drop unused lintian overrides. new b626fb1 Set distribution to experimental. The 12 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: build-common.xml | 24 - debian/README.source | 5 debian/changelog | 16 +++ debian/control | 12 - debian/copyright | 25 - debian/josm-plugins.lintian-overrides | 2 -- debian/patches/00-fix_build-common.patch | 11 debian/patches/150_routing.diff| 7 +++-- debian/rules | 6 ++--- measurement/build.xml | 1 + .../plugins/measurement/MeasurementDialog.java | 31 +- svn-info.xml | 17 ++-- 12 files changed, 104 insertions(+), 53 deletions(-) delete mode 100644 debian/README.source delete mode 100644 debian/josm-plugins.lintian-overrides -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 04/12: New upstream SVN snapshot.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm-plugins. commit 8696dcca69b52abc5cd2bf6875c6698829796191 Author: Bas CouwenbergDate: Sat Oct 10 00:23:24 2015 +0200 New upstream SVN snapshot. --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6b7356d..bebe56c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -josm-plugins (0.0.svn31107+ds1-2) UNRELEASED; urgency=medium +josm-plugins (0.0.svn31608+ds1-1) UNRELEASED; urgency=medium + * New upstream SVN snapshot. * Update SVN URLs to use HTTPS. - -- Bas Couwenberg Sat, 10 Oct 2015 00:19:24 +0200 + -- Bas Couwenberg Sat, 10 Oct 2015 00:23:02 +0200 josm-plugins (0.0.svn31107+ds1-1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 07/12: Mark patches as Forwarded: not-needed.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm-plugins. commit eb51a3062df07b083195f883f7cdf1845d9bf70d Author: Bas CouwenbergDate: Sat Oct 10 00:35:45 2015 +0200 Mark patches as Forwarded: not-needed. --- debian/patches/00-fix_build-common.patch | 11 +-- debian/patches/150_routing.diff | 7 +++ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/debian/patches/00-fix_build-common.patch b/debian/patches/00-fix_build-common.patch index 9b09b2d..dfe5eec 100644 --- a/debian/patches/00-fix_build-common.patch +++ b/debian/patches/00-fix_build-common.patch @@ -1,7 +1,6 @@ -From: David Paleino -Subject: fix build-common.xml -Origin: vendor -Forwarded: no +Description: fix build-common.xml +Author: David Paleino +Forwarded: not-needed --- build-common.xml | 13 ++--- @@ -16,7 +15,7 @@ Forwarded: no - + - + @@ -20,7 +20,7 @@ @@ -27,7 +26,7 @@ Forwarded: no -@@ -251,10 +251,13 @@ +@@ -263,10 +263,13 @@ diff --git a/debian/patches/150_routing.diff b/debian/patches/150_routing.diff index 18aea51..37bbe4c 100644 --- a/debian/patches/150_routing.diff +++ b/debian/patches/150_routing.diff @@ -1,7 +1,6 @@ -From: David Paleino -Subject: Fix buildfile for routing plugin -Origin: vendor -Forwarded: no +Description: Fix buildfile for routing plugin +Author: David Paleino +Forwarded: not-needed --- routing/build.xml | 16 +--- -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 12/12: Set distribution to experimental.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm-plugins. commit b626fb1a2bd0837874232c87ccfaf545efa5d9a7 Author: Bas CouwenbergDate: Sat Oct 10 01:04:08 2015 +0200 Set distribution to experimental. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3b25974..d159bce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -josm-plugins (0.0.svn31608+ds1-1) UNRELEASED; urgency=medium +josm-plugins (0.0.svn31608+ds1-1~exp1) experimental; urgency=medium * New upstream SVN snapshot. * Update SVN URLs to use HTTPS. @@ -12,7 +12,7 @@ josm-plugins (0.0.svn31608+ds1-1) UNRELEASED; urgency=medium - Align copyright holders * Drop obsolete README.source. - -- Bas Couwenberg Sat, 10 Oct 2015 00:23:02 +0200 + -- Bas Couwenberg Sat, 10 Oct 2015 01:03:52 +0200 josm-plugins (0.0.svn31107+ds1-1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] branch pristine-tar updated (1bd5d22 -> 62f32b6)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository josm-plugins. from 1bd5d22 pristine-tar data for josm-plugins_0.0.svn31107+ds1.orig.tar.gz new 62f32b6 pristine-tar data for josm-plugins_0.0.svn31608+ds1.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: josm-plugins_0.0.svn31608+ds1.orig.tar.gz.delta | Bin 0 -> 7717 bytes josm-plugins_0.0.svn31608+ds1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 josm-plugins_0.0.svn31608+ds1.orig.tar.gz.delta create mode 100644 josm-plugins_0.0.svn31608+ds1.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 03/12: Merge tag 'upstream/0.0.svn31608+ds1'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm-plugins. commit dc6f5488d77f333b34eecb7a1a7c957c7a14b017 Merge: fa9c814 2bc6a04 Author: Bas CouwenbergDate: Sat Oct 10 00:22:57 2015 +0200 Merge tag 'upstream/0.0.svn31608+ds1' Upstream version 0.0.svn31608+ds1 build-common.xml | 24 - measurement/build.xml | 1 + .../plugins/measurement/MeasurementDialog.java | 31 +- svn-info.xml | 17 ++-- 4 files changed, 58 insertions(+), 15 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 02/12: Imported Upstream version 0.0.svn31608+ds1
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm-plugins. commit 2bc6a04b8da4010fdf212eff2bad577672a1d2ac Author: Bas CouwenbergDate: Sat Oct 10 00:22:55 2015 +0200 Imported Upstream version 0.0.svn31608+ds1 --- build-common.xml | 24 - measurement/build.xml | 1 + .../plugins/measurement/MeasurementDialog.java | 31 +- svn-info.xml | 17 ++-- 4 files changed, 58 insertions(+), 15 deletions(-) diff --git a/build-common.xml b/build-common.xml index e120106..1e252f7 100644 --- a/build-common.xml +++ b/build-common.xml @@ -14,7 +14,7 @@ - + @@ -143,13 +143,25 @@ - + + + + + + + + + + + + + - + @@ -385,7 +397,7 @@ - + @@ -466,7 +478,7 @@ - + @@ -487,7 +499,7 @@ You can use following targets: * distThis default target builds the plugin jar file * clean Cleanup automatical created files - * testRun unit tests (if any) +* testRun unit tests (if any) * publish Checkin source code, build jar and checkin plugin jar (requires proper entry for SVN commit message!) * install Install the plugin in current system diff --git a/measurement/build.xml b/measurement/build.xml index ddf6e38..e5ba0c3 100644 --- a/measurement/build.xml +++ b/measurement/build.xml @@ -4,6 +4,7 @@ +
[josm-plugins] 05/12: Bump JOSM dependency to 8800.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm-plugins. commit 37f72918c420af411653eada2fa45ab4aa87951b Author: Bas CouwenbergDate: Sat Oct 10 00:32:29 2015 +0200 Bump JOSM dependency to 8800. --- debian/changelog | 1 + debian/control | 8 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index bebe56c..f7344e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ josm-plugins (0.0.svn31608+ds1-1) UNRELEASED; urgency=medium * New upstream SVN snapshot. * Update SVN URLs to use HTTPS. + * Bump JOSM dependency to 8800. -- Bas Couwenberg Sat, 10 Oct 2015 00:23:02 +0200 diff --git a/debian/control b/debian/control index 1383bd3..d75486c 100644 --- a/debian/control +++ b/debian/control @@ -10,13 +10,13 @@ Build-Depends: debhelper (>= 9), default-jdk, ant, ant-contrib, - josm (>= 0.0.svn8159), + josm (>= 0.0.svn8800), libgettext-ant-tasks-java, libjgrapht0.8-java, liblog4j1.2-java, libmetadata-extractor-java, python -Build-Conflicts: josm (>= 0.0.svn8160) +Build-Conflicts: josm (>= 0.0.svn8801) Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/josm-plugins.git Vcs-Git: git://anonscm.debian.org/pkg-grass/josm-plugins.git @@ -25,12 +25,12 @@ Homepage: http://josm.openstreetmap.de/wiki/Plugins Package: josm-plugins Architecture: all Depends: ${misc:Depends}, - josm (>= 0.0.svn8159), + josm (>= 0.0.svn8800), libjgrapht0.8-java, liblog4j1.2-java, libmetadata-extractor-java Suggests: gpsd -Breaks: josm (>= 0.0.svn8160) +Breaks: josm (>= 0.0.svn8801) Description: Plugins for JOSM JOSM (Java OpenStreetMap) plugin collection. . -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 01/12: Update SVN URLs to use HTTPS.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm-plugins. commit fa9c814e5e801773f4d4721382a8c319abd87267 Author: Bas CouwenbergDate: Sat Oct 10 00:21:32 2015 +0200 Update SVN URLs to use HTTPS. --- debian/changelog | 6 ++ debian/rules | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4563e03..6b7356d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +josm-plugins (0.0.svn31107+ds1-2) UNRELEASED; urgency=medium + + * Update SVN URLs to use HTTPS. + + -- Bas Couwenberg Sat, 10 Oct 2015 00:19:24 +0200 + josm-plugins (0.0.svn31107+ds1-1) unstable; urgency=medium * New upstream SVN snapshot. diff --git a/debian/rules b/debian/rules index 7e2d541..0484ba7 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ export JAVA_HOME=/usr/lib/jvm/default-java export CLASSPATH=/usr/share/josm/josm.jar:/usr/share/java/metadata-extractor.jar -SVNREPO := http://svn.openstreetmap.org/applications/editors/josm/plugins/ +SVNREPO := https://svn.openstreetmap.org/applications/editors/josm/plugins/ PLUGINS := colorscheme DirectUpload editgpx lakewalker measurement openvisible routing DATE := $(shell date +%Y%m%d) @@ -46,7 +46,7 @@ get-orig-source: rm -f ${DESTDIR}/"$$plugin"/data/*.lang; \ done svn export -r ${SVNREV} ${SVNREPO}/build-common.xml ${DESTDIR}/build-common.xml - svn info --xml http://svn.openstreetmap.org/applications/editors/josm/plugins/ > ${DESTDIR}/svn-info.xml + svn info --xml ${SVNREPO} > ${DESTDIR}/svn-info.xml @echo Removing jar files find ${DESTDIR} -name "*.jar" -exec rm -v {} \; @echo Building snapshot tarball -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 06/12: Update Vcs-Browser & Homepage URLs to use HTTPS.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm-plugins. commit 6c997c78134296e0936aad95238c7a498c0d0084 Author: Bas CouwenbergDate: Sat Oct 10 00:32:48 2015 +0200 Update Vcs-Browser & Homepage URLs to use HTTPS. --- debian/changelog | 1 + debian/control | 4 ++-- debian/copyright | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f7344e6..bdd9d99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ josm-plugins (0.0.svn31608+ds1-1) UNRELEASED; urgency=medium * New upstream SVN snapshot. * Update SVN URLs to use HTTPS. * Bump JOSM dependency to 8800. + * Update Vcs-Browser & Homepage URLs to use HTTPS. -- Bas Couwenberg Sat, 10 Oct 2015 00:23:02 +0200 diff --git a/debian/control b/debian/control index d75486c..da7cce3 100644 --- a/debian/control +++ b/debian/control @@ -18,9 +18,9 @@ Build-Depends: debhelper (>= 9), python Build-Conflicts: josm (>= 0.0.svn8801) Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/josm-plugins.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/josm-plugins.git Vcs-Git: git://anonscm.debian.org/pkg-grass/josm-plugins.git -Homepage: http://josm.openstreetmap.de/wiki/Plugins +Homepage: https://josm.openstreetmap.de/wiki/Plugins Package: josm-plugins Architecture: all diff --git a/debian/copyright b/debian/copyright index 20d5f4c..d24f5c5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Source: http://svn.openstreetmap.org/applications/editors/josm/plugins/ +Upstream-Source: https://svn.openstreetmap.org/applications/editors/josm/plugins/ Files: *.xml Copyright: JOSM Contributors -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 09/12: Update copyright file.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm-plugins. commit 1408bfee9689c101414ee88696b2dc73c8b655d5 Author: Bas CouwenbergDate: Sat Oct 10 00:57:47 2015 +0200 Update copyright file. Changes: - Add Upstream-Name field - Rename Upstream-Source field to Source - Drop © from Copyright fields - Align copyright holders --- debian/changelog | 5 + debian/copyright | 25 + 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index f4662ac..7346ca0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,11 @@ josm-plugins (0.0.svn31608+ds1-1) UNRELEASED; urgency=medium * Bump JOSM dependency to 8800. * Update Vcs-Browser & Homepage URLs to use HTTPS. * Enable parallel builds. + * Update copyright file, changes: +- Add Upstream-Name field +- Rename Upstream-Source field to Source +- Drop © from Copyright fields +- Align copyright holders -- Bas Couwenberg Sat, 10 Oct 2015 00:23:02 +0200 diff --git a/debian/copyright b/debian/copyright index d24f5c5..09881ea 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,43 +1,44 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Source: https://svn.openstreetmap.org/applications/editors/josm/plugins/ +Upstream-Name: JOSM Plugins +Source: https://svn.openstreetmap.org/applications/editors/josm/plugins/ Files: *.xml Copyright: JOSM Contributors License: GPL-2+ Files: colorscheme/* -Copyright: © 2008-2009, Christof Dallermassl +Copyright: 2008-2009, Christof Dallermassl License: GPL-3+ Files: DirectUpload/* -Copyright: © Subhodip Biswas +Copyright: Subhodip Biswas License: GPL-1+ Files: editgpx/* -Copyright: © 2008, Martin Garbe +Copyright: 2008, Martin Garbe License: GPL-1+ Files: lakewalker/* -Copyright: © 2000-2007, Rodney Kinney - © 2000-2007, Brent Easton +Copyright: 2000-2007, Rodney Kinney + 2000-2007, Brent Easton License: LGPL-2.1+ Files: measurement/* -Copyright: © 2007-2008, Raphael Mack +Copyright: 2007-2008, Raphael Mack License: GPL-3+ Files: openvisible/* -Copyright: © 2008-2009, Christof Dallermassl +Copyright: 2008-2009, Christof Dallermassl License: GPL-3+ Files: routing/* -Copyright: © 2008, Innovant +Copyright: 2008, Innovant License: GPL-2+ Files: debian/* -Copyright: © 2010-2012, David Paleino - © 2008-2010, Giovanni Mascellani - © 2008-2009, Andreas Putzo +Copyright: 2010-2012, David Paleino + 2008-2010, Giovanni Mascellani + 2008-2009, Andreas Putzo License: GPL-2+ License: GPL-1+ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] branch upstream updated (12ae5bb -> 2bc6a04)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository josm-plugins. from 12ae5bb Imported Upstream version 0.0.svn31107+ds1 new 2bc6a04 Imported Upstream version 0.0.svn31608+ds1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: build-common.xml | 24 - measurement/build.xml | 1 + .../plugins/measurement/MeasurementDialog.java | 31 +- svn-info.xml | 17 ++-- 4 files changed, 58 insertions(+), 15 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] annotated tag upstream/0.0.svn31608+ds1 created (now ae6b938)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.0.svn31608+ds1 in repository josm-plugins. at ae6b938 (tag) tagging 2bc6a04b8da4010fdf212eff2bad577672a1d2ac (commit) replaces upstream/0.0.svn31107+ds1 tagged by Bas Couwenberg on Sat Oct 10 00:22:56 2015 +0200 - Log - Upstream version 0.0.svn31608+ds1 Bas Couwenberg (1): Imported Upstream version 0.0.svn31608+ds1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 08/12: Enable parallel builds.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm-plugins. commit f3a0019fc1fbdc1b9c0e860f716834fefd3d36af Author: Bas CouwenbergDate: Sat Oct 10 00:36:37 2015 +0200 Enable parallel builds. --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bdd9d99..f4662ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ josm-plugins (0.0.svn31608+ds1-1) UNRELEASED; urgency=medium * Update SVN URLs to use HTTPS. * Bump JOSM dependency to 8800. * Update Vcs-Browser & Homepage URLs to use HTTPS. + * Enable parallel builds. -- Bas Couwenberg Sat, 10 Oct 2015 00:23:02 +0200 diff --git a/debian/rules b/debian/rules index 0484ba7..4f3106c 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,7 @@ DESTDIR := ../tarballs/josm-plugins-${VERSION} DESTTGZ := ../tarballs/josm-plugins_${DESTVER}.orig.tar.gz %: - dh $@ + dh $@ --parallel override_dh_auto_configure: for plugin in ${PLUGINS}; do \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 10/12: Drop obsolete README.source.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm-plugins. commit 0cc951142ca6999307d354410cefa8aed0588e37 Author: Bas CouwenbergDate: Sat Oct 10 01:03:25 2015 +0200 Drop obsolete README.source. --- debian/README.source | 5 - debian/changelog | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 37f3e1d..000 --- a/debian/README.source +++ /dev/null @@ -1,5 +0,0 @@ -This package uses the dpatch system to apply patches to the upstream -source code of the software that is packaged. For details about how to -use dpatch read - /usr/share/doc/dpatch/README.source.gz -from the dpatch package. diff --git a/debian/changelog b/debian/changelog index 7346ca0..3b25974 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ josm-plugins (0.0.svn31608+ds1-1) UNRELEASED; urgency=medium - Rename Upstream-Source field to Source - Drop © from Copyright fields - Align copyright holders + * Drop obsolete README.source. -- Bas Couwenberg Sat, 10 Oct 2015 00:23:02 +0200 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 11/12: Drop unused lintian overrides.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm-plugins. commit b4746e758621e5fd8b9dc9447d61ba6245786b40 Author: Bas CouwenbergDate: Sat Oct 10 01:13:32 2015 +0200 Drop unused lintian overrides. --- debian/josm-plugins.lintian-overrides | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/josm-plugins.lintian-overrides b/debian/josm-plugins.lintian-overrides deleted file mode 100644 index f370b4d..000 --- a/debian/josm-plugins.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# OpenJDK 7 is required -josm-plugins: incompatible-java-bytecode-format Java7 version (Class format: 51) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] tag debian/0.0.svn31608+ds1-1.exp1 created (now b626fb1)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/0.0.svn31608+ds1-1.exp1 in repository josm-plugins. at b626fb1 (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 01/01: pristine-tar data for josm-plugins_0.0.svn31608+ds1.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository josm-plugins. commit 62f32b680543c74cf5f8bed89399d41331281e31 Author: Bas CouwenbergDate: Sat Oct 10 00:22:55 2015 +0200 pristine-tar data for josm-plugins_0.0.svn31608+ds1.orig.tar.gz --- josm-plugins_0.0.svn31608+ds1.orig.tar.gz.delta | Bin 0 -> 7717 bytes josm-plugins_0.0.svn31608+ds1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/josm-plugins_0.0.svn31608+ds1.orig.tar.gz.delta b/josm-plugins_0.0.svn31608+ds1.orig.tar.gz.delta new file mode 100644 index 000..7e82bf9 Binary files /dev/null and b/josm-plugins_0.0.svn31608+ds1.orig.tar.gz.delta differ diff --git a/josm-plugins_0.0.svn31608+ds1.orig.tar.gz.id b/josm-plugins_0.0.svn31608+ds1.orig.tar.gz.id new file mode 100644 index 000..1bebeaa --- /dev/null +++ b/josm-plugins_0.0.svn31608+ds1.orig.tar.gz.id @@ -0,0 +1 @@ +6d5102b1417ac9234415d4a989a901fa88328ad1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processing of josm-plugins_0.0.svn31608+ds1-1~exp1_amd64.changes
josm-plugins_0.0.svn31608+ds1-1~exp1_amd64.changes uploaded successfully to localhost along with the files: josm-plugins_0.0.svn31608+ds1-1~exp1.dsc josm-plugins_0.0.svn31608+ds1.orig.tar.gz josm-plugins_0.0.svn31608+ds1-1~exp1.debian.tar.xz josm-plugins_0.0.svn31608+ds1-1~exp1_all.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
josm-plugins_0.0.svn31608+ds1-1~exp1_amd64.changes ACCEPTED into experimental
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Sat, 10 Oct 2015 01:03:52 +0200 Source: josm-plugins Binary: josm-plugins Architecture: source all Version: 0.0.svn31608+ds1-1~exp1 Distribution: experimental Urgency: medium Maintainer: Debian GIS ProjectChanged-By: Bas Couwenberg Description: josm-plugins - Plugins for JOSM Changes: josm-plugins (0.0.svn31608+ds1-1~exp1) experimental; urgency=medium . * New upstream SVN snapshot. * Update SVN URLs to use HTTPS. * Bump JOSM dependency to 8800. * Update Vcs-Browser & Homepage URLs to use HTTPS. * Enable parallel builds. * Update copyright file, changes: - Add Upstream-Name field - Rename Upstream-Source field to Source - Drop © from Copyright fields - Align copyright holders * Drop obsolete README.source. Checksums-Sha1: b752767ea345167f5115226d7eabb0cfd3624889 2387 josm-plugins_0.0.svn31608+ds1-1~exp1.dsc 06296559f76bff65aad236a876a14f225e7bfe50 153013 josm-plugins_0.0.svn31608+ds1.orig.tar.gz b6c6ba106dcd25637e01cad1f43e2fbce22401c8 10860 josm-plugins_0.0.svn31608+ds1-1~exp1.debian.tar.xz 56df51aba7a9e5b15a31229abb99d853d0a5fa48 197008 josm-plugins_0.0.svn31608+ds1-1~exp1_all.deb Checksums-Sha256: 13f44d35ef4fa90c45543b7b751a45696a9bf0d6e93afd6f4b6bff73839212bd 2387 josm-plugins_0.0.svn31608+ds1-1~exp1.dsc db6de232dbfe9175750a9e1379f39eb8d60a1e5b8c360d4821c56886ce628efa 153013 josm-plugins_0.0.svn31608+ds1.orig.tar.gz fcba2ed86ad5d25994a43d10d944667ca0f0e68f09f0af22fb7fbe1e76223e6c 10860 josm-plugins_0.0.svn31608+ds1-1~exp1.debian.tar.xz 0898268caadd404418160f8dbe1ba2ed8267ca8ddcc80ac056d33fef8c8e748e 197008 josm-plugins_0.0.svn31608+ds1-1~exp1_all.deb Files: e50eb13bd32bec082057db913ed88625 2387 science optional josm-plugins_0.0.svn31608+ds1-1~exp1.dsc 5283e97738b8ea5f82614ce6bae6a305 153013 science optional josm-plugins_0.0.svn31608+ds1.orig.tar.gz 48098687c9b9148d1fd938c3f8f939a6 10860 science optional josm-plugins_0.0.svn31608+ds1-1~exp1.debian.tar.xz 95e84ae71869411ebd072cb5e79b2671 197008 science optional josm-plugins_0.0.svn31608+ds1-1~exp1_all.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJWGE1DAAoJEGdQ8QrojUrxIpIP/RYMn+ihvuaEweCLMNqm8HTv YVZffHVut9ajtxk0RWZep/cKWzjfQLt4RtJlPOWxjuEQiAdrnC5O6I30EiIwysAZ lePrTc31rx9jpKEblei0JQfG8Kq1Rs8nuRS77CMhwXy9Opjk00Xw++527zj3bFPt wQ4X+T5CpGsVdN1pOP4vnT9biTCr7htCQuP8l3JkcOx5vRpm7QHYSQz+3fPd3XT5 92t/7q1gFgfnQ1MRaXgqPIWCHDs6ow4mZYvtyezufomQ4DwIYK0a85p3O9c0+e8f iz+tgqsJ0+FVa1QSc9HIENYkr81FXWhbxYtdid2MCSBskkAY0IiTQSa3bzbemSHK HRMpj1tGwn4HUfL89NGsbzIQzX7CeWK86kf/fDnYDvE6XFhOgWT1XREq2M+y8aMz 9GAHdZTORDhQdLQWaBmTZJ/Q29G/xIdn1vM+f+aep00zAoejUFtCMSeSE2OEEJs7 WSyqow6+EPpa1ejEqtsUTBs+5Cp2ggrejSebt+RQoipQDBJFiOILkpLv5OqF2wHx D4w7rB5YgDgILpwN25Q8MzpjF714ewVqsO9zV/W4N0RkZPRZ7l6i6hc7G2gj23zO vFwVTiXfnTqDGFY2Z86CCVa8xq1DuPFVZWyk7EiQm8oZ5A+uICBzgXc3feQznBdv m+8ozrYDLRu7YkFij//A =Ufhi -END PGP SIGNATURE- Thank you for your contribution to Debian. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 11/28: Merge changes from stretch branch.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit cc23af1da19ea9d7cf66176df95b1244de758f1f Merge: 5bff8f8 5d4e3ed Author: Bas CouwenbergDate: Fri Oct 9 14:45:01 2015 +0200 Merge changes from stretch branch. debian/changelog | 15 +++ debian/control| 2 +- debian/patches/00-build.patch | 17 + debian/patches/04-use_system_jmapviewer.patch | 2 +- debian/patches/05-fix_version.patch | 2 +- debian/patches/06-move_data_out_of_jar.patch | 2 +- 6 files changed, 28 insertions(+), 12 deletions(-) diff --cc debian/changelog index 7cb0942,e00a92d..6d40701 --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,18 +1,30 @@@ +josm (0.0.svn8800+dfsg1-1) UNRELEASED; urgency=medium + + * New tested snapshot. +(closes: #785416, #785417) + * Add dependencies for commons-logging. + * Update copyright file. + * Update patches, drop disabled patches, use groovy2 package. + * Bump minimum required jmapviewer version to 1.11. + * Drop xjc command for removed wms-cache.xsd. + + -- Bas Couwenberg Fri, 09 Oct 2015 12:44:31 +0200 + + josm (0.0.svn8159+dfsg1-2) unstable; urgency=medium + + * Patch REVISION file to add Build-Name property for identification of the + Debian build. (closes: #789161) + * Update Vcs-Browser URL to use HTTPS. + + -- Bas Couwenberg Mon, 31 Aug 2015 21:35:05 +0200 + + josm (0.0.svn8159+dfsg1-1) unstable; urgency=medium + + * Update branch in gbp.conf and Vcs-Git URL. + * Move from experimental to unstable. + + -- Bas Couwenberg Mon, 01 Jun 2015 21:44:58 +0200 + josm (0.0.svn8159+dfsg1-1~exp1) experimental; urgency=medium * New tested snapshot. diff --cc debian/control index c02d650,a5b31d0..e758196 --- a/debian/control +++ b/debian/control @@@ -23,10 -21,10 +23,10 @@@ Build-Depends: debhelper (>= 9~) liboauth-signpost-java (>= 1.2), libsvgsalamander-java, libterm-readkey-perl, - jmapviewer (>= 1.07) + jmapviewer (>= 1.11) Standards-Version: 3.9.6 - Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/josm.git + Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/josm.git -Vcs-Git: git://anonscm.debian.org/pkg-grass/josm.git -b stretch +Vcs-Git: git://anonscm.debian.org/pkg-grass/josm.git Homepage: http://josm.openstreetmap.de Package: josm diff --cc debian/patches/00-build.patch index 550ad9b,c255eed..a6d2a82 --- a/debian/patches/00-build.patch +++ b/debian/patches/00-build.patch @@@ -57,7 -54,7 +57,7 @@@ JARs and not depend on Internet connect - @@ -91,6 +105,7 @@ -@@ -87,6 +100,8 @@ ++@@ -91,6 +105,8 @@ Revision: ${version.entry.commit.revision} Is-Local-Build: true Build-Date: ${build.tstamp} @@@ -65,7 -63,7 +66,7 @@@ @@@ -75,7 -73,7 +76,7 @@@ - @@ -120,6 +136,8 @@ Build-Date: ${build.tstamp} -@@ -116,6 +132,8 @@ Build-Date: ${build.tstamp} ++@@ -120,6 +137,8 @@ Build-Date: ${build.tstamp} @@@ -84,7 -82,7 +85,7 @@@ - @@ -190,10 +208,7 @@ Build-Date: ${build.tstamp} -@@ -186,10 +204,7 @@ Build-Date: ${build.tstamp} ++@@ -190,10 +209,7 @@ Build-Date: ${build.tstamp} @@@ -96,52 -94,26 +97,52 @@@ - @@ -204,31 +219,19 @@ Build-Date: ${build.tstamp} -@@ -214,15 +229,10 @@ Build-Date: ${build.tstamp} - ++@@ -204,31 +220,19 @@ Build-Date: ${build.tstamp} - -- -- -- -- -- + + +- + + +- +- +- +- +- +- +- +- +- + + + + +- +- +- +- +- + + + - -- +- - @@ -245,7 +248,7 @@ Build-Date: ${build.tstamp} -@@ -251,6 +261,7 @@ Build-Date: ${build.tstamp} ++@@ -245,7 +249,7 @@ Build-Date: ${build.tstamp} + + + +- + + - @@ -272,6 +275,7 @@ Build-Date: ${build.tstamp} ++@@ -272,6 +276,7 @@ Build-Date: ${build.tstamp} @@@ -149,10 -121,10 +150,10 @@@ ++@@ -294,6 +299,7 @@ Build-Date: ${build.tstamp} - + + + diff --cc
[josm] 03/28: Merge tag 'upstream/0.0.svn8800+dfsg1'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit 09a5b90fbca72c202e3a12c7bec0e9fc9b0d77b2 Merge: 90a0815 560f79d Author: Bas CouwenbergDate: Fri Oct 9 12:44:22 2015 +0200 Merge tag 'upstream/0.0.svn8800+dfsg1' Upstream version 0.0.svn8800+dfsg1 .checkstyle|28 + .classpath |59 +- .project |19 +- .settings/edu.umd.cs.findbugs.core.prefs |18 +- .settings/org.eclipse.jdt.core.prefs |23 + .settings/org.eclipse.jdt.groovy.core.prefs| 2 +- .settings/org.eclipse.jdt.ui.prefs |10 +- ...eclipse.wst.common.project.facet.core.prefs.xml |15 - .../org.eclipse.wst.common.project.facet.core.xml | 5 - .settings/org.sonar.ide.eclipse.core.prefs | 6 + .settings/sf.eclipse.javacc.prefs | 2 + README | 5 +- REVISION | 8 +- build.xml | 101 +- data/defaultpresets.xml| 635 +- data/maps.xsd |20 +- data/overpass-turbo-ffs.js | 1 + data/projection/epsg | 360 +- data/validator/combinations.mapcss |79 +- data/validator/deprecated.mapcss |71 +- data/validator/geometry.mapcss |90 +- data/validator/numeric.mapcss |23 +- data/validator/opening_hours.js| 6598 +--- data/validator/relation.mapcss | 2 +- .../projection-regression-test-data-java9.csv | 726 + data_nodist/projection-regression-test-data.csv| 1408 +- data_nodist/trans/ast.lang | Bin 9399 -> 8893 bytes data_nodist/trans/be.lang | Bin 0 -> 15437 bytes data_nodist/trans/bg.lang | Bin 2806 -> 2804 bytes data_nodist/trans/ca-valencia.lang | Bin 8323 -> 8068 bytes data_nodist/trans/ca.lang | Bin 9737 -> 9810 bytes data_nodist/trans/cs.lang | Bin 9742 -> 9583 bytes data_nodist/trans/da.lang | Bin 5205 -> 8809 bytes data_nodist/trans/de.lang | Bin 9781 -> 9665 bytes data_nodist/trans/el.lang | Bin 1395 -> 1393 bytes data_nodist/trans/en.lang | Bin 8247 -> 8111 bytes data_nodist/trans/en_AU.lang | Bin 1671 -> 1669 bytes data_nodist/trans/en_GB.lang | Bin 2259 -> 2091 bytes data_nodist/trans/es.lang | Bin 10692 -> 10613 bytes data_nodist/trans/et.lang | Bin 1428 -> 1426 bytes data_nodist/trans/fi.lang | Bin 2605 -> 2449 bytes data_nodist/trans/fr.lang | Bin 9453 -> 9774 bytes data_nodist/trans/gl.lang | Bin 3230 -> 3170 bytes data_nodist/trans/hu.lang | Bin 10662 -> 10003 bytes data_nodist/trans/id.lang | Bin 7149 -> 6911 bytes data_nodist/trans/it.lang | Bin 10263 -> 10313 bytes data_nodist/trans/ja.lang | Bin 11523 -> 10784 bytes data_nodist/trans/km.lang | Bin 17419 -> 16168 bytes data_nodist/trans/lt.lang | Bin 708 -> 1942 bytes data_nodist/trans/nl.lang | Bin 9085 -> 10415 bytes data_nodist/trans/pl.lang | Bin 2855 -> 2923 bytes data_nodist/trans/pt.lang | Bin 12660 -> 12597 bytes data_nodist/trans/pt_BR.lang | Bin 8869 -> 8361 bytes data_nodist/trans/ru.lang | Bin 15654 -> 15485 bytes data_nodist/trans/sk.lang | Bin 9163 -> 8972 bytes data_nodist/trans/sv.lang | Bin 1332 -> 1330 bytes data_nodist/trans/uk.lang | Bin 16154 -> 15842 bytes data_nodist/trans/vi.lang | Bin 0 -> 10761 bytes data_nodist/trans/zh_CN.lang | Bin 5411 -> 6060 bytes data_nodist/trans/zh_TW.lang | Bin 4866 -> 4828 bytes data_nodist/wms-cache.xsd |55 - i18n/build.xml | 2 +- i18n/convpreset.pl | 1 + i18n/launchpad.pl | 6 +- i18n/po/af.po
[josm] 12/28: Fix exception to catch in getTranslationFile().
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit e5c7346ecf98a8d737787404ff6e2cc0fac4bfbb Author: Bas CouwenbergDate: Fri Oct 9 15:01:17 2015 +0200 Fix exception to catch in getTranslationFile(). --- debian/patches/06-move_data_out_of_jar.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch index dfa2c9f..7c745a0 100644 --- a/debian/patches/06-move_data_out_of_jar.patch +++ b/debian/patches/06-move_data_out_of_jar.patch @@ -28,7 +28,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608 -return Main.class.getResource("/data/"+lang.replace("@", "-")+".lang"); +try { +return Main.class.getResource("/data/"+lang.replace("@", "-")+".lang"); -+} catch (MalformedURLException ex) { ++} catch (RuntimeException ex) { +return null; +} } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 05/28: Update patches, drop disabled patches, use groovy2 package.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit aa32a665fdda8532408399eb69afc31ad1ba4274 Author: Bas CouwenbergDate: Fri Oct 9 13:18:41 2015 +0200 Update patches, drop disabled patches, use groovy2 package. --- debian/changelog | 3 +- debian/control| 3 +- debian/patches/00-build.patch | 84 ++--- debian/patches/01-bts.patch | 53 debian/patches/02-elemstyles.patch| 16 +-- debian/patches/03-default_look_and_feel.patch | 2 +- debian/patches/04-fix_images.patch| 29 - debian/patches/04-use_system_jmapviewer.patch | 2 +- debian/patches/05-fix_version.patch | 2 +- debian/patches/06-move_data_out_of_jar.patch | 12 +- debian/patches/07-use_system_fonts.patch | 6 +- debian/patches/08-disable_gettext-merge.patch | 43 --- debian/patches/08-use_external_json_library.patch | 145 -- debian/patches/100-fix_SlippyMapBBoxChooser.patch | 24 debian/patches/series | 3 - 15 files changed, 90 insertions(+), 337 deletions(-) diff --git a/debian/changelog b/debian/changelog index 08e770f..8a47884 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ josm (0.0.svn8800+dfsg1-1) UNRELEASED; urgency=medium * New tested snapshot. (closes: #785416, #785417) - * Refresh patches, add dependencies for commons-jcs & commons-logging. + * Add dependencies for commons-logging. * Update copyright file. + * Update patches, drop disabled patches, use groovy2 package. -- Bas Couwenberg Fri, 09 Oct 2015 12:44:31 +0200 diff --git a/debian/control b/debian/control index 2c525bd..1d8c444 100644 --- a/debian/control +++ b/debian/control @@ -12,10 +12,10 @@ Build-Depends: debhelper (>= 9~), ant-contrib, javacc, gettext, + groovy2, libandroid-json-org-java, libcommons-codec-java, libcommons-compress-java, - libcommons-jcs-java, libcommons-logging-java, libgettext-ant-tasks-java, libgettext-commons-java (>= 0.9.6), @@ -35,7 +35,6 @@ Depends: default-jre | java7-runtime, libandroid-json-org-java, libcommons-codec-java, libcommons-compress-java, - libcommons-jcs-java, libcommons-logging-java, libgettext-commons-java (>= 0.9.6), libmetadata-extractor-java (>= 2.7.2), diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch index a1c3244..028c44e 100644 --- a/debian/patches/00-build.patch +++ b/debian/patches/00-build.patch @@ -13,17 +13,19 @@ JARs and not depend on Internet connection. --- a/build.xml +++ b/build.xml -@@ -14,6 +14,7 @@ +@@ -14,7 +14,8 @@ +- + - ++ +@@ -29,6 +30,20 @@ + + + + @@ -34,7 +36,6 @@ JARs and not depend on Internet connection. + + + -+ + + + @@ -43,7 +44,7 @@ JARs and not depend on Internet connection. @@ -56,7 +57,7 @@ JARs and not depend on Internet connection. -@@ -87,6 +102,7 @@ +@@ -91,6 +105,7 @@ Revision: ${version.entry.commit.revision} Is-Local-Build: true Build-Date: ${build.tstamp} @@ -64,7 +65,7 @@ JARs and not depend on Internet connection. @@ -74,7 +75,7 @@ JARs and not depend on Internet connection. -@@ -116,6 +133,8 @@ Build-Date: ${build.tstamp} +@@ -120,6 +136,8 @@ Build-Date: ${build.tstamp} @@ -83,7 +84,7 @@ JARs and not depend on Internet connection. -@@ -186,10 +205,7 @@ Build-Date: ${build.tstamp} +@@ -190,10 +208,7 @@ Build-Date: ${build.tstamp} @@ -95,15 +96,10 @@ JARs and not depend on Internet connection. -@@ -214,32 +230,10 @@ Build-Date: ${build.tstamp} - - - -- -- -- -- +@@ -208,27 +223,15 @@ Build-Date: ${build.tstamp} + destdir="build" target="1.7" source="1.7" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false"> + + - - - @@ -113,25 +109,25 @@ JARs and not depend on Internet connection. - - - -- -- -- -- + + + + - - -
[josm] 09/28: Add classpath to additional build targets.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit 123452697493729755c9d02f0367132421ab328b Author: Bas CouwenbergDate: Fri Oct 9 13:59:58 2015 +0200 Add classpath to additional build targets. --- debian/patches/00-build.patch | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch index 028c44e..da6aa80 100644 --- a/debian/patches/00-build.patch +++ b/debian/patches/00-build.patch @@ -96,7 +96,12 @@ JARs and not depend on Internet connection. -@@ -208,27 +223,15 @@ Build-Date: ${build.tstamp} +@@ -204,31 +219,19 @@ Build-Date: ${build.tstamp} + + + +- @@ -127,6 +132,15 @@ JARs and not depend on Internet connection. destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8"> +@@ -245,7 +248,7 @@ Build-Date: ${build.tstamp} + + + +- + + @@ -272,6 +275,7 @@ Build-Date: ${build.tstamp} -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 15/28: Merge tag 'upstream/0.0.svn8800+dfsg2'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit 5d119f0e0fbb8b78cca3ccbb546ec3e35d5e5f02 Merge: ce777bf 3f22649 Author: Bas CouwenbergDate: Fri Oct 9 15:24:16 2015 +0200 Merge tag 'upstream/0.0.svn8800+dfsg2' Upstream version 0.0.svn8800+dfsg2 src/com/drew/imaging/ImageProcessingException.java | 49 + src/com/drew/imaging/PhotographicConversions.java | 61 ++ src/com/drew/imaging/jpeg/JpegMetadataReader.java | 135 +++ .../drew/imaging/jpeg/JpegProcessingException.java | 49 + src/com/drew/imaging/jpeg/JpegSegmentData.java | 270 + .../imaging/jpeg/JpegSegmentMetadataReader.java| 26 + src/com/drew/imaging/jpeg/JpegSegmentReader.java | 168 +++ src/com/drew/imaging/jpeg/JpegSegmentType.java | 174 +++ src/com/drew/imaging/jpeg/package.html | 33 + src/com/drew/imaging/package.html | 33 + src/com/drew/imaging/tiff/TiffDataFormat.java | 107 ++ src/com/drew/imaging/tiff/TiffHandler.java | 85 ++ .../drew/imaging/tiff/TiffProcessingException.java | 51 + src/com/drew/imaging/tiff/TiffReader.java | 368 +++ src/com/drew/imaging/tiff/package.html | 33 + src/com/drew/lang/BufferBoundsException.java | 59 ++ src/com/drew/lang/ByteArrayReader.java | 89 ++ src/com/drew/lang/CompoundException.java | 109 ++ src/com/drew/lang/GeoLocation.java | 163 +++ src/com/drew/lang/NullOutputStream.java| 43 + src/com/drew/lang/RandomAccessReader.java | 407 +++ src/com/drew/lang/Rational.java| 296 ++ src/com/drew/lang/SequentialByteArrayReader.java | 108 ++ src/com/drew/lang/SequentialReader.java| 308 ++ src/com/drew/lang/StreamReader.java| 114 ++ src/com/drew/lang/StringUtil.java | 115 ++ src/com/drew/lang/annotations/NotNull.java | 29 + src/com/drew/lang/annotations/Nullable.java| 29 + .../drew/lang/annotations/SuppressWarnings.java| 42 + src/com/drew/lang/annotations/package.html | 34 + src/com/drew/lang/package.html | 33 + src/com/drew/metadata/Age.java | 173 +++ src/com/drew/metadata/DefaultTagDescriptor.java| 51 + src/com/drew/metadata/Directory.java | 958 + src/com/drew/metadata/Face.java| 133 +++ src/com/drew/metadata/Metadata.java| 210 src/com/drew/metadata/MetadataException.java | 49 + src/com/drew/metadata/MetadataReader.java | 42 + src/com/drew/metadata/Tag.java | 132 +++ src/com/drew/metadata/TagDescriptor.java | 274 + src/com/drew/metadata/exif/ExifDescriptorBase.java | 1105 src/com/drew/metadata/exif/ExifDirectoryBase.java | 732 + src/com/drew/metadata/exif/ExifIFD0Descriptor.java | 37 + src/com/drew/metadata/exif/ExifIFD0Directory.java | 67 ++ .../drew/metadata/exif/ExifInteropDescriptor.java | 36 + .../drew/metadata/exif/ExifInteropDirectory.java | 60 ++ src/com/drew/metadata/exif/ExifReader.java | 101 ++ .../drew/metadata/exif/ExifSubIFDDescriptor.java | 36 + .../drew/metadata/exif/ExifSubIFDDirectory.java| 63 ++ .../metadata/exif/ExifThumbnailDescriptor.java | 109 ++ .../drew/metadata/exif/ExifThumbnailDirectory.java | 335 ++ src/com/drew/metadata/exif/ExifTiffHandler.java| 352 +++ src/com/drew/metadata/exif/GpsDescriptor.java | 241 + src/com/drew/metadata/exif/GpsDirectory.java | 188 .../exif/makernotes/CanonMakernoteDescriptor.java | 723 + .../exif/makernotes/CanonMakernoteDirectory.java | 723 + .../makernotes/CasioType1MakernoteDescriptor.java | 204 .../makernotes/CasioType1MakernoteDirectory.java | 104 ++ .../makernotes/CasioType2MakernoteDescriptor.java | 330 ++ .../makernotes/CasioType2MakernoteDirectory.java | 232 .../makernotes/FujifilmMakernoteDescriptor.java| 468 + .../makernotes/FujifilmMakernoteDirectory.java | 178 .../exif/makernotes/KodakMakernoteDescriptor.java | 151 +++ .../exif/makernotes/KodakMakernoteDirectory.java | 113 ++ .../makernotes/KyoceraMakernoteDescriptor.java | 73 ++ .../exif/makernotes/KyoceraMakernoteDirectory.java | 65 ++ .../exif/makernotes/LeicaMakernoteDescriptor.java | 127 +++ .../exif/makernotes/LeicaMakernoteDirectory.java | 107 ++ .../makernotes/NikonType1MakernoteDescriptor.java | 169 +++ .../makernotes/NikonType1MakernoteDirectory.java | 92 ++ .../makernotes/NikonType2MakernoteDescriptor.java | 359 +++ .../makernotes/NikonType2MakernoteDirectory.java | 924
[josm] 07/28: Bump minimum required jmapviewer version to 1.11.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit d180e81adb14dcd44e01081695ecfcd80d648ab8 Author: Bas CouwenbergDate: Fri Oct 9 13:36:03 2015 +0200 Bump minimum required jmapviewer version to 1.11. --- debian/changelog | 1 + debian/control | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8a47884..252b4f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ josm (0.0.svn8800+dfsg1-1) UNRELEASED; urgency=medium * Add dependencies for commons-logging. * Update copyright file. * Update patches, drop disabled patches, use groovy2 package. + * Bump minimum required jmapviewer version to 1.11. -- Bas Couwenberg Fri, 09 Oct 2015 12:44:31 +0200 diff --git a/debian/control b/debian/control index 1d8c444..c02d650 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 9~), liboauth-signpost-java (>= 1.2), libsvgsalamander-java, libterm-readkey-perl, - jmapviewer (>= 1.07) + jmapviewer (>= 1.11) Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/josm.git Vcs-Git: git://anonscm.debian.org/pkg-grass/josm.git @@ -41,7 +41,7 @@ Depends: default-jre | java7-runtime, libsvgsalamander-java, liboauth-signpost-java (>= 1.2), openstreetmap-map-icons-classic, - jmapviewer (>= 1.07), + jmapviewer (>= 1.11), fonts-droid, ${misc:Depends} Recommends: josm-plugins, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 13/28: Don't exclude metadata-extractor source.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit ce777bff01ac4fcc80afbb88254459c1018282b3 Author: Bas CouwenbergDate: Fri Oct 9 15:21:24 2015 +0200 Don't exclude metadata-extractor source. --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 5a98cd2..aa911f2 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ else VERSION := 0.0.0.${DATE} endif DESTDIR := ../tarballs/josm-${VERSION} -DESTTGZ := ../tarballs/josm_${VERSION}+dfsg1.orig.tar.gz +DESTTGZ := ../tarballs/josm_${VERSION}+dfsg2.orig.tar.gz DEB_VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d\ -f2) DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | cut -d- -f1) @@ -62,7 +62,7 @@ get-orig-source: @echo Removing icons directory rm -rf ${DESTDIR}/images/styles/standard @echo Removing duplicated code - rm -rf ${DESTDIR}/src/com ${DESTDIR}/src/oauth ${DESTDIR}/src/org/apache/commons/compress ${DESTDIR}/src/org/apache/commons/logging + rm -rf ${DESTDIR}/src/com/google ${DESTDIR}/src/com/kitfox ${DESTDIR}/src/oauth ${DESTDIR}/src/org/apache/commons/compress ${DESTDIR}/src/org/apache/commons/logging @echo Fetching revision metadata svn info --xml -r ${SVNREV} ${SVNREPO} > ${DESTDIR}/REVISION @echo Fetching internalization data -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 10/28: Don't run {core, data}trans targets, pot files don't exist.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit 5bff8f88e9c15f3d51d84e5103ddf516c12fd6d8 Author: Bas CouwenbergDate: Fri Oct 9 14:15:33 2015 +0200 Don't run {core,data}trans targets, pot files don't exist. --- debian/patches/00-build.patch | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch index da6aa80..550ad9b 100644 --- a/debian/patches/00-build.patch +++ b/debian/patches/00-build.patch @@ -179,29 +179,29 @@ JARs and not depend on Internet connection. -@@ -92,14 +92,15 @@ +@@ -92,14 +92,13 @@ - +- +- +- +- +- +- +- + + + + + + - - -- -- -- -- -- + -@@ -141,15 +142,14 @@ +@@ -141,15 +140,14 @@ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 04/28: New tested snapshot.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit 74d32373f54585d155b29cca81dfe9861c57b7ef Author: Bas CouwenbergDate: Fri Oct 9 12:44:47 2015 +0200 New tested snapshot. --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5ac3ee9..08e770f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -josm (0.0.svn8339+dfsg1-1) UNRELEASED; urgency=medium +josm (0.0.svn8800+dfsg1-1) UNRELEASED; urgency=medium * New tested snapshot. +(closes: #785416, #785417) * Refresh patches, add dependencies for commons-jcs & commons-logging. * Update copyright file. - -- Bas Couwenberg Tue, 12 May 2015 09:17:19 +0200 + -- Bas Couwenberg Fri, 09 Oct 2015 12:44:31 +0200 josm (0.0.svn8159+dfsg1-1~exp1) experimental; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 21/28: Add Bug-Debian header to 05-fix_version.patch.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit 70ab1e23eed044f20effb1e68de5a0794b8e9cc6 Author: Bas CouwenbergDate: Fri Oct 9 20:34:03 2015 +0200 Add Bug-Debian header to 05-fix_version.patch. --- debian/patches/05-fix_version.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/patches/05-fix_version.patch b/debian/patches/05-fix_version.patch index 8f1b425..bf4e0e9 100644 --- a/debian/patches/05-fix_version.patch +++ b/debian/patches/05-fix_version.patch @@ -2,6 +2,7 @@ From: Mario Izquierdo Subject: fix version numbers to reflect upstream changes Origin: vendor Forwarded: not-needed +Bug-Debian: https://bugs.debian.org/598920 --- build.xml|2 +- -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 23/28: Install logo per Icon Theme Specification.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit aaafba1db76e9313720646eda886e76449f88350 Author: Bas CouwenbergDate: Fri Oct 9 22:44:08 2015 +0200 Install logo per Icon Theme Specification. --- debian/changelog | 1 + debian/rules | 8 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index a09dd73..b6563db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ josm (0.0.svn8800+dfsg2-1) UNRELEASED; urgency=medium * Use embedded metadata-extractor for getFirstDirectoryOfType symbol. * Add missing-sources for overpass-turbo-ffs.js & opening_hours.js. * Use desktop file in favor of menu file per CTTE #741573. + * Install logo per Icon Theme Specification. -- Bas Couwenberg Fri, 09 Oct 2015 15:24:23 +0200 diff --git a/debian/rules b/debian/rules index fd39b60..41ac5ea 100755 --- a/debian/rules +++ b/debian/rules @@ -39,6 +39,14 @@ override_dh_auto_install: install -m 644 $(CURDIR)/dist/josm-custom.jar $(CURDIR)/debian/josm/usr/share/josm/josm-${DEB_UPSTREAM_VERSION}.jar dh_link usr/share/josm/josm-${DEB_UPSTREAM_VERSION}.jar usr/share/josm/josm.jar install -m 755 $(CURDIR)/debian/josm.sh $(CURDIR)/debian/josm/usr/bin/josm + + for size in 48x48 32x32 16x16; do \ + install -o root -g root -d $(CURDIR)/debian/josm/usr/share/icons/hicolor/$${size}/apps ; \ + install -o root -g root -m 644 $(CURDIR)/images/logo_$${size}x32.png $(CURDIR)/debian/josm/usr/share/icons/hicolor/$${size}/apps/josm.png ; \ + done + install -o root -g root -d $(CURDIR)/debian/josm/usr/share/icons/hicolor/scalable/apps + install -o root -g root -m 644 $(CURDIR)/images/logo.svg $(CURDIR)/debian/josm/usr/share/icons/hicolor/scalable/apps/josm.svg + install -m 644 $(CURDIR)/linux/tested/usr/share/pixmaps/josm.png $(CURDIR)/debian/josm/usr/share/pixmaps/josm.png install -m 644 $(CURDIR)/linux/tested/usr/share/applications/josm.desktop $(CURDIR)/debian/josm/usr/share/applications/josm.desktop install -m 644 $(CURDIR)/linux/tested/usr/share/appdata/josm.appdata.xml $(CURDIR)/debian/josm/usr/share/appdata/josm.appdata.xml -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 25/28: Enable parallel builds.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit d7b2ad0ce1bd349a2489224ae35c1054b229a3d2 Author: Bas CouwenbergDate: Fri Oct 9 23:40:38 2015 +0200 Enable parallel builds. --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b6563db..a177be0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ josm (0.0.svn8800+dfsg2-1) UNRELEASED; urgency=medium * Add missing-sources for overpass-turbo-ffs.js & opening_hours.js. * Use desktop file in favor of menu file per CTTE #741573. * Install logo per Icon Theme Specification. + * Enable parallel builds. -- Bas Couwenberg Fri, 09 Oct 2015 15:24:23 +0200 diff --git a/debian/rules b/debian/rules index dc629a7..c8e1165 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ IMGSTYLES_DIR := $(CURDIR)/debian/josm/usr/share/josm/images/styles #DEB_INSTALL_DOCS_ALL := %: - dh $@ + dh $@ --parallel override_dh_auto_build: # Move translation causing build failure out of the way -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 18/28: Add license & copyright for metadata-extractor.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit 52053dcdeb3a959304c9128fe929ba5d6b1bdc47 Author: Bas CouwenbergDate: Fri Oct 9 15:32:09 2015 +0200 Add license & copyright for metadata-extractor. --- debian/copyright | 5 + 1 file changed, 5 insertions(+) diff --git a/debian/copyright b/debian/copyright index 539e567..bba9901 100644 --- a/debian/copyright +++ b/debian/copyright @@ -74,6 +74,11 @@ Copyright: © 2012-2013, Dmitry Marakasov © 2013-2014, Robin `ypid` Schneider License: BSD-2-Clause +Files: src/com/drew/* +Copyright: 2002-2015, Drew Noakes + 2002-2011, Andreas Ziermann +License: Apache-2.0 + Files: src/gnu/* Copyright: © 1987-1997, Free Software Foundation, Inc. © 1998, Aaron M. Renn -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 16/28: New repacked tested snapshot.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit cb0b9f0b3738cc0d00228112287fb2388c0676d0 Author: Bas CouwenbergDate: Fri Oct 9 15:24:44 2015 +0200 New repacked tested snapshot. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6d40701..34c112e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -josm (0.0.svn8800+dfsg1-1) UNRELEASED; urgency=medium +josm (0.0.svn8800+dfsg2-1) UNRELEASED; urgency=medium * New tested snapshot. (closes: #785416, #785417) @@ -8,7 +8,7 @@ josm (0.0.svn8800+dfsg1-1) UNRELEASED; urgency=medium * Bump minimum required jmapviewer version to 1.11. * Drop xjc command for removed wms-cache.xsd. - -- Bas Couwenberg Fri, 09 Oct 2015 12:44:31 +0200 + -- Bas Couwenberg Fri, 09 Oct 2015 15:24:23 +0200 josm (0.0.svn8159+dfsg1-2) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 06/28: Add license & copyright for JCS files.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit 41eab49748cb766116246df6e31a37b023ba04b8 Author: Bas CouwenbergDate: Fri Oct 9 13:33:29 2015 +0200 Add license & copyright for JCS files. --- debian/copyright | 4 1 file changed, 4 insertions(+) diff --git a/debian/copyright b/debian/copyright index a6ea7d2..539e567 100644 --- a/debian/copyright +++ b/debian/copyright @@ -79,6 +79,10 @@ Copyright: © 1987-1997, Free Software Foundation, Inc. © 1998, Aaron M. Renn License: LGPL-2.1+ +Files: src/org/apache/commons/jcs/* +Copyright: 2001-2015, The Apache Software Foundation. +License: Apache-2.0 + Files: src/org/openstreetmap/josm/data/projection/Ellipsoid.java Copyright: © 2002, Johan Montagnat License: GPL-2+ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 08/28: Drop xjc command for removed wms-cache.xsd.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit 1a782263aee37ff1a232ef044a43c0ba03f833d7 Author: Bas CouwenbergDate: Fri Oct 9 13:44:18 2015 +0200 Drop xjc command for removed wms-cache.xsd. --- debian/changelog | 1 + debian/rules | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 252b4f9..7cb0942 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ josm (0.0.svn8800+dfsg1-1) UNRELEASED; urgency=medium * Update copyright file. * Update patches, drop disabled patches, use groovy2 package. * Bump minimum required jmapviewer version to 1.11. + * Drop xjc command for removed wms-cache.xsd. -- Bas Couwenberg Fri, 09 Oct 2015 12:44:31 +0200 diff --git a/debian/rules b/debian/rules index 3b5c5dd..5a98cd2 100755 --- a/debian/rules +++ b/debian/rules @@ -30,7 +30,6 @@ override_dh_auto_build: # Move translation causing build failure out of the way mv i18n/po/c...@valencia.po . - xjc -d src/ data_nodist/wms-cache.xsd dh_auto_build -- -Ddebian.version=${DEB_VERSION} dist mv c...@valencia.po i18n/po/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processing of openstreetmap-map-icons_0.0.svn31608-1~exp1_amd64.changes
openstreetmap-map-icons_0.0.svn31608-1~exp1_amd64.changes uploaded successfully to localhost along with the files: openstreetmap-map-icons_0.0.svn31608-1~exp1.dsc openstreetmap-map-icons_0.0.svn31608.orig.tar.gz openstreetmap-map-icons_0.0.svn31608-1~exp1.debian.tar.xz openstreetmap-map-icons-classic_0.0.svn31608-1~exp1_all.deb openstreetmap-map-icons-scalable_0.0.svn31608-1~exp1_all.deb openstreetmap-map-icons-square_0.0.svn31608-1~exp1_all.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
獎盃、獎牌、水晶廠價直銷
如閣下未能閱讀此郵件,請按此。 If you can’t see the image below, please click here 獎盃、獎牌、銀碟、水晶製品、金屬證書 Trophies, medals, silver plate, crystal products, certificates 科銘獎盃實業公司 專業提供各類金屬獎盃、獎牌、水晶獎座、銀牒、亞加歷膠座、金屬証書、木製紀念品及商務禮品,產品種類繁多。我們致力為不同機構及客戶服務,涵蓋層面廣泛,包括:公司、大學、銀行和其他機構。按客戶要求度身訂造專屬的獎盃,以迎合客戶所需,不斷開拓嶄新產品來符合客戶不同需要。。本公司以專業、誠懇的態度為客戶服務,歡迎各界人士查詢. Coralart Trophy Industrial Company specializes in providing all kinds of metal trophies, plaques, crystal trophies, silver dispatch, acrylic calendar holder plastic, metal certificates, wooden souvenirs and business gifts. We are committed to service with different customer and organizations, including: companies, universities, banks and other institutions. Can be designed according to customer requirements, and develop new products to meet the demands of customer. Our service in a professional and sincere attitude to customer, Please feel free to contact us. 如欲查看更多產品, 請前往本公司網站 |To see more products, Please visit our website: www.coralart.diytrade.com 電郵 | Email gif...@yeah.net 客服直線|Inquire Andy Lau : 5114 2370 Katrick Wong : 6189 8347 科銘實業公司 Coralart Industrial Company 地址:香港九龍觀塘開源道73-75號業發工業大廈第二期三樓H10室 Address:Room H10,3/F., Phase 2, Yip Fat Industrial Building ,73-75 Hoi Yuen Road, Kwun Tong, Kowloon, Hong Kong 如要取消訂閱,請到此處。 If you don’t wish to receive our Newsletter, please click here. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 22/28: Use desktop file in favor of menu file per CTTE #741573.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit fff04902eaa41951cea381f7cd8af48dac91c328 Author: Bas CouwenbergDate: Fri Oct 9 22:07:17 2015 +0200 Use desktop file in favor of menu file per CTTE #741573. --- debian/changelog | 1 + debian/icons/josm-16.xpm | 220 - debian/icons/josm-32.xpm | 294 - debian/icons/josm.png | 1 - debian/josm.desktop| 13 -- debian/josm.menu | 2 - debian/patches/08-josm-desktop-fixes.patch | 39 debian/patches/series | 1 + debian/rules | 6 +- 9 files changed, 43 insertions(+), 534 deletions(-) diff --git a/debian/changelog b/debian/changelog index c5c4f2c..a09dd73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ josm (0.0.svn8800+dfsg2-1) UNRELEASED; urgency=medium * Drop xjc command for removed wms-cache.xsd. * Use embedded metadata-extractor for getFirstDirectoryOfType symbol. * Add missing-sources for overpass-turbo-ffs.js & opening_hours.js. + * Use desktop file in favor of menu file per CTTE #741573. -- Bas Couwenberg Fri, 09 Oct 2015 15:24:23 +0200 diff --git a/debian/icons/josm-16.xpm b/debian/icons/josm-16.xpm deleted file mode 100644 index 06c8e67..000 --- a/debian/icons/josm-16.xpm +++ /dev/null @@ -1,220 +0,0 @@ -/* XPM */ -static char *josm___[] = { -/* columns rows colors chars-per-pixel */ -"16 16 198 2", -" c #513F11", -". c #513E12", -"X c #433426", -"o c #493A2A", -"O c #534113", -"+ c #534014", -"@ c #5C4711", -"# c #5C4713", -"$ c #684D10", -"% c #694E11", -"& c #604C19", -"* c #644F19", -"= c #5E4921", -"- c #564F36", -"; c #5D4933", -": c #604426", -"> c #6D4B28", -", c #724D26", -"< c #605021", -"1 c #655121", -"2 c #655324", -"3 c #685923", -"4 c #785E27", -"5 c #776731", -"6 c #716136", -"7 c #7A6636", -"8 c #7C713D", -"9 c #7F743D", -"0 c #474647", -"q c #484946", -"w c #4F4A44", -"e c #4A494A", -"r c #4B4E4A", -"t c #4C4C4C", -"y c #515051", -"u c #575956", -"i c #595A5A", -"p c #5E5E5F", -"a c #5D605A", -"s c #5E635A", -"d c #636F5B", -"f c #646C5C", -"g c #69775D", -"h c #68785E", -"j c #616161", -"k c #6A6E65", -"l c #6A6D66", -"z c #6B6A6B", -"x c #6B6F68", -"c c #6B6F69", -"v c #6D6C6D", -"b c #6A7361", -"n c #6A7362", -"m c #6E7965", -"M c #787162", -"N c #747569", -"B c #71786C", -"V c #717372", -"C c #757A72", -"Z c #797F76", -"A c #7F7D7C", -"S c #80733F", -"D c #806E44", -"F c #827D7A", -"G c #699746", -"H c #678055", -"J c #6C9B56", -"K c #7A866D", -"L c #7C8675", -"P c #7C827B", -"I c #7AAE68", -"U c #75AA7B", -"Y c #8A8F68", -"T c #818F73", -"R c #82877B", -"E c #8F897A", -"W c #908172", -"Q c #8B9372", -"! c #88967B", -"~ c #899B79", -"^ c #8A9A78", -"/ c #8E997B", -"( c #8F9D7F", -") c #8F9F7F", -"_ c #9A9871", -"` c #86AA68", -"' c #8CBD60", -"] c #8FBD6C", -"[ c #96B17E", -"{ c #93C175", -"} c #9DC07D", -"| c #769683", -" . c #6395B2", -".. c #868D81", -"X. c #8F9D83", -"o. c #8F9D85", -"O. c #919D88", -"+. c #929291", -"@. c #979A92", -"#. c #AC9F84", -"$. c #9CA282", -"%. c #96A882", -"&. c #9EAD8A", -"*. c #9DAF8B", -"=. c #9AA491", -"-. c #9EA29C", -";. c #AAAB87", -":. c #ABAB89", -">. c #BBAF85", -",. c #A1BC85", -"<. c #A1BD8D", -"1. c #ADA49B", -"2. c #ADA89A", -"3. c #B5A697", -"4. c #B6AA9F", -"5. c #A9B593", -"6. c #A5BD90", -"7. c #A6BC93", -"8. c #A9B892", -"9. c #ACBD96", -"0. c #87B0AB", -"q. c #88AFB1", -"w. c #A6A6A6", -"e. c #A7A8A6", -"r. c #AEAEAE", -"t. c #B0BDA7", -"y. c #B3B3B3", -"u. c #B5B5B5", -"i. c #BCB7B1", -"p. c #BB", -"a. c #BEBEBF", -"s. c #C2BFAD", -"d. c #A2C184", -"f. c #ACCB8F", -"g. c #A8C292", -"h. c #ABC893", -"j. c #AAC098", -"k. c #ADC19A", -"l. c #AEC699", -"z. c #AFC19E", -"x. c #ADC99A", -"c. c #B0C798", -"v. c #B1C59F", -"b. c #B4CF9A", -"n. c #B3CA9C", -"m. c #BBDF98", -"M. c #B5E78A", -"N. c #ADC4A0", -"B. c #B0C2A0", -"V. c #B4C8A3", -"C. c #B7CEA2", -"Z. c #B6CBA4", -"A. c #BED4A5", -"S. c #B9D1AA", -"D. c #CFC296", -"F. c #C5D5A2", -"G. c #C8D7AC", -"H. c #C3D9A9", -"J. c #DED8A7", -"K. c #DFDFAC", -"L. c #C3D3BA", -"P. c #D5D9B0", -"I. c #E2DCAA", -"U. c #D1E0A6", -"Y. c #DEE0AE", -"T. c #D4E9B7", -"R. c #DCE9B4", -"E. c #DEE9B7", -"W. c #DFEDB9", -"Q. c #DFEEB9", -"!. c #DCF0B6", -"~. c #D8F4BA", -"^. c #DCF7BF", -"/. c #DEF9BF", -"(. c #E5E2AF", -"). c #E5E3B2", -"_. c #E3E6B3", -"`. c #E3EFB9", -"'. c #E0F5BD", -"]. c #C1C1C1", -"[. c #CFCDC2", -"{. c #C8C8C8", -"}. c #CFD1C8", -"|. c #D1D4CA", -" X c #D1D0CF", -".X c #D1D1D1", -"XX c #D3D3D3", -"oX c #D9D9D9", -"OX c #D1E3C4", -"+X c #DAF4C3", -"@X c #E2F8C1", -"#X c #E0FBC2", -"$X c #E3FAC2", -"%X c
[josm] 19/28: Update translations path.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit e6d6dbb404de4373913a8a3330ea7d8901c7373a Author: Bas CouwenbergDate: Fri Oct 9 15:40:57 2015 +0200 Update translations path. --- debian/josm-l10n.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/josm-l10n.install b/debian/josm-l10n.install index 7661663..6a1cc4d 100644 --- a/debian/josm-l10n.install +++ b/debian/josm-l10n.install @@ -1 +1 @@ -data/*.lang/usr/share/josm/data/ +data_nodist/trans/*.lang/usr/share/josm/data/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 17/28: Use embedded metadata-extractor for getFirstDirectoryOfType symbol.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit 181f8465fa29a5d09910a100db435201fa63c282 Author: Bas CouwenbergDate: Fri Oct 9 15:27:23 2015 +0200 Use embedded metadata-extractor for getFirstDirectoryOfType symbol. --- debian/changelog | 1 + debian/control| 2 -- debian/patches/00-build.patch | 21 ++--- debian/patches/04-use_system_jmapviewer.patch | 2 +- debian/patches/05-fix_version.patch | 2 +- debian/patches/06-move_data_out_of_jar.patch | 2 +- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 34c112e..d601c3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ josm (0.0.svn8800+dfsg2-1) UNRELEASED; urgency=medium * Update patches, drop disabled patches, use groovy2 package. * Bump minimum required jmapviewer version to 1.11. * Drop xjc command for removed wms-cache.xsd. + * Use embedded metadata-extractor for getFirstDirectoryOfType symbol. -- Bas Couwenberg Fri, 09 Oct 2015 15:24:23 +0200 diff --git a/debian/control b/debian/control index e758196..cf83184 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,6 @@ Build-Depends: debhelper (>= 9~), libcommons-logging-java, libgettext-ant-tasks-java, libgettext-commons-java (>= 0.9.6), - libmetadata-extractor-java (>= 2.7.2), liboauth-signpost-java (>= 1.2), libsvgsalamander-java, libterm-readkey-perl, @@ -37,7 +36,6 @@ Depends: default-jre | java7-runtime, libcommons-compress-java, libcommons-logging-java, libgettext-commons-java (>= 0.9.6), - libmetadata-extractor-java (>= 2.7.2), libsvgsalamander-java, liboauth-signpost-java (>= 1.2), openstreetmap-map-icons-classic, diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch index a6d2a82..4c63fcd 100644 --- a/debian/patches/00-build.patch +++ b/debian/patches/00-build.patch @@ -23,7 +23,7 @@ JARs and not depend on Internet connection. -@@ -29,6 +30,20 @@ +@@ -29,6 +30,19 @@ @@ -31,7 +31,6 @@ JARs and not depend on Internet connection. + + + -+ + + + @@ -44,7 +43,7 @@ JARs and not depend on Internet connection. @@ -57,7 +56,7 @@ JARs and not depend on Internet connection. -@@ -91,6 +105,8 @@ +@@ -91,6 +104,8 @@ Revision: ${version.entry.commit.revision} Is-Local-Build: true Build-Date: ${build.tstamp} @@ -66,7 +65,7 @@ JARs and not depend on Internet connection. @@ -76,7 +75,7 @@ JARs and not depend on Internet connection. -@@ -120,6 +137,8 @@ Build-Date: ${build.tstamp} +@@ -120,6 +136,8 @@ Build-Date: ${build.tstamp} @@ -85,7 +84,7 @@ JARs and not depend on Internet connection. -@@ -190,10 +209,7 @@ Build-Date: ${build.tstamp} +@@ -190,10 +208,7 @@ Build-Date: ${build.tstamp} @@ -97,7 +96,7 @@ JARs and not depend on Internet connection. -@@ -204,31 +220,19 @@ Build-Date: ${build.tstamp} +@@ -204,31 +219,19 @@ Build-Date: ${build.tstamp} @@ -133,7 +132,7 @@ JARs and not depend on Internet connection. destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8"> -@@ -245,7 +249,7 @@ Build-Date: ${build.tstamp} +@@ -245,7 +248,7 @@ Build-Date: ${build.tstamp} @@ -142,7 +141,7 @@ JARs and not depend on Internet connection. destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8"> -@@ -272,6 +276,7 @@ Build-Date: ${build.tstamp} +@@ -272,6 +275,7 @@ Build-Date: ${build.tstamp} @@ -150,7 +149,7 @@ JARs and not depend on Internet connection. diff --git a/debian/patches/04-use_system_jmapviewer.patch b/debian/patches/04-use_system_jmapviewer.patch index 3d58ae2..1afd126 100644 --- a/debian/patches/04-use_system_jmapviewer.patch +++ b/debian/patches/04-use_system_jmapviewer.patch @@ -10,7 +10,7 @@ Forwarded: no --- a/build.xml +++ b/build.xml -@@ -143,7 +143,6 @@ Debian-Release: ${debian.version} +@@ -142,7 +142,6 @@ Debian-Release: ${debian.version} diff
Processing of josm_0.0.svn8800+dfsg2-1~exp1_amd64.changes
josm_0.0.svn8800+dfsg2-1~exp1_amd64.changes uploaded successfully to localhost along with the files: josm_0.0.svn8800+dfsg2-1~exp1.dsc josm_0.0.svn8800+dfsg2.orig.tar.gz josm_0.0.svn8800+dfsg2-1~exp1.debian.tar.xz josm-l10n_0.0.svn8800+dfsg2-1~exp1_all.deb josm_0.0.svn8800+dfsg2-1~exp1_all.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] annotated tag upstream/0.0.svn8800+dfsg2 created (now d714853)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.0.svn8800+dfsg2 in repository josm. at d714853 (tag) tagging 3f226491e1f5c63d77d09c577aa54c21d54ed97d (commit) replaces upstream/0.0.svn8800+dfsg1 tagged by Bas Couwenberg on Fri Oct 9 15:24:16 2015 +0200 - Log - Upstream version 0.0.svn8800+dfsg2 Bas Couwenberg (1): Imported Upstream version 0.0.svn8800+dfsg2 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 26/28: Update watch file and SVN URLs to use HTTPS.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit 98cb1bd614b8671d318d9fb06f777c58d0431669 Author: Bas CouwenbergDate: Fri Oct 9 23:46:21 2015 +0200 Update watch file and SVN URLs to use HTTPS. --- debian/changelog | 1 + debian/control | 2 +- debian/copyright | 4 ++-- debian/rules | 4 ++-- debian/upstream/metadata | 12 ++-- debian/watch | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index a177be0..2e40b1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ josm (0.0.svn8800+dfsg2-1) UNRELEASED; urgency=medium * Use desktop file in favor of menu file per CTTE #741573. * Install logo per Icon Theme Specification. * Enable parallel builds. + * Update watch file and SVN URLs to use HTTPS. -- Bas Couwenberg Fri, 09 Oct 2015 15:24:23 +0200 diff --git a/debian/control b/debian/control index cf83184..c7757f8 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 9~), Standards-Version: 3.9.6 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/josm.git Vcs-Git: git://anonscm.debian.org/pkg-grass/josm.git -Homepage: http://josm.openstreetmap.de +Homepage: https://josm.openstreetmap.de Package: josm Architecture: all diff --git a/debian/copyright b/debian/copyright index bba9901..6443e20 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: JOSM Upstream-Contact: JOSM Developers -Source: http://josm.openstreetmap.de/svn/trunk +Source: https://josm.openstreetmap.de/svn/trunk Comment: JOSM, and all its integral parts, are released under GPL-2+. . The JOSM repository contains files licensed under Apache-2.0 @@ -55,7 +55,7 @@ Comment: JOSM was originally designed and coded by Immanuel Scholz, Dirk Stöcker . Many minor contributions and patches by others; see SVN history - at http://josm.openstreetmap.de/svn/ for details. Use + at https://josm.openstreetmap.de/svn/ for details. Use "josm-dev AT openstreetmap.org" to contact still active authors. . Copyright rests with the contributors. diff --git a/debian/rules b/debian/rules index c8e1165..2e5dc7a 100755 --- a/debian/rules +++ b/debian/rules @@ -3,8 +3,8 @@ export JAVA_HOME=/usr/lib/jvm/default-java export CLASSPATH=/usr/share/java/gettext-commons.jar:/usr/share/java/metadata-extractor.jar:/usr/share/java/signpost-core.jar:/usr/share/java/jmapviewer.jar:/usr/share/java/json.jar -SVNREPO := http://josm.openstreetmap.de/svn/trunk -SVNI18NREPO := http://svn.openstreetmap.org/applications/editors/josm/i18n/ +SVNREPO := https://josm.openstreetmap.de/svn/trunk +SVNI18NREPO := https://svn.openstreetmap.org/applications/editors/josm/i18n/ DATE := $(shell date +%Y%m%d) ifdef SVNREV diff --git a/debian/upstream/metadata b/debian/upstream/metadata index f653c32..51ddee9 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -1,9 +1,9 @@ --- -Bug-Database: http://josm.openstreetmap.de/report -Bug-Submit: http://josm.openstreetmap.de/newticket -Changelog: http://josm.openstreetmap.de/log/josm/?verbose=on +Bug-Database: https://josm.openstreetmap.de/report +Bug-Submit: https://josm.openstreetmap.de/newticket +Changelog: https://josm.openstreetmap.de/log/josm/?verbose=on Contact: JOSM Developers Name: JOSM -Registration: http://josm.openstreetmap.de/register -Repository: http://josm.openstreetmap.de/svn/ -Repository-Browse: http://josm.openstreetmap.de/browser +Registration: https://josm.openstreetmap.de/register +Repository: https://josm.openstreetmap.de/svn/ +Repository-Browse: https://josm.openstreetmap.de/browser diff --git a/debian/watch b/debian/watch index 70d97b4..8191e69 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ version=3 opts=dversionmangle=s/0\.0\.svn([\d]+)\+dfsg.*/$1/ \ -http://pkg-grass.alioth.debian.org/josmredir.php \ +https://pkg-grass.alioth.debian.org/josmredir.php \ /josmredir\.php\?rev=(\d+) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 24/28: Don't remove non-free JSON code, no longer included.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit e28e7530763b9732656795c5e8849e1c7d00df6f Author: Bas CouwenbergDate: Fri Oct 9 23:05:59 2015 +0200 Don't remove non-free JSON code, no longer included. --- debian/rules | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/rules b/debian/rules index 41ac5ea..dc629a7 100755 --- a/debian/rules +++ b/debian/rules @@ -92,8 +92,6 @@ get-orig-source: rm -fr ${DESTDIR}/src/org/openstreetmap/josm/data/imagery/types/* @echo Removing embedded code copy of jmapviewer rm -fr ${DESTDIR}/src/org/openstreetmap/gui/jmapviewer/ - @echo Removing non-free JSON code - rm -fr ${DESTDIR}/src/org/json/ @echo Removing embedded fonts rm -fr ${DESTDIR}/data/fonts/ @echo Removing Windows installer -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 27/28: Drop unused lintian overrides.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit c48923cb9ad74dc037a51b00444a91aad1f080e3 Author: Bas CouwenbergDate: Sat Oct 10 00:16:12 2015 +0200 Drop unused lintian overrides. --- debian/josm.lintian-overrides | 13 - 1 file changed, 13 deletions(-) diff --git a/debian/josm.lintian-overrides b/debian/josm.lintian-overrides deleted file mode 100644 index d8c5589..000 --- a/debian/josm.lintian-overrides +++ /dev/null @@ -1,13 +0,0 @@ -# these are meant to be like that -josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml (http://wiki.openstreetmap.org/wiki/annotations) -josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml (http://wiki.openstreetmap.org/wiki/bicycle) -josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml (http://wiki.openstreetmap.org/wiki/key:*) -josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml (http://wiki.openstreetmap.org/wiki/link_(highway)) -josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml (http://wiki.openstreetmap.org/wiki/mountain_biking) -josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml (http://wiki.openstreetmap.org/wiki/proposed_features/*) -josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml (http://wiki.openstreetmap.org/wiki/relation:*) -josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml (http://wiki.openstreetmap.org/wiki/relations/proposed/*) -josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml (http://wiki.openstreetmap.org/wiki/tag:*) - -# OpenJDK 7 is required -josm: incompatible-java-bytecode-format Java7 version (Class format: 51) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 01/02: pristine-tar data for josm_0.0.svn8800+dfsg1.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository josm. commit 23a765f41e1e8df98fd4d21f07e5c66dbeedd77e Author: Bas CouwenbergDate: Fri Oct 9 12:44:20 2015 +0200 pristine-tar data for josm_0.0.svn8800+dfsg1.orig.tar.gz --- josm_0.0.svn8800+dfsg1.orig.tar.gz.delta | Bin 0 -> 121415 bytes josm_0.0.svn8800+dfsg1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/josm_0.0.svn8800+dfsg1.orig.tar.gz.delta b/josm_0.0.svn8800+dfsg1.orig.tar.gz.delta new file mode 100644 index 000..b001e86 Binary files /dev/null and b/josm_0.0.svn8800+dfsg1.orig.tar.gz.delta differ diff --git a/josm_0.0.svn8800+dfsg1.orig.tar.gz.id b/josm_0.0.svn8800+dfsg1.orig.tar.gz.id new file mode 100644 index 000..2dbcaca --- /dev/null +++ b/josm_0.0.svn8800+dfsg1.orig.tar.gz.id @@ -0,0 +1 @@ +0ebbdded7ca236e7080d877a095b4ca7d9d53868 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 02/02: pristine-tar data for josm_0.0.svn8800+dfsg2.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository josm. commit 8cf8ac66c4c6d43091b8e2cdd9bc119afad09886 Author: Bas CouwenbergDate: Fri Oct 9 15:24:15 2015 +0200 pristine-tar data for josm_0.0.svn8800+dfsg2.orig.tar.gz --- josm_0.0.svn8800+dfsg2.orig.tar.gz.delta | Bin 0 -> 127055 bytes josm_0.0.svn8800+dfsg2.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/josm_0.0.svn8800+dfsg2.orig.tar.gz.delta b/josm_0.0.svn8800+dfsg2.orig.tar.gz.delta new file mode 100644 index 000..515cfe2 Binary files /dev/null and b/josm_0.0.svn8800+dfsg2.orig.tar.gz.delta differ diff --git a/josm_0.0.svn8800+dfsg2.orig.tar.gz.id b/josm_0.0.svn8800+dfsg2.orig.tar.gz.id new file mode 100644 index 000..56ad1dd --- /dev/null +++ b/josm_0.0.svn8800+dfsg2.orig.tar.gz.id @@ -0,0 +1 @@ +c505d6b147f3b59c83da6e86f1d5f45bbe452879 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] branch pristine-tar updated (880f500 -> 8cf8ac6)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository josm. from 880f500 pristine-tar data for josm_0.0.svn8339+dfsg1.orig.tar.gz new 23a765f pristine-tar data for josm_0.0.svn8800+dfsg1.orig.tar.gz new 8cf8ac6 pristine-tar data for josm_0.0.svn8800+dfsg2.orig.tar.gz The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: josm_0.0.svn8800+dfsg1.orig.tar.gz.delta | Bin 0 -> 121415 bytes josm_0.0.svn8800+dfsg1.orig.tar.gz.id| 1 + josm_0.0.svn8800+dfsg2.orig.tar.gz.delta | Bin 0 -> 127055 bytes josm_0.0.svn8800+dfsg2.orig.tar.gz.id| 1 + 4 files changed, 2 insertions(+) create mode 100644 josm_0.0.svn8800+dfsg1.orig.tar.gz.delta create mode 100644 josm_0.0.svn8800+dfsg1.orig.tar.gz.id create mode 100644 josm_0.0.svn8800+dfsg2.orig.tar.gz.delta create mode 100644 josm_0.0.svn8800+dfsg2.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 28/28: Set distribution to experimental.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit 4bfb6e0bafd7a1ede701b866dae578e3779a8ca2 Author: Bas CouwenbergDate: Sat Oct 10 00:01:11 2015 +0200 Set distribution to experimental. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2e40b1e..a51d855 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -josm (0.0.svn8800+dfsg2-1) UNRELEASED; urgency=medium +josm (0.0.svn8800+dfsg2-1~exp1) experimental; urgency=medium * New tested snapshot. (closes: #785416, #785417) @@ -14,7 +14,7 @@ josm (0.0.svn8800+dfsg2-1) UNRELEASED; urgency=medium * Enable parallel builds. * Update watch file and SVN URLs to use HTTPS. - -- Bas Couwenberg Fri, 09 Oct 2015 15:24:23 +0200 + -- Bas Couwenberg Sat, 10 Oct 2015 00:00:53 +0200 josm (0.0.svn8159+dfsg1-2) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] annotated tag upstream/0.0.svn8800+dfsg1 created (now dee5197)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.0.svn8800+dfsg1 in repository josm. at dee5197 (tag) tagging 560f79df581c7a44b392e24616d68ee2c272a5c8 (commit) replaces upstream/0.0.svn8339+dfsg1 tagged by Bas Couwenberg on Fri Oct 9 12:44:21 2015 +0200 - Log - Upstream version 0.0.svn8800+dfsg1 Bas Couwenberg (1): Imported Upstream version 0.0.svn8800+dfsg1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] tag debian/0.0.svn8800+dfsg2-1.exp1 created (now 4bfb6e0)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/0.0.svn8800+dfsg2-1.exp1 in repository josm. at 4bfb6e0 (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#785416: marked as done (josm: please update josm to atleast svn 8339)
Your message dated Fri, 09 Oct 2015 22:34:05 + with message-idand subject line Bug#785416: fixed in josm 0.0.svn8800+dfsg2-1~exp1 has caused the Debian Bug report #785416, regarding josm: please update josm to atleast svn 8339 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 785416: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=785416 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems --- Begin Message --- Package: josm Version: 0.0.svn8159+dfsg1-1~exp1 Severity: normal Dear Maintainer, I was trying to download map data using JOSM. Got the following error while trying to download it. :- An unexpected error occured. This is always a coding error. However, you are using an old version of JOSM (8159), instead of using the current tested version (8339). Please update JOSM before considering to file a bug-report. The following are the errors on CLI while launching JOSM :- java.io.FileNotFoundException: /usr/share/josm/images/none (No such file or directory) ERROR: java.lang.NoClassDefFoundError: org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader. Cause: java.lang.ClassNotFoundException: org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader java.lang.NoClassDefFoundError: org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader at org.openstreetmap.josm.gui.layer.TMSLayer.(TMSLayer.java:132) at org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser.(SlippyMapBBoxChooser.java:134) at org.openstreetmap.josm.gui.download.SlippyMapChooser.(SlippyMapChooser.java:34) at org.openstreetmap.josm.gui.download.DownloadDialog.buildMainPanel(DownloadDialog.java:109) at org.openstreetmap.josm.gui.download.DownloadDialog.(DownloadDialog.java:208) at org.openstreetmap.josm.gui.download.DownloadDialog.getInstance(DownloadDialog.java:64) at org.openstreetmap.josm.actions.DownloadAction.actionPerformed(DownloadAction.java:41) at javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:2018) at javax.swing.AbstractButton$Handler.actionPerformed(AbstractButton.java:2341) at javax.swing.DefaultButtonModel.fireActionPerformed(DefaultButtonModel.java:402) at javax.swing.DefaultButtonModel.setPressed(DefaultButtonModel.java:259) at javax.swing.AbstractButton.doClick(AbstractButton.java:376) at javax.swing.plaf.basic.BasicMenuItemUI.doClick(BasicMenuItemUI.java:833) at javax.swing.plaf.basic.BasicMenuItemUI$Handler.mouseReleased(BasicMenuItemUI.java:877) at java.awt.AWTEventMulticaster.mouseReleased(AWTEventMulticaster.java:289) at java.awt.Component.processMouseEvent(Component.java:6516) at javax.swing.JComponent.processMouseEvent(JComponent.java:3312) at java.awt.Component.processEvent(Component.java:6281) at java.awt.Container.processEvent(Container.java:2229) at java.awt.Component.dispatchEventImpl(Component.java:4872) at java.awt.Container.dispatchEventImpl(Container.java:2287) at java.awt.Component.dispatchEvent(Component.java:4698) at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4832) at java.awt.LightweightDispatcher.processMouseEvent(Container.java:4492) at java.awt.LightweightDispatcher.dispatchEvent(Container.java:4422) at java.awt.Container.dispatchEventImpl(Container.java:2273) at java.awt.Window.dispatchEventImpl(Window.java:2719) at java.awt.Component.dispatchEvent(Component.java:4698) at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:747) at java.awt.EventQueue.access$300(EventQueue.java:103) at java.awt.EventQueue$3.run(EventQueue.java:706) at java.awt.EventQueue$3.run(EventQueue.java:704) at java.security.AccessController.doPrivileged(Native Method) at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:76) at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:87) at java.awt.EventQueue$4.run(EventQueue.java:720) at java.awt.EventQueue$4.run(EventQueue.java:718) at java.security.AccessController.doPrivileged(Native Method) at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:76) at java.awt.EventQueue.dispatchEvent(EventQueue.java:717) at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:242) at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:161)
Bug#785417: marked as done (josm: please update josm to atleast svn 8339)
Your message dated Fri, 09 Oct 2015 22:34:05 + with message-idand subject line Bug#785417: fixed in josm 0.0.svn8800+dfsg2-1~exp1 has caused the Debian Bug report #785417, regarding josm: please update josm to atleast svn 8339 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 785417: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=785417 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems --- Begin Message --- Package: josm Version: 0.0.svn8159+dfsg1-1~exp1 Severity: normal Dear Maintainer, I was trying to download map data using JOSM. Got the following error while trying to download it. :- An unexpected error occured. This is always a coding error. However, you are using an old version of JOSM (8159), instead of using the current tested version (8339). Please update JOSM before considering to file a bug-report. The following are the errors on CLI while launching JOSM :- java.io.FileNotFoundException: /usr/share/josm/images/none (No such file or directory) ERROR: java.lang.NoClassDefFoundError: org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader. Cause: java.lang.ClassNotFoundException: org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader java.lang.NoClassDefFoundError: org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader at org.openstreetmap.josm.gui.layer.TMSLayer.(TMSLayer.java:132) at org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser.(SlippyMapBBoxChooser.java:134) at org.openstreetmap.josm.gui.download.SlippyMapChooser.(SlippyMapChooser.java:34) at org.openstreetmap.josm.gui.download.DownloadDialog.buildMainPanel(DownloadDialog.java:109) at org.openstreetmap.josm.gui.download.DownloadDialog.(DownloadDialog.java:208) at org.openstreetmap.josm.gui.download.DownloadDialog.getInstance(DownloadDialog.java:64) at org.openstreetmap.josm.actions.DownloadAction.actionPerformed(DownloadAction.java:41) at javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:2018) at javax.swing.AbstractButton$Handler.actionPerformed(AbstractButton.java:2341) at javax.swing.DefaultButtonModel.fireActionPerformed(DefaultButtonModel.java:402) at javax.swing.DefaultButtonModel.setPressed(DefaultButtonModel.java:259) at javax.swing.AbstractButton.doClick(AbstractButton.java:376) at javax.swing.plaf.basic.BasicMenuItemUI.doClick(BasicMenuItemUI.java:833) at javax.swing.plaf.basic.BasicMenuItemUI$Handler.mouseReleased(BasicMenuItemUI.java:877) at java.awt.AWTEventMulticaster.mouseReleased(AWTEventMulticaster.java:289) at java.awt.Component.processMouseEvent(Component.java:6516) at javax.swing.JComponent.processMouseEvent(JComponent.java:3312) at java.awt.Component.processEvent(Component.java:6281) at java.awt.Container.processEvent(Container.java:2229) at java.awt.Component.dispatchEventImpl(Component.java:4872) at java.awt.Container.dispatchEventImpl(Container.java:2287) at java.awt.Component.dispatchEvent(Component.java:4698) at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4832) at java.awt.LightweightDispatcher.processMouseEvent(Container.java:4492) at java.awt.LightweightDispatcher.dispatchEvent(Container.java:4422) at java.awt.Container.dispatchEventImpl(Container.java:2273) at java.awt.Window.dispatchEventImpl(Window.java:2719) at java.awt.Component.dispatchEvent(Component.java:4698) at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:747) at java.awt.EventQueue.access$300(EventQueue.java:103) at java.awt.EventQueue$3.run(EventQueue.java:706) at java.awt.EventQueue$3.run(EventQueue.java:704) at java.security.AccessController.doPrivileged(Native Method) at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:76) at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:87) at java.awt.EventQueue$4.run(EventQueue.java:720) at java.awt.EventQueue$4.run(EventQueue.java:718) at java.security.AccessController.doPrivileged(Native Method) at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:76) at java.awt.EventQueue.dispatchEvent(EventQueue.java:717) at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:242) at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:161)
openstreetmap-map-icons_0.0.svn31608-1~exp1_amd64.changes ACCEPTED into experimental
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Sat, 10 Oct 2015 00:45:46 +0200 Source: openstreetmap-map-icons Binary: openstreetmap-map-icons-classic openstreetmap-map-icons-square openstreetmap-map-icons-scalable Architecture: source all Version: 1:0.0.svn31608-1~exp1 Distribution: experimental Urgency: medium Maintainer: Debian GIS ProjectChanged-By: Bas Couwenberg Description: openstreetmap-map-icons-classic - Collection of map icons (classic set) openstreetmap-map-icons-scalable - Collection of map icons (scalable set) openstreetmap-map-icons-square - Collection of map icons (square set) Changes: openstreetmap-map-icons (1:0.0.svn31608-1~exp1) experimental; urgency=medium . * New upstream SVN snapshot. * Update SVN URL to use HTTPS. * Update Vcs-Browser & Homepage URLs to use HTTPS. * Enable parallel builds. Checksums-Sha1: 509a8ab5c5c964a14038247b7f9cc2436e92a12d 2451 openstreetmap-map-icons_0.0.svn31608-1~exp1.dsc 08bb93249a9e8bde16d15ff13e51450f8b69e9ed 2570720 openstreetmap-map-icons_0.0.svn31608.orig.tar.gz 6b27b20a052e64adaf9ef6aaca34cd7246f2d763 30540 openstreetmap-map-icons_0.0.svn31608-1~exp1.debian.tar.xz fec8c4e37d86e313a79d129701753cebb667adbc 713220 openstreetmap-map-icons-classic_0.0.svn31608-1~exp1_all.deb 64a2de131b02020830078f31deae016ed105e581 661710 openstreetmap-map-icons-scalable_0.0.svn31608-1~exp1_all.deb c08968834a09b9e1b689370d7b24596c444ac4df 603582 openstreetmap-map-icons-square_0.0.svn31608-1~exp1_all.deb Checksums-Sha256: 9f7f81974a0bcfc4b5f129e105a76786b83055ba621bb57d0d25198ef051cf59 2451 openstreetmap-map-icons_0.0.svn31608-1~exp1.dsc a54363f3a078bc6b152459c37a5334f4bff5de64bed3f8671cf8f49907af6a75 2570720 openstreetmap-map-icons_0.0.svn31608.orig.tar.gz 4179cf74cd80a58c7a173a652f8560271b0106c5d1b5f15357e65386ac45742a 30540 openstreetmap-map-icons_0.0.svn31608-1~exp1.debian.tar.xz 6ffb0d2c97ce79e19fe551ec555b88996c778e0b9337e7eb47e1f5c3ba12a438 713220 openstreetmap-map-icons-classic_0.0.svn31608-1~exp1_all.deb 8628a8b920be777d5b095f4e424b65ed743021565dded02a7bb3c3f63c728c1d 661710 openstreetmap-map-icons-scalable_0.0.svn31608-1~exp1_all.deb 47e62a4be205d51e661f1f6904dd58ae35f34b4d5211f8f2d99f78c3e67c9c96 603582 openstreetmap-map-icons-square_0.0.svn31608-1~exp1_all.deb Files: 0bcb8446fd3713ea406721f7cebd6dfc 2451 utils optional openstreetmap-map-icons_0.0.svn31608-1~exp1.dsc 1bf2499a4ee17cb496a33e37150d0a29 2570720 utils optional openstreetmap-map-icons_0.0.svn31608.orig.tar.gz c007d2c2c50d76f7e7165a58a72551db 30540 utils optional openstreetmap-map-icons_0.0.svn31608-1~exp1.debian.tar.xz 46ccc1c44c90d17d955caf984a4b50d5 713220 utils optional openstreetmap-map-icons-classic_0.0.svn31608-1~exp1_all.deb 007a72d65c80c3777f5fc6ff7b174cdb 661710 utils optional openstreetmap-map-icons-scalable_0.0.svn31608-1~exp1_all.deb ed3da46d2c6a1a5d1b875dd0ec66c599 603582 utils optional openstreetmap-map-icons-square_0.0.svn31608-1~exp1_all.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJWGEXpAAoJEGdQ8QrojUrxzVkP/idPZvyHNdpWi2lLrCwyB0sE PFeP2HxxQkhlcQNDTVcW1vmxySICuiRN52jBYigwYOvEya2vc5mRPuxqLdM6kLLy vomAwhdGP6xJu/WWUZCgFVErbHJYuZ0nhS/UrIqQUam/s3RCZPpa0LRcghoJYJpW YuV/DdmRisLp2zelDhnwIOkelyxBnwZpMgF3DXkvGruHJK8UBLxqvR/kSLa2S0g+ GwbeOjHJYHPwkOouCpG0RIys1VuqSK9zVJXo5QpE013y0vHB7x4JAuJnCEq9+OCo CBS/Uyoleoj/Oc+OL9ANWcCI0PMSs7tt5g8vlnFVlP9GAVPl0ZryVEdpwnAl7TLf aMgaavQLwXgWJzqzYbos+5LMqfsVgtGhivPy5UwsX8QeFg2L1I8CEioPtCBKYglC Fo3oXXkdmPzcGn2HmFxP2grfvzkwWIKwULWMMtTj0gGB6vkCki7WEbMj97sqkQ4d L78U0XNvo/oM5CscO+GKTIXuaYrTVgApCJXl6sTHT134BtYND4WYOouLrO4EVHJX 8n1aP4cVlGiv+12HZU0H0omkuZf8BtUV0a3OeWjVCnJ9ttXxKCQLQz7C0UeJY9i1 ptvZuO7XTzuLpwg8l6zfPXSAArKiEqTyxYyONaFbrgr87ykGvFEmROsY+uNYf0hr pHkQy/Ow8SFSywgOMQsK =rkbi -END PGP SIGNATURE- Thank you for your contribution to Debian. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm] 01/28: Don't remove JCS source.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit 90a0815b3a537ab67910cdea166ba0e29551792d Author: Bas CouwenbergDate: Fri Oct 9 12:37:51 2015 +0200 Don't remove JCS source. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 627d7d7..3b5c5dd 100755 --- a/debian/rules +++ b/debian/rules @@ -63,7 +63,7 @@ get-orig-source: @echo Removing icons directory rm -rf ${DESTDIR}/images/styles/standard @echo Removing duplicated code - rm -rf ${DESTDIR}/src/com ${DESTDIR}/src/oauth ${DESTDIR}/src/org/apache + rm -rf ${DESTDIR}/src/com ${DESTDIR}/src/oauth ${DESTDIR}/src/org/apache/commons/compress ${DESTDIR}/src/org/apache/commons/logging @echo Fetching revision metadata svn info --xml -r ${SVNREV} ${SVNREPO} > ${DESTDIR}/REVISION @echo Fetching internalization data -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-map-icons] branch upstream updated (51a3a35 -> eea7c57)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository openstreetmap-map-icons. from 51a3a35 Imported Upstream version 0.0.svn31107 new eea7c57 Imported Upstream version 0.0.svn31608 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: classic.small/accommodation.png| Bin 168 -> 0 bytes classic.small/accommodation/hostel.png | Bin 207 -> 0 bytes classic.small/accommodation/hostel.svg | 14 ++ classic.small/accommodation/hotel.png | Bin 168 -> 0 bytes classic.small/accommodation/hotel.svg | 14 ++ classic.small/accommodation/motel.png | Bin 328 -> 0 bytes classic.small/accommodation/motel.svg | 14 ++ classic.small/food/restaurant.svg | 57 ++ classic.small/leisure/casino.svg | 59 ++ classic.small/misc/ford.svg| 14 ++ classic.small/misc/landmark/water_tower.png| Bin 203 -> 0 bytes classic.small/misc/landmark/water_tower.svg| 14 ++ classic.small/nautical/marine_fuel.png | Bin 0 -> 1252 bytes .../service/administration/court_of_law.png| Bin 205 -> 0 bytes .../service/administration/courthouse.svg | 14 ++ classic.small/service/administration/prison.png| Bin 81 -> 0 bytes classic.small/service/administration/prison.svg| 14 ++ classic.small/service/clock.png| Bin 235 -> 0 bytes classic.small/service/clock.svg| 14 ++ classic.small/service/recycling.png| Bin 463 -> 0 bytes classic.small/service/recycling/recycling.svg | 12 ++ .../service/recycling/recycling_centre.svg | 12 ++ .../service/recycling/recycling_container.svg | 12 ++ classic.small/shop.png | Bin 828 -> 0 bytes classic.small/shop/news.svg| 14 ++ classic.small/shop/optician.png| Bin 289 -> 0 bytes classic.small/shop/optician.svg| 14 ++ classic.small/shop/supermarket.png | Bin 828 -> 0 bytes classic.small/shop/supermarket.svg | 14 ++ classic.small/sightseeing/museum.png | Bin 285 -> 0 bytes classic.small/sightseeing/museum.svg | 14 ++ classic.small/sport/billiards.svg | 205 classic.small/sport/field_hockey.png | Bin 0 -> 176 bytes classic.small/sport/{hockey.png => ice_hockey.png} | Bin classic.small/sport/running.svg| 206 + classic.small/sport/safety_training.png| Bin 565 -> 0 bytes classic.small/vehicle/bump.png | Bin 297 -> 0 bytes classic.small/vehicle/chicane.png | Bin 221 -> 0 bytes classic.small/vehicle/chicane.svg | 159 classic.small/vehicle/chocker.svg | 153 +++ classic.small/vehicle/ford.png | Bin 411 -> 0 bytes classic.small/vehicle/island.svg | 144 ++ classic.small/vehicle/milestone.svg| 121 classic.small/vehicle/table.png| Bin 274 -> 0 bytes classic.small/vehicle/towing.png | Bin 485 -> 0 bytes classic.small/vehicle/traffic_calming.png | Bin 96 -> 0 bytes 46 files changed, 1308 insertions(+) delete mode 100644 classic.small/accommodation.png delete mode 100644 classic.small/accommodation/hostel.png create mode 100644 classic.small/accommodation/hostel.svg delete mode 100644 classic.small/accommodation/hotel.png create mode 100644 classic.small/accommodation/hotel.svg delete mode 100644 classic.small/accommodation/motel.png create mode 100644 classic.small/accommodation/motel.svg create mode 100644 classic.small/food/restaurant.svg create mode 100644 classic.small/leisure/casino.svg create mode 100644 classic.small/misc/ford.svg delete mode 100644 classic.small/misc/landmark/water_tower.png create mode 100644 classic.small/misc/landmark/water_tower.svg create mode 100644 classic.small/nautical/marine_fuel.png delete mode 100644 classic.small/service/administration/court_of_law.png create mode 100644 classic.small/service/administration/courthouse.svg delete mode 100644 classic.small/service/administration/prison.png create mode 100644 classic.small/service/administration/prison.svg delete mode 100644 classic.small/service/clock.png create mode 100644 classic.small/service/clock.svg delete mode 100644 classic.small/service/recycling.png create mode 100644 classic.small/service/recycling/recycling.svg create mode 100644
[openstreetmap-map-icons] tag debian/0.0.svn31608-1.exp1 created (now 78ba937)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/0.0.svn31608-1.exp1 in repository openstreetmap-map-icons. at 78ba937 (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-map-icons.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-map-icons] annotated tag upstream/0.0.svn31608 created (now dae705d)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.0.svn31608 in repository openstreetmap-map-icons. at dae705d (tag) tagging eea7c579c6cb8fda964307537b3aba1dd5bed882 (commit) replaces upstream/0.0.svn31107 tagged by Bas Couwenberg on Sat Oct 10 00:29:45 2015 +0200 - Log - Upstream version 0.0.svn31608 Bas Couwenberg (1): Imported Upstream version 0.0.svn31608 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-map-icons.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-map-icons] 08/08: Set distribution to experimental.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository openstreetmap-map-icons. commit 78ba9370a8e886b78df104233b9162150220ac9a Author: Bas CouwenbergDate: Sat Oct 10 00:46:04 2015 +0200 Set distribution to experimental. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fb2ce0e..9381ab1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -openstreetmap-map-icons (1:0.0.svn31608-1) UNRELEASED; urgency=medium +openstreetmap-map-icons (1:0.0.svn31608-1~exp1) experimental; urgency=medium * New upstream SVN snapshot. * Update SVN URL to use HTTPS. * Update Vcs-Browser & Homepage URLs to use HTTPS. * Enable parallel builds. - -- Bas Couwenberg Sat, 10 Oct 2015 00:29:49 +0200 + -- Bas Couwenberg Sat, 10 Oct 2015 00:45:46 +0200 openstreetmap-map-icons (1:0.0.svn31107-1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-map-icons.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-map-icons] branch pristine-tar updated (cd641e5 -> 2a4174d)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository openstreetmap-map-icons. from cd641e5 pristine-tar data for openstreetmap-map-icons_0.0.svn31107.orig.tar.gz new 2a4174d pristine-tar data for openstreetmap-map-icons_0.0.svn31608.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: openstreetmap-map-icons_0.0.svn31608.orig.tar.gz.delta | Bin 0 -> 81995 bytes openstreetmap-map-icons_0.0.svn31608.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 openstreetmap-map-icons_0.0.svn31608.orig.tar.gz.delta create mode 100644 openstreetmap-map-icons_0.0.svn31608.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-map-icons.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
josm_0.0.svn8800+dfsg2-1~exp1_amd64.changes ACCEPTED into experimental
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Sat, 10 Oct 2015 00:00:53 +0200 Source: josm Binary: josm josm-l10n Architecture: source all Version: 0.0.svn8800+dfsg2-1~exp1 Distribution: experimental Urgency: medium Maintainer: Debian GIS ProjectChanged-By: Bas Couwenberg Description: josm - Editor for OpenStreetMap josm-l10n - Editor for OpenStreetMap - translation files Closes: 785416 785417 Changes: josm (0.0.svn8800+dfsg2-1~exp1) experimental; urgency=medium . * New tested snapshot. (closes: #785416, #785417) * Add dependencies for commons-logging. * Update copyright file. * Update patches, drop disabled patches, use groovy2 package. * Bump minimum required jmapviewer version to 1.11. * Drop xjc command for removed wms-cache.xsd. * Use embedded metadata-extractor for getFirstDirectoryOfType symbol. * Add missing-sources for overpass-turbo-ffs.js & opening_hours.js. * Use desktop file in favor of menu file per CTTE #741573. * Install logo per Icon Theme Specification. * Enable parallel builds. * Update watch file and SVN URLs to use HTTPS. Checksums-Sha1: ad27c9d3d51d083209bd31477d7c10b601389b60 2475 josm_0.0.svn8800+dfsg2-1~exp1.dsc 70efd458177a9f9de2f5590845ac33d51f3c8fec 19640640 josm_0.0.svn8800+dfsg2.orig.tar.gz 7185b7d33d7276db8249dbe8e89a3e44e4b9fcd5 81080 josm_0.0.svn8800+dfsg2-1~exp1.debian.tar.xz 92d0c9b4e3a783165dffb2fec2a965848b59392e 105226 josm-l10n_0.0.svn8800+dfsg2-1~exp1_all.deb a6de059b5a0f43be4a1da1a73412fba3d24766fd 6450106 josm_0.0.svn8800+dfsg2-1~exp1_all.deb Checksums-Sha256: b63871927723a72faf7b52b222119c11d1e792fb4f873e7f4d05299d29888cfa 2475 josm_0.0.svn8800+dfsg2-1~exp1.dsc df9134afb78e7cfd8a23e37375745be20a40d11205381490b307838a80ce9bcd 19640640 josm_0.0.svn8800+dfsg2.orig.tar.gz 230ab16d1b56242e26814b655f4c03947a94d8d531c5c59c7182857e32adbbd9 81080 josm_0.0.svn8800+dfsg2-1~exp1.debian.tar.xz acad611abdf51a239fbac9234c734ad03998542d651211137cd644ecf06c2e1c 105226 josm-l10n_0.0.svn8800+dfsg2-1~exp1_all.deb 819f08b68479e6bcc1b365804faab18ba9f658754c678a4e49598083aaf1fea6 6450106 josm_0.0.svn8800+dfsg2-1~exp1_all.deb Files: d6cc8d9bfeeb3cd7680fae00ace4dfc4 2475 utils extra josm_0.0.svn8800+dfsg2-1~exp1.dsc 88dbe42815f52ad84de87c396ff3959e 19640640 utils extra josm_0.0.svn8800+dfsg2.orig.tar.gz ea474b8a8aeb81e9d2de8fe9c18e834f 81080 utils extra josm_0.0.svn8800+dfsg2-1~exp1.debian.tar.xz 1748b407cc4f013539cb10bd887ba0bf 105226 localization extra josm-l10n_0.0.svn8800+dfsg2-1~exp1_all.deb 6c38b5448406507a83ab3fb8a38a54ed 6450106 utils extra josm_0.0.svn8800+dfsg2-1~exp1_all.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJWGD6sAAoJEGdQ8QrojUrxqYkP/iC68inrUTFbUVh11xesJA2u mie/gi1+kvShiJx5BN9MfQ5+pWq1umJ36djO1h0iPF+RoFiVFFrvPZ6A6byUJSbp nCieNsP73ywJ42fdB9ZVdGXM4gP+9U4FOWE8SHtjn/XkGRuPbW3l7uDUJ++nmqoP 7OnoIrUV3SZVF6K06q3C8N+egg0pykMJX5IqDhocsQu8sbUJMoLSrCPRecism2T/ rnTEEtdQj/hmdusSQNUmRXQxbsPYBMj+2NNFC52xw7EQlX83YnYiM/pLnlnFTsQE WthPjTnZ8skeW4g+GtLpL+qHg1LHEObLo5ZTMJ9e3hqBzmK9qyEtkb2zIbXUdZ2Y xTsiougc1/B6oxnokAU3/3Ivc/TQsG1EMrCrN7ex56IXBptjb9gjnZIkht+Gd26x I8WjJb5wy4GnGuUxhhyBIFUnryR7vMmh7awTGMGkBm4oIlIhX9d2fTLGCqBdk1Ox DRqbHTCHjs3rwG7tJwTD0lk5ji1vcDmx/AdrE2T6ssBw5m9qhKwcAKqdDeq5+APh H3wFBgdkMshXAJ+xH7QfiwUyo79Gx4dE4RMFHqIVzyf3tK2fR6z3XJ1bYcJZ7Za9 4G+rJZ6HJgWGgg2CeRfb9DHv5aCjfS7jfID47jIMcwgdIX14kq7iOecC1HgMIdny kjQIRZaEajYAk3jnrHeB =WbTJ -END PGP SIGNATURE- Thank you for your contribution to Debian. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#785417: marked as done (josm: please update josm to atleast svn 8339)
Your message dated Fri, 09 Oct 2015 22:34:05 + with message-idand subject line Bug#785416: fixed in josm 0.0.svn8800+dfsg2-1~exp1 has caused the Debian Bug report #785416, regarding josm: please update josm to atleast svn 8339 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 785416: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=785416 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems --- Begin Message --- Package: josm Version: 0.0.svn8159+dfsg1-1~exp1 Severity: normal Dear Maintainer, I was trying to download map data using JOSM. Got the following error while trying to download it. :- An unexpected error occured. This is always a coding error. However, you are using an old version of JOSM (8159), instead of using the current tested version (8339). Please update JOSM before considering to file a bug-report. The following are the errors on CLI while launching JOSM :- java.io.FileNotFoundException: /usr/share/josm/images/none (No such file or directory) ERROR: java.lang.NoClassDefFoundError: org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader. Cause: java.lang.ClassNotFoundException: org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader java.lang.NoClassDefFoundError: org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader at org.openstreetmap.josm.gui.layer.TMSLayer.(TMSLayer.java:132) at org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser.(SlippyMapBBoxChooser.java:134) at org.openstreetmap.josm.gui.download.SlippyMapChooser.(SlippyMapChooser.java:34) at org.openstreetmap.josm.gui.download.DownloadDialog.buildMainPanel(DownloadDialog.java:109) at org.openstreetmap.josm.gui.download.DownloadDialog.(DownloadDialog.java:208) at org.openstreetmap.josm.gui.download.DownloadDialog.getInstance(DownloadDialog.java:64) at org.openstreetmap.josm.actions.DownloadAction.actionPerformed(DownloadAction.java:41) at javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:2018) at javax.swing.AbstractButton$Handler.actionPerformed(AbstractButton.java:2341) at javax.swing.DefaultButtonModel.fireActionPerformed(DefaultButtonModel.java:402) at javax.swing.DefaultButtonModel.setPressed(DefaultButtonModel.java:259) at javax.swing.AbstractButton.doClick(AbstractButton.java:376) at javax.swing.plaf.basic.BasicMenuItemUI.doClick(BasicMenuItemUI.java:833) at javax.swing.plaf.basic.BasicMenuItemUI$Handler.mouseReleased(BasicMenuItemUI.java:877) at java.awt.AWTEventMulticaster.mouseReleased(AWTEventMulticaster.java:289) at java.awt.Component.processMouseEvent(Component.java:6516) at javax.swing.JComponent.processMouseEvent(JComponent.java:3312) at java.awt.Component.processEvent(Component.java:6281) at java.awt.Container.processEvent(Container.java:2229) at java.awt.Component.dispatchEventImpl(Component.java:4872) at java.awt.Container.dispatchEventImpl(Container.java:2287) at java.awt.Component.dispatchEvent(Component.java:4698) at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4832) at java.awt.LightweightDispatcher.processMouseEvent(Container.java:4492) at java.awt.LightweightDispatcher.dispatchEvent(Container.java:4422) at java.awt.Container.dispatchEventImpl(Container.java:2273) at java.awt.Window.dispatchEventImpl(Window.java:2719) at java.awt.Component.dispatchEvent(Component.java:4698) at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:747) at java.awt.EventQueue.access$300(EventQueue.java:103) at java.awt.EventQueue$3.run(EventQueue.java:706) at java.awt.EventQueue$3.run(EventQueue.java:704) at java.security.AccessController.doPrivileged(Native Method) at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:76) at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:87) at java.awt.EventQueue$4.run(EventQueue.java:720) at java.awt.EventQueue$4.run(EventQueue.java:718) at java.security.AccessController.doPrivileged(Native Method) at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:76) at java.awt.EventQueue.dispatchEvent(EventQueue.java:717) at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:242) at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:161)
Bug#785416: marked as done (josm: please update josm to atleast svn 8339)
Your message dated Fri, 09 Oct 2015 22:34:05 + with message-idand subject line Bug#785417: fixed in josm 0.0.svn8800+dfsg2-1~exp1 has caused the Debian Bug report #785417, regarding josm: please update josm to atleast svn 8339 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 785417: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=785417 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems --- Begin Message --- Package: josm Version: 0.0.svn8159+dfsg1-1~exp1 Severity: normal Dear Maintainer, I was trying to download map data using JOSM. Got the following error while trying to download it. :- An unexpected error occured. This is always a coding error. However, you are using an old version of JOSM (8159), instead of using the current tested version (8339). Please update JOSM before considering to file a bug-report. The following are the errors on CLI while launching JOSM :- java.io.FileNotFoundException: /usr/share/josm/images/none (No such file or directory) ERROR: java.lang.NoClassDefFoundError: org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader. Cause: java.lang.ClassNotFoundException: org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader java.lang.NoClassDefFoundError: org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader at org.openstreetmap.josm.gui.layer.TMSLayer.(TMSLayer.java:132) at org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser.(SlippyMapBBoxChooser.java:134) at org.openstreetmap.josm.gui.download.SlippyMapChooser.(SlippyMapChooser.java:34) at org.openstreetmap.josm.gui.download.DownloadDialog.buildMainPanel(DownloadDialog.java:109) at org.openstreetmap.josm.gui.download.DownloadDialog.(DownloadDialog.java:208) at org.openstreetmap.josm.gui.download.DownloadDialog.getInstance(DownloadDialog.java:64) at org.openstreetmap.josm.actions.DownloadAction.actionPerformed(DownloadAction.java:41) at javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:2018) at javax.swing.AbstractButton$Handler.actionPerformed(AbstractButton.java:2341) at javax.swing.DefaultButtonModel.fireActionPerformed(DefaultButtonModel.java:402) at javax.swing.DefaultButtonModel.setPressed(DefaultButtonModel.java:259) at javax.swing.AbstractButton.doClick(AbstractButton.java:376) at javax.swing.plaf.basic.BasicMenuItemUI.doClick(BasicMenuItemUI.java:833) at javax.swing.plaf.basic.BasicMenuItemUI$Handler.mouseReleased(BasicMenuItemUI.java:877) at java.awt.AWTEventMulticaster.mouseReleased(AWTEventMulticaster.java:289) at java.awt.Component.processMouseEvent(Component.java:6516) at javax.swing.JComponent.processMouseEvent(JComponent.java:3312) at java.awt.Component.processEvent(Component.java:6281) at java.awt.Container.processEvent(Container.java:2229) at java.awt.Component.dispatchEventImpl(Component.java:4872) at java.awt.Container.dispatchEventImpl(Container.java:2287) at java.awt.Component.dispatchEvent(Component.java:4698) at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4832) at java.awt.LightweightDispatcher.processMouseEvent(Container.java:4492) at java.awt.LightweightDispatcher.dispatchEvent(Container.java:4422) at java.awt.Container.dispatchEventImpl(Container.java:2273) at java.awt.Window.dispatchEventImpl(Window.java:2719) at java.awt.Component.dispatchEvent(Component.java:4698) at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:747) at java.awt.EventQueue.access$300(EventQueue.java:103) at java.awt.EventQueue$3.run(EventQueue.java:706) at java.awt.EventQueue$3.run(EventQueue.java:704) at java.security.AccessController.doPrivileged(Native Method) at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:76) at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:87) at java.awt.EventQueue$4.run(EventQueue.java:720) at java.awt.EventQueue$4.run(EventQueue.java:718) at java.security.AccessController.doPrivileged(Native Method) at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:76) at java.awt.EventQueue.dispatchEvent(EventQueue.java:717) at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:242) at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:161)
[openstreetmap-map-icons] 03/08: Merge tag 'upstream/0.0.svn31608'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository openstreetmap-map-icons. commit 7cdd934b352ccb030604d39eb282dc9ff41fd8c1 Merge: 6f8eaa8 eea7c57 Author: Bas CouwenbergDate: Sat Oct 10 00:29:46 2015 +0200 Merge tag 'upstream/0.0.svn31608' Upstream version 0.0.svn31608 classic.small/accommodation.png| Bin 168 -> 0 bytes classic.small/accommodation/hostel.png | Bin 207 -> 0 bytes classic.small/accommodation/hostel.svg | 14 ++ classic.small/accommodation/hotel.png | Bin 168 -> 0 bytes classic.small/accommodation/hotel.svg | 14 ++ classic.small/accommodation/motel.png | Bin 328 -> 0 bytes classic.small/accommodation/motel.svg | 14 ++ classic.small/food/restaurant.svg | 57 ++ classic.small/leisure/casino.svg | 59 ++ classic.small/misc/ford.svg| 14 ++ classic.small/misc/landmark/water_tower.png| Bin 203 -> 0 bytes classic.small/misc/landmark/water_tower.svg| 14 ++ classic.small/nautical/marine_fuel.png | Bin 0 -> 1252 bytes .../service/administration/court_of_law.png| Bin 205 -> 0 bytes .../service/administration/courthouse.svg | 14 ++ classic.small/service/administration/prison.png| Bin 81 -> 0 bytes classic.small/service/administration/prison.svg| 14 ++ classic.small/service/clock.png| Bin 235 -> 0 bytes classic.small/service/clock.svg| 14 ++ classic.small/service/recycling.png| Bin 463 -> 0 bytes classic.small/service/recycling/recycling.svg | 12 ++ .../service/recycling/recycling_centre.svg | 12 ++ .../service/recycling/recycling_container.svg | 12 ++ classic.small/shop.png | Bin 828 -> 0 bytes classic.small/shop/news.svg| 14 ++ classic.small/shop/optician.png| Bin 289 -> 0 bytes classic.small/shop/optician.svg| 14 ++ classic.small/shop/supermarket.png | Bin 828 -> 0 bytes classic.small/shop/supermarket.svg | 14 ++ classic.small/sightseeing/museum.png | Bin 285 -> 0 bytes classic.small/sightseeing/museum.svg | 14 ++ classic.small/sport/billiards.svg | 205 classic.small/sport/field_hockey.png | Bin 0 -> 176 bytes classic.small/sport/{hockey.png => ice_hockey.png} | Bin classic.small/sport/running.svg| 206 + classic.small/sport/safety_training.png| Bin 565 -> 0 bytes classic.small/vehicle/bump.png | Bin 297 -> 0 bytes classic.small/vehicle/chicane.png | Bin 221 -> 0 bytes classic.small/vehicle/chicane.svg | 159 classic.small/vehicle/chocker.svg | 153 +++ classic.small/vehicle/ford.png | Bin 411 -> 0 bytes classic.small/vehicle/island.svg | 144 ++ classic.small/vehicle/milestone.svg| 121 classic.small/vehicle/table.png| Bin 274 -> 0 bytes classic.small/vehicle/towing.png | Bin 485 -> 0 bytes classic.small/vehicle/traffic_calming.png | Bin 96 -> 0 bytes 46 files changed, 1308 insertions(+) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-map-icons.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-map-icons] 01/08: Update SVN URL to use HTTPS.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository openstreetmap-map-icons. commit 6f8eaa8de2ab933c699b224588ecb122a1d9d9a1 Author: Bas CouwenbergDate: Sat Oct 10 00:29:08 2015 +0200 Update SVN URL to use HTTPS. --- debian/changelog | 6 ++ debian/rules | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4bd2a4d..88c0ade 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +openstreetmap-map-icons (1:0.0.svn31107-2) UNRELEASED; urgency=medium + + * Update SVN URL to use HTTPS. + + -- Bas Couwenberg Sat, 10 Oct 2015 00:28:42 +0200 + openstreetmap-map-icons (1:0.0.svn31107-1) unstable; urgency=medium * Move from experimental to unstable. diff --git a/debian/rules b/debian/rules index 579ca76..9936653 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ # This has to be exported to make some magic below work. export DH_OPTIONS -SVNREPO := http://svn.openstreetmap.org/applications/share/map-icons +SVNREPO := https://svn.openstreetmap.org/applications/share/map-icons DATE := $(shell date +%Y%m%d) VERSION := 0.0.svn${SVNREV} DESTDIR := ../tarballs/openstreetmap-map-icons-${VERSION} -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-map-icons.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-map-icons] branch master updated (08af5bd -> 78ba937)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository openstreetmap-map-icons. from 08af5bd Set distribution to unstable. new 6f8eaa8 Update SVN URL to use HTTPS. new eea7c57 Imported Upstream version 0.0.svn31608 new 7cdd934 Merge tag 'upstream/0.0.svn31608' new c4d8916 New upstream SVN snapshot. new ae3a7ae Update Vcs-Browser & Homepage URLs to use HTTPS. new d48ca65 Enable parallel builds. new 7c35939 Mark use-local-icons.patch as Forwarded: not-needed. new 78ba937 Set distribution to experimental. The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: classic.small/accommodation.png| Bin 168 -> 0 bytes classic.small/accommodation/hostel.png | Bin 207 -> 0 bytes classic.small/accommodation/hostel.svg | 14 ++ classic.small/accommodation/hotel.png | Bin 168 -> 0 bytes classic.small/accommodation/hotel.svg | 14 ++ classic.small/accommodation/motel.png | Bin 328 -> 0 bytes classic.small/accommodation/motel.svg | 14 ++ classic.small/food/restaurant.svg | 57 ++ classic.small/leisure/casino.svg | 59 ++ classic.small/misc/ford.svg| 14 ++ classic.small/misc/landmark/water_tower.png| Bin 203 -> 0 bytes classic.small/misc/landmark/water_tower.svg| 14 ++ classic.small/nautical/marine_fuel.png | Bin 0 -> 1252 bytes .../service/administration/court_of_law.png| Bin 205 -> 0 bytes .../service/administration/courthouse.svg | 14 ++ classic.small/service/administration/prison.png| Bin 81 -> 0 bytes classic.small/service/administration/prison.svg| 14 ++ classic.small/service/clock.png| Bin 235 -> 0 bytes classic.small/service/clock.svg| 14 ++ classic.small/service/recycling.png| Bin 463 -> 0 bytes classic.small/service/recycling/recycling.svg | 12 ++ .../service/recycling/recycling_centre.svg | 12 ++ .../service/recycling/recycling_container.svg | 12 ++ classic.small/shop.png | Bin 828 -> 0 bytes classic.small/shop/news.svg| 14 ++ classic.small/shop/optician.png| Bin 289 -> 0 bytes classic.small/shop/optician.svg| 14 ++ classic.small/shop/supermarket.png | Bin 828 -> 0 bytes classic.small/shop/supermarket.svg | 14 ++ classic.small/sightseeing/museum.png | Bin 285 -> 0 bytes classic.small/sightseeing/museum.svg | 14 ++ classic.small/sport/billiards.svg | 205 classic.small/sport/field_hockey.png | Bin 0 -> 176 bytes classic.small/sport/{hockey.png => ice_hockey.png} | Bin classic.small/sport/running.svg| 206 + classic.small/sport/safety_training.png| Bin 565 -> 0 bytes classic.small/vehicle/bump.png | Bin 297 -> 0 bytes classic.small/vehicle/chicane.png | Bin 221 -> 0 bytes classic.small/vehicle/chicane.svg | 159 classic.small/vehicle/chocker.svg | 153 +++ classic.small/vehicle/ford.png | Bin 411 -> 0 bytes classic.small/vehicle/island.svg | 144 ++ classic.small/vehicle/milestone.svg| 121 classic.small/vehicle/table.png| Bin 274 -> 0 bytes classic.small/vehicle/towing.png | Bin 485 -> 0 bytes classic.small/vehicle/traffic_calming.png | Bin 96 -> 0 bytes debian/changelog | 9 + debian/control | 4 +- debian/copyright | 8 +- debian/patches/use-local-icons.patch | 1 + debian/rules | 4 +- 51 files changed, 1326 insertions(+), 8 deletions(-) delete mode 100644 classic.small/accommodation.png delete mode 100644 classic.small/accommodation/hostel.png create mode 100644 classic.small/accommodation/hostel.svg delete mode 100644 classic.small/accommodation/hotel.png create mode 100644 classic.small/accommodation/hotel.svg delete mode 100644 classic.small/accommodation/motel.png create mode 100644 classic.small/accommodation/motel.svg create mode 100644 classic.small/food/restaurant.svg create mode 100644 classic.small/leisure/casino.svg create mode 100644 classic.small/misc/ford.svg
[openstreetmap-map-icons] 02/08: Imported Upstream version 0.0.svn31608
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository openstreetmap-map-icons. commit eea7c579c6cb8fda964307537b3aba1dd5bed882 Author: Bas CouwenbergDate: Sat Oct 10 00:29:43 2015 +0200 Imported Upstream version 0.0.svn31608 --- classic.small/accommodation.png| Bin 168 -> 0 bytes classic.small/accommodation/hostel.png | Bin 207 -> 0 bytes classic.small/accommodation/hostel.svg | 14 ++ classic.small/accommodation/hotel.png | Bin 168 -> 0 bytes classic.small/accommodation/hotel.svg | 14 ++ classic.small/accommodation/motel.png | Bin 328 -> 0 bytes classic.small/accommodation/motel.svg | 14 ++ classic.small/food/restaurant.svg | 57 ++ classic.small/leisure/casino.svg | 59 ++ classic.small/misc/ford.svg| 14 ++ classic.small/misc/landmark/water_tower.png| Bin 203 -> 0 bytes classic.small/misc/landmark/water_tower.svg| 14 ++ classic.small/nautical/marine_fuel.png | Bin 0 -> 1252 bytes .../service/administration/court_of_law.png| Bin 205 -> 0 bytes .../service/administration/courthouse.svg | 14 ++ classic.small/service/administration/prison.png| Bin 81 -> 0 bytes classic.small/service/administration/prison.svg| 14 ++ classic.small/service/clock.png| Bin 235 -> 0 bytes classic.small/service/clock.svg| 14 ++ classic.small/service/recycling.png| Bin 463 -> 0 bytes classic.small/service/recycling/recycling.svg | 12 ++ .../service/recycling/recycling_centre.svg | 12 ++ .../service/recycling/recycling_container.svg | 12 ++ classic.small/shop.png | Bin 828 -> 0 bytes classic.small/shop/news.svg| 14 ++ classic.small/shop/optician.png| Bin 289 -> 0 bytes classic.small/shop/optician.svg| 14 ++ classic.small/shop/supermarket.png | Bin 828 -> 0 bytes classic.small/shop/supermarket.svg | 14 ++ classic.small/sightseeing/museum.png | Bin 285 -> 0 bytes classic.small/sightseeing/museum.svg | 14 ++ classic.small/sport/billiards.svg | 205 classic.small/sport/field_hockey.png | Bin 0 -> 176 bytes classic.small/sport/{hockey.png => ice_hockey.png} | Bin classic.small/sport/running.svg| 206 + classic.small/sport/safety_training.png| Bin 565 -> 0 bytes classic.small/vehicle/bump.png | Bin 297 -> 0 bytes classic.small/vehicle/chicane.png | Bin 221 -> 0 bytes classic.small/vehicle/chicane.svg | 159 classic.small/vehicle/chocker.svg | 153 +++ classic.small/vehicle/ford.png | Bin 411 -> 0 bytes classic.small/vehicle/island.svg | 144 ++ classic.small/vehicle/milestone.svg| 121 classic.small/vehicle/table.png| Bin 274 -> 0 bytes classic.small/vehicle/towing.png | Bin 485 -> 0 bytes classic.small/vehicle/traffic_calming.png | Bin 96 -> 0 bytes 46 files changed, 1308 insertions(+) diff --git a/classic.small/accommodation.png b/classic.small/accommodation.png deleted file mode 100644 index 7b7bd37..000 Binary files a/classic.small/accommodation.png and /dev/null differ diff --git a/classic.small/accommodation/hostel.png b/classic.small/accommodation/hostel.png deleted file mode 100644 index cf4e4db..000 Binary files a/classic.small/accommodation/hostel.png and /dev/null differ diff --git a/classic.small/accommodation/hostel.svg b/classic.small/accommodation/hostel.svg new file mode 100644 index 000..7f574e0 --- /dev/null +++ b/classic.small/accommodation/hostel.svg @@ -0,0 +1,14 @@ +http://purl.org/dc/elements/1.1/; xmlns:cc="http://creativecommons.org/ns#; xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#; xmlns:svg="http://www.w3.org/2000/svg; xmlns="http://www.w3.org/2000/svg; version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2"> + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage"/> + + + + + + + http://purl.org/dc/elements/1.1/; xmlns:cc="http://creativecommons.org/ns#; xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#; xmlns:svg="http://www.w3.org/2000/svg; xmlns="http://www.w3.org/2000/svg; version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2"> + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage"/> + + + + + + + + diff --git
[openstreetmap-map-icons] 05/08: Update Vcs-Browser & Homepage URLs to use HTTPS.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository openstreetmap-map-icons. commit ae3a7aeec059b94eaae4ba2f4ea33c0b150c6555 Author: Bas CouwenbergDate: Sat Oct 10 00:31:34 2015 +0200 Update Vcs-Browser & Homepage URLs to use HTTPS. --- debian/changelog | 1 + debian/control | 4 ++-- debian/copyright | 8 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 29e431b..8c6dcc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ openstreetmap-map-icons (1:0.0.svn31608-1) UNRELEASED; urgency=medium * New upstream SVN snapshot. * Update SVN URL to use HTTPS. + * Update Vcs-Browser & Homepage URLs to use HTTPS. -- Bas Couwenberg Sat, 10 Oct 2015 00:29:49 +0200 diff --git a/debian/control b/debian/control index 51d853d..075c3aa 100644 --- a/debian/control +++ b/debian/control @@ -7,9 +7,9 @@ Section: utils Priority: optional Build-Depends: debhelper (>= 9) Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/openstreetmap-map-icons.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/openstreetmap-map-icons.git Vcs-Git: git://anonscm.debian.org/pkg-grass/openstreetmap-map-icons.git -Homepage: http://wiki.openstreetmap.org/wiki/Map_Icons +Homepage: https://wiki.openstreetmap.org/wiki/Map_Icons Package: openstreetmap-map-icons-classic Architecture: all diff --git a/debian/copyright b/debian/copyright index 00ca912..786b7f4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 Upstream-Author: Joerg Ostertag - Guenther Meyer . -Source: http://svn.openstreetmap.org/applications/share/map-icons + Guenther Meyer +Source: https://svn.openstreetmap.org/applications/share/map-icons Files: * Copyright: disclaimed @@ -11,8 +11,8 @@ License: public-domain Files: debian/* Copyright: disclaimed Author: 2008-2009, Andreas Putzo - 2009-2011, Giovanni Mascellani - 2010-2012, David Paleino +2009-2011, Giovanni Mascellani +2010-2012, David Paleino License: public-domain The debian packaging is placed in the public domain for compatibility with upstream. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-map-icons.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-map-icons] 04/08: New upstream SVN snapshot.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository openstreetmap-map-icons. commit c4d8916a6f58334f96caa2f3b2b8d96ab6076517 Author: Bas CouwenbergDate: Sat Oct 10 00:31:00 2015 +0200 New upstream SVN snapshot. --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 88c0ade..29e431b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -openstreetmap-map-icons (1:0.0.svn31107-2) UNRELEASED; urgency=medium +openstreetmap-map-icons (1:0.0.svn31608-1) UNRELEASED; urgency=medium + * New upstream SVN snapshot. * Update SVN URL to use HTTPS. - -- Bas Couwenberg Sat, 10 Oct 2015 00:28:42 +0200 + -- Bas Couwenberg Sat, 10 Oct 2015 00:29:49 +0200 openstreetmap-map-icons (1:0.0.svn31107-1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-map-icons.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-map-icons] 07/08: Mark use-local-icons.patch as Forwarded: not-needed.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository openstreetmap-map-icons. commit 7c3593976f979303fe0779a4356ee21e7464fac2 Author: Bas CouwenbergDate: Sat Oct 10 00:48:11 2015 +0200 Mark use-local-icons.patch as Forwarded: not-needed. --- debian/patches/use-local-icons.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/patches/use-local-icons.patch b/debian/patches/use-local-icons.patch index 3f5..0f4ef7b 100644 --- a/debian/patches/use-local-icons.patch +++ b/debian/patches/use-local-icons.patch @@ -1,5 +1,6 @@ Description: Fix generic privacy breach by using the local icon images. Author: Bas Couwenberg +Forwarded: not-needed --- a/index_all-abs.en.html +++ b/index_all-abs.en.html -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-map-icons.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-map-icons] 06/08: Enable parallel builds.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository openstreetmap-map-icons. commit d48ca656109726074c9e68e64d367240615bdbae Author: Bas CouwenbergDate: Sat Oct 10 00:36:41 2015 +0200 Enable parallel builds. --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8c6dcc9..fb2ce0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ openstreetmap-map-icons (1:0.0.svn31608-1) UNRELEASED; urgency=medium * New upstream SVN snapshot. * Update SVN URL to use HTTPS. * Update Vcs-Browser & Homepage URLs to use HTTPS. + * Enable parallel builds. -- Bas Couwenberg Sat, 10 Oct 2015 00:29:49 +0200 diff --git a/debian/rules b/debian/rules index 9936653..adbe908 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ DESTDIR := ../tarballs/openstreetmap-map-icons-${VERSION} DESTTGZ := ../tarballs/openstreetmap-map-icons_${VERSION}.orig.tar.gz %: - dh $@ + dh $@ --parallel override_dh_install: dh_install -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-map-icons.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-map-icons] 01/01: pristine-tar data for openstreetmap-map-icons_0.0.svn31608.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository openstreetmap-map-icons. commit 2a4174d59ad88a254be3f9228855c66d69603679 Author: Bas CouwenbergDate: Sat Oct 10 00:29:45 2015 +0200 pristine-tar data for openstreetmap-map-icons_0.0.svn31608.orig.tar.gz --- openstreetmap-map-icons_0.0.svn31608.orig.tar.gz.delta | Bin 0 -> 81995 bytes openstreetmap-map-icons_0.0.svn31608.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/openstreetmap-map-icons_0.0.svn31608.orig.tar.gz.delta b/openstreetmap-map-icons_0.0.svn31608.orig.tar.gz.delta new file mode 100644 index 000..6fc03a5 Binary files /dev/null and b/openstreetmap-map-icons_0.0.svn31608.orig.tar.gz.delta differ diff --git a/openstreetmap-map-icons_0.0.svn31608.orig.tar.gz.id b/openstreetmap-map-icons_0.0.svn31608.orig.tar.gz.id new file mode 100644 index 000..45c9dd4 --- /dev/null +++ b/openstreetmap-map-icons_0.0.svn31608.orig.tar.gz.id @@ -0,0 +1 @@ +8504f20aa13128af543ee948fe77e7dc3e3394a6 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-map-icons.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
mapnik-vector-tile 0.11.0+dfsg-1 MIGRATED to testing
FYI: The status of the mapnik-vector-tile source package in Debian's testing distribution has changed. Previous version: 0.10.0+dfsg-1 Current version: 0.11.0+dfsg-1 -- This email is automatically generated once a day. As the installation of new packages into testing happens multiple times a day you will receive later changes on the next day. See https://release.debian.org/testing-watch/ for more information. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel