[gis] branch master updated (093c8e6 - 5d75d86)

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a change to branch master
in repository gis.

  from  093c8e6   Add proj4js to osm task.
   new  5d75d86   Fix alacarte package name, add WNPP for disabiguation.

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:
 tasks/osm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/blends/projects/gis.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


[gis] 01/01: Fix alacarte package name, add WNPP for disabiguation.

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository gis.

commit 5d75d867dfd214639b6ec4a78de8da2b3b148db6
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Dec 29 09:01:12 2014 +0100

Fix alacarte package name, add WNPP for disabiguation.
---
 tasks/osm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tasks/osm b/tasks/osm
index f721abe..84b2336 100644
--- a/tasks/osm
+++ b/tasks/osm
@@ -141,4 +141,6 @@ WNPP: 744842
 
 Depends: sosi2osm
 
-Depends: alacarte
+Depends: alacarte-map-server
+WNPP: 705324
+

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/blends/projects/gis.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


#900353221

2014-12-29 Thread Hellenic Bank



 .
  
online   .

  
   
   .

  








___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

python-descartes_1.0.1-1_amd64.changes ACCEPTED into unstable, unstable

2014-12-29 Thread Debian FTP Masters


Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Format: 1.8
Date: Thu, 18 Dec 2014 22:19:30 +0100
Source: python-descartes
Binary: python-descartes python3-descartes
Architecture: source all
Version: 1.0.1-1
Distribution: unstable
Urgency: medium
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Changed-By: Johan Van de Wauw johan.vandew...@gmail.com
Description:
 python-descartes - Matplotlib extension to work with geometric objects 
(Python2)
 python3-descartes - Matplotlib extension to work with geometric objects 
(Python3)
Closes: 773430
Changes:
 python-descartes (1.0.1-1) unstable; urgency=medium
 .
   * Initial release (Closes: #773430)
Checksums-Sha1:
 f3abe8aac0e01e55181140f8c41e57c281418473 2230 python-descartes_1.0.1-1.dsc
 e31eaf74995da86dac61d60f4667d19bda79ab63 3297 
python-descartes_1.0.1.orig.tar.gz
 f3bdae5ed580a32e76c969bbb91a67fcb3e2976e 2200 
python-descartes_1.0.1-1.debian.tar.xz
 fbb9eafe1433b10356a17608cbe296e9f059439a 5070 python-descartes_1.0.1-1_all.deb
 09cf214fa47c10376ddbd998c58896f97231919e 5140 python3-descartes_1.0.1-1_all.deb
Checksums-Sha256:
 da90ca86b664efd2c96bfd8ffdb96bd85d4ecee71c32478729b515861c9a14ec 2230 
python-descartes_1.0.1-1.dsc
 d2cec01cb2517f693c40567d3a3ec0e580768f6df5fd002bac5ee2ed7e28af16 3297 
python-descartes_1.0.1.orig.tar.gz
 e29597d26b1e0d54c037395d263f44fbbd3d46608bb711cc821e6c004f41e1ad 2200 
python-descartes_1.0.1-1.debian.tar.xz
 11b7a34d1bf68771b9c7bdd2f52e01aecaa97258540af5c0644d1444b19a4fe2 5070 
python-descartes_1.0.1-1_all.deb
 c41ade426d6d7b86d6338d35b7f3affbdf66cb46c38316c6c974f7dba620e27b 5140 
python3-descartes_1.0.1-1_all.deb
Files:
 a97db3b936a2e0b8843dab542941cef2 2230 python optional 
python-descartes_1.0.1-1.dsc
 fcacfa88674032891666d833bdab9b6d 3297 python optional 
python-descartes_1.0.1.orig.tar.gz
 6862d76bb2cefb81152c5d9f70ece453 2200 python optional 
python-descartes_1.0.1-1.debian.tar.xz
 079868b7766bcd010eb756a880ec1678 5070 python optional 
python-descartes_1.0.1-1_all.deb
 a20ae69247048c9544713ce2cbde783d 5140 python optional 
python3-descartes_1.0.1-1_all.deb

-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAEBCgAGBQJUmhhZAAoJEFeKBJTRxkbRan0P/2whpBI0AowNV2W2moUo2WGU
Kr9a4Q+5bwLSCjHQiJezoWoqFs65Qs4oE/tKJI/gztSKKSDY93k1jumg0ap8ZAFW
mviPNvRNmH0BWiEoxGmTvK1af+XRL3QjaF2qfWzkNe0UKGT4bGloqXljMcHMfVlU
LNzCuk76247ft4LqOsKkK1OoGBq08H4EOmmhobde6UxjwcDj+Rx0e+zStGgkZfZk
i5Zq8WBdhscCrkp3r10yW6fS+uW/dUSXAU2AJnxFrQ3d29r10DfsNIMUpkEeTDAF
pBNDiJjY9h9wbIH7Mx6QUdlKASG9OW87xiqaCZgYW4dzv6+t7aU0Q61hQrLGQu8i
XaGz0GoVF0iJ7ej86TSf4FL9lnpv1PgW2O3g4UsBXyv4il3cKlPweYmlmKeroJ+t
xRNcF+w1yDC1wHBK54/ZC30tcl2tlmFzbFVDxMsRztu1wGF7OoNgH5203psP6dDW
bY6KonRM72ZuOURKwVf3KweXUCYZqPJcWI/jQSs8N84H93gJA0nU1SizngarHJ5/
3r4SfI6PD2WrDevFOlBua7ecv2qvTlgPEGsLhWXdnI9rWbzlAGsJLQ/VLvCd8uMO
/3gr98PS60AeUC2IrR8mAX6ML1uxAh2lp9LX4I6VNQaTCMw6xjmNZNL/hR3IrosI
MUR/+cI8uZBDg+xy58m0
=zrLl
-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


[jmapviewer] branch master updated (8745332 - b010df6)

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a change to branch master
in repository jmapviewer.

  from  8745332   Set distribution to experimental.
   new  6cc067b   Use repacksuffix in watch file to append +dfsg for 
repacked tarball.
   new  113b137   Clean up rule files.
   new  e97508c   Imported Upstream version 1.05+dfsg
   new  8c3ffe9   Merge tag 'upstream/1.05+dfsg'
   new  77fcbd1   New upstream release.
   new  b010df6   Set distribution to experimental.

The 6 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:
 debian/changelog   |  12 ++
 debian/rules   |  26 ++-
 debian/watch   |   2 +-
 src/org/openstreetmap/gui/jmapviewer/Demo.java |  16 +-
 .../gui/jmapviewer/FeatureAdapter.java |  21 +++
 .../openstreetmap/gui/jmapviewer/JMapViewer.java   | 174 +++-
 .../gui/jmapviewer/MemoryTileCache.java|   7 +-
 .../gui/jmapviewer/OsmFileCacheTileLoader.java | 178 +++--
 .../gui/jmapviewer/OsmTileLoader.java  |   6 +-
 .../gui/jmapviewer/TMSFileCacheTileLoader.java |  76 +
 src/org/openstreetmap/gui/jmapviewer/Tile.java |  55 ---
 .../gui/jmapviewer/TileController.java |   9 +-
 .../gui/jmapviewer/interfaces/TileCache.java   |   5 +
 .../jmapviewer/interfaces/TileLoaderListener.java  |  11 +-
 .../gui/jmapviewer/interfaces/TileSource.java  |  13 +-
 .../tilesources/AbstractMapQuestTileSource.java|   4 +-
 .../tilesources/AbstractOsmTileSource.java |   6 +-
 .../tilesources/AbstractTMSTileSource.java |   9 +-
 .../tilesources/BingAerialTileSource.java  |   9 +-
 .../tilesources/MapQuestOpenAerialTileSource.java  |   2 +-
 .../tilesources/MapQuestOsmTileSource.java |   2 +-
 .../gui/jmapviewer/tilesources/OsmTileSource.java  |   4 +-
 .../jmapviewer/tilesources/ScanexTileSource.java   |   4 +-
 .../gui/jmapviewer/tilesources/TMSTileSource.java  |   9 +-
 .../tilesources/TemplatedTMSTileSource.java|   8 +-
 25 files changed, 414 insertions(+), 254 deletions(-)
 create mode 100644 
src/org/openstreetmap/gui/jmapviewer/TMSFileCacheTileLoader.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
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[jmapviewer] 02/06: Clean up rule files.

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository jmapviewer.

commit 113b137d83c7f5d634b53bfe5dab877b9bd69cc1
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Dec 29 21:05:38 2014 +0100

Clean up rule files.

Changes:
- Remove .PHONY
- Rename VER to VERSION
- Remove unused SVN legacy
- Add empty lines to improve readability
---
 debian/changelog |  5 +
 debian/rules | 26 +++---
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa10e55..1850ac1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 jmapviewer (1.04+dfsg-1~exp3) UNRELEASED; urgency=medium
 
   * Use repacksuffix in watch file to append +dfsg for repacked tarball.
+  * Clean up rules file, changes:
+- Remove .PHONY
+- Rename VER to VERSION
+- Remove unused SVN legacy
+- Add empty lines to improve readability
 
  -- Bas Couwenberg sebas...@xs4all.nl  Mon, 29 Dec 2014 21:09:49 +0100
 
diff --git a/debian/rules b/debian/rules
index 69d21f5..b21b380 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# SVNREPO := http://svn.openstreetmap.org/applications/viewer/jmapviewer/
-
-# SVNREV=$(shell dpkg-parsechangelog | sed -rne 's,^Version: 
.*[+~]svn([0-9]+).*,\1,p')
-
-VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p' | sed 
-e 's/+dfsg//')
-
-# DESTDIR := ../tarballs/jmapviewer-${VER}
-# DESTTGZ := ../tarballs/jmapviewer_${VER}.orig.tar.gz
+VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p' | 
sed -e 's/+dfsg//')
 
 %:
dh $@
@@ -16,25 +9,28 @@ VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: 
([^-]+).*,\1,p' | sed -e
 override_dh_auto_clean:
rm -rf $(CURDIR)/bin/*
-rm -f jmapviewer.1
+
dh_auto_clean
 
 override_dh_auto_build:
xsltproc --nonet \
- --param make.year.ranges 1 \
- --param make.single.year.ranges 1 \
- --param man.charmap.use.subset 0 \
- 
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+--param make.year.ranges 1 \
+--param make.single.year.ranges 1 \
+--param man.charmap.use.subset 0 \
+
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
 debian/jmapviewer.1.xml
+
dh_auto_build -- build pack create_run_jar
 
 override_dh_auto_install:
dh_auto_install
-   install -m 644 $(CURDIR)/JMapViewer.jar 
$(CURDIR)/debian/jmapviewer/usr/share/java/jmapviewer-${VER}.jar
-   dh_link usr/share/java/jmapviewer-${VER}.jar 
usr/share/java/jmapviewer.jar
+
+   install -m 644 $(CURDIR)/JMapViewer.jar 
$(CURDIR)/debian/jmapviewer/usr/share/java/jmapviewer-${VERSION}.jar
+   dh_link usr/share/java/jmapviewer-${VERSION}.jar 
usr/share/java/jmapviewer.jar
+
install -m 644 $(CURDIR)/JMapViewer_Demo.jar 
$(CURDIR)/debian/jmapviewer/usr/share/jmapviewer/JMapViewer_Demo.jar
install -m 755 $(CURDIR)/debian/jmapviewer_demo.sh 
$(CURDIR)/debian/jmapviewer/usr/bin/jmapviewer
 
 get-orig-source:
uscan --verbose --force-download --repack --compress xz --destdir ..
 
-.PHONY: override_dh_auto_clean override_dh_auto_install override_dh_auto_build

-- 
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/01: pristine-tar data for jmapviewer_1.05+dfsg.orig.tar.xz

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch pristine-tar
in repository jmapviewer.

commit 42b0db98b626de91e0ff2c7a2fc88767b3de893f
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Dec 29 21:37:04 2014 +0100

pristine-tar data for jmapviewer_1.05+dfsg.orig.tar.xz
---
 jmapviewer_1.05+dfsg.orig.tar.xz.delta | Bin 0 - 2925 bytes
 jmapviewer_1.05+dfsg.orig.tar.xz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/jmapviewer_1.05+dfsg.orig.tar.xz.delta 
b/jmapviewer_1.05+dfsg.orig.tar.xz.delta
new file mode 100644
index 000..aac3f7c
Binary files /dev/null and b/jmapviewer_1.05+dfsg.orig.tar.xz.delta differ
diff --git a/jmapviewer_1.05+dfsg.orig.tar.xz.id 
b/jmapviewer_1.05+dfsg.orig.tar.xz.id
new file mode 100644
index 000..ffb3479
--- /dev/null
+++ b/jmapviewer_1.05+dfsg.orig.tar.xz.id
@@ -0,0 +1 @@
+cfe1916449787806a8768308c152bc82c81eb514

-- 
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/06: Use repacksuffix in watch file to append +dfsg for repacked tarball.

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository jmapviewer.

commit 6cc067bfcdabc8d5758548079ae56187e9224e62
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Dec 29 21:31:16 2014 +0100

Use repacksuffix in watch file to append +dfsg for repacked tarball.
---
 debian/changelog | 6 ++
 debian/watch | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d316220..fa10e55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jmapviewer (1.04+dfsg-1~exp3) UNRELEASED; urgency=medium
+
+  * Use repacksuffix in watch file to append +dfsg for repacked tarball.
+
+ -- Bas Couwenberg sebas...@xs4all.nl  Mon, 29 Dec 2014 21:09:49 +0100
+
 jmapviewer (1.04+dfsg-1~exp2) experimental; urgency=medium
 
   * Don't hardcode upstream version, extract from changelog.
diff --git a/debian/watch b/debian/watch
index c957579..59026ea 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
+opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,repacksuffix=+dfsg \
 
http://svn.openstreetmap.org/applications/viewer/jmapviewer/releases/(\d+(?:\.\d+)*)/JMapViewer-(\d\S*)-Source\.(?:tar\.(?:gz|bz2|xz)|tgz|tbz2|txz|zip)

-- 
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/06: Set distribution to experimental.

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository jmapviewer.

commit b010df6f59717275addf40f41cfedae903648a97
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Dec 29 21:57:48 2014 +0100

Set distribution to experimental.
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91f9e72..b8ea006 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-jmapviewer (1.05+dfsg-1) UNRELEASED; urgency=medium
+jmapviewer (1.05+dfsg-1~exp1) experimental; urgency=medium
 
   * New upstream release.
   * Use repacksuffix in watch file to append +dfsg for repacked tarball.
@@ -8,7 +8,7 @@ jmapviewer (1.05+dfsg-1) UNRELEASED; urgency=medium
 - Remove unused SVN legacy
 - Add empty lines to improve readability
 
- -- Bas Couwenberg sebas...@xs4all.nl  Mon, 29 Dec 2014 21:38:12 +0100
+ -- Bas Couwenberg sebas...@xs4all.nl  Mon, 29 Dec 2014 21:57:37 +0100
 
 jmapviewer (1.04+dfsg-1~exp2) 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] 04/06: Merge tag 'upstream/1.05+dfsg'

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository jmapviewer.

commit 8c3ffe9baa24912664ed01614204f9079f516634
Merge: 113b137 e97508c
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Dec 29 21:37:04 2014 +0100

Merge tag 'upstream/1.05+dfsg'

Upstream version 1.05+dfsg

 src/org/openstreetmap/gui/jmapviewer/Demo.java |  16 +-
 .../gui/jmapviewer/FeatureAdapter.java |  21 +++
 .../openstreetmap/gui/jmapviewer/JMapViewer.java   | 174 +++-
 .../gui/jmapviewer/MemoryTileCache.java|   7 +-
 .../gui/jmapviewer/OsmFileCacheTileLoader.java | 178 +++--
 .../gui/jmapviewer/OsmTileLoader.java  |   6 +-
 .../gui/jmapviewer/TMSFileCacheTileLoader.java |  76 +
 src/org/openstreetmap/gui/jmapviewer/Tile.java |  55 ---
 .../gui/jmapviewer/TileController.java |   9 +-
 .../gui/jmapviewer/interfaces/TileCache.java   |   5 +
 .../jmapviewer/interfaces/TileLoaderListener.java  |  11 +-
 .../gui/jmapviewer/interfaces/TileSource.java  |  13 +-
 .../tilesources/AbstractMapQuestTileSource.java|   4 +-
 .../tilesources/AbstractOsmTileSource.java |   6 +-
 .../tilesources/AbstractTMSTileSource.java |   9 +-
 .../tilesources/BingAerialTileSource.java  |   9 +-
 .../tilesources/MapQuestOpenAerialTileSource.java  |   2 +-
 .../tilesources/MapQuestOsmTileSource.java |   2 +-
 .../gui/jmapviewer/tilesources/OsmTileSource.java  |   4 +-
 .../jmapviewer/tilesources/ScanexTileSource.java   |   4 +-
 .../gui/jmapviewer/tilesources/TMSTileSource.java  |   9 +-
 .../tilesources/TemplatedTMSTileSource.java|   8 +-
 22 files changed, 390 insertions(+), 238 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] 03/06: Imported Upstream version 1.05+dfsg

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository jmapviewer.

commit e97508c9202e16540cde965fa75b4ca31697c74c
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Dec 29 21:37:04 2014 +0100

Imported Upstream version 1.05+dfsg
---
 src/org/openstreetmap/gui/jmapviewer/Demo.java |  16 +-
 .../gui/jmapviewer/FeatureAdapter.java |  21 +++
 .../openstreetmap/gui/jmapviewer/JMapViewer.java   | 174 +++-
 .../gui/jmapviewer/MemoryTileCache.java|   7 +-
 .../gui/jmapviewer/OsmFileCacheTileLoader.java | 178 +++--
 .../gui/jmapviewer/OsmTileLoader.java  |   6 +-
 .../gui/jmapviewer/TMSFileCacheTileLoader.java |  76 +
 src/org/openstreetmap/gui/jmapviewer/Tile.java |  55 ---
 .../gui/jmapviewer/TileController.java |   9 +-
 .../gui/jmapviewer/interfaces/TileCache.java   |   5 +
 .../jmapviewer/interfaces/TileLoaderListener.java  |  11 +-
 .../gui/jmapviewer/interfaces/TileSource.java  |  13 +-
 .../tilesources/AbstractMapQuestTileSource.java|   4 +-
 .../tilesources/AbstractOsmTileSource.java |   6 +-
 .../tilesources/AbstractTMSTileSource.java |   9 +-
 .../tilesources/BingAerialTileSource.java  |   9 +-
 .../tilesources/MapQuestOpenAerialTileSource.java  |   2 +-
 .../tilesources/MapQuestOsmTileSource.java |   2 +-
 .../gui/jmapviewer/tilesources/OsmTileSource.java  |   4 +-
 .../jmapviewer/tilesources/ScanexTileSource.java   |   4 +-
 .../gui/jmapviewer/tilesources/TMSTileSource.java  |   9 +-
 .../tilesources/TemplatedTMSTileSource.java|   8 +-
 22 files changed, 390 insertions(+), 238 deletions(-)

diff --git a/src/org/openstreetmap/gui/jmapviewer/Demo.java 
b/src/org/openstreetmap/gui/jmapviewer/Demo.java
index d6ae3e8..57ee480 100644
--- a/src/org/openstreetmap/gui/jmapviewer/Demo.java
+++ b/src/org/openstreetmap/gui/jmapviewer/Demo.java
@@ -57,13 +57,9 @@ public class Demo extends JFrame implements 
JMapViewerEventListener  {
 treeMap = new JMapViewerTree(Zones);
 
 // Listen to the map viewer for user operations so components will
-// recieve events and update
+// receive events and update
 map().addJMVListener(this);
 
-// final JMapViewer map = new JMapViewer(new MemoryTileCache(),4);
-// map.setTileLoader(new OsmFileCacheTileLoader(map));
-// new DefaultMapController(map);
-
 setLayout(new BorderLayout());
 setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 setExtendedState(JFrame.MAXIMIZED_BOTH);
@@ -93,8 +89,12 @@ public class Demo extends JFrame implements 
JMapViewerEventListener  {
 map().setDisplayToFitMapMarkers();
 }
 });
-JComboBoxTileSource tileSourceSelector = new JComboBox(new 
TileSource[] { new OsmTileSource.Mapnik(),
-new OsmTileSource.CycleMap(), new BingAerialTileSource(), new 
MapQuestOsmTileSource(), new MapQuestOpenAerialTileSource() });
+JComboBoxTileSource tileSourceSelector = new JComboBox(new 
TileSource[] {
+new OsmTileSource.Mapnik(),
+new OsmTileSource.CycleMap(),
+new BingAerialTileSource(),
+new MapQuestOsmTileSource(),
+new MapQuestOpenAerialTileSource() });
 tileSourceSelector.addItemListener(new ItemListener() {
 public void itemStateChanged(ItemEvent e) {
 map().setTileSource((TileSource) e.getItem());
@@ -148,7 +148,7 @@ public class Demo extends JFrame implements 
JMapViewerEventListener  {
 });
 panelBottom.add(showTileGrid);
 final JCheckBox showZoomControls = new JCheckBox(Show zoom controls);
-showZoomControls.setSelected(map().getZoomContolsVisible());
+showZoomControls.setSelected(map().getZoomControlsVisible());
 showZoomControls.addActionListener(new ActionListener() {
 public void actionPerformed(ActionEvent e) {
 map().setZoomContolsVisible(showZoomControls.isSelected());
diff --git a/src/org/openstreetmap/gui/jmapviewer/FeatureAdapter.java 
b/src/org/openstreetmap/gui/jmapviewer/FeatureAdapter.java
index 24245f9..c048e44 100644
--- a/src/org/openstreetmap/gui/jmapviewer/FeatureAdapter.java
+++ b/src/org/openstreetmap/gui/jmapviewer/FeatureAdapter.java
@@ -6,6 +6,7 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.text.MessageFormat;
+import java.util.logging.Logger;
 
 public class FeatureAdapter {
 
@@ -18,8 +19,13 @@ public class FeatureAdapter {
 // TODO: more i18n functions
 }
 
+public static interface LoggingAdapter {
+Logger getLogger(String name);
+}
+
 private static BrowserAdapter browserAdapter = new DefaultBrowserAdapter();
 private static TranslationAdapter translationAdapter = 

[jmapviewer] 05/06: New upstream release.

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository jmapviewer.

commit 77fcbd14268c91a7eb20c4741bd3b731f10366b9
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Dec 29 21:38:25 2014 +0100

New upstream release.
---
 debian/changelog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1850ac1..91f9e72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-jmapviewer (1.04+dfsg-1~exp3) UNRELEASED; urgency=medium
+jmapviewer (1.05+dfsg-1) UNRELEASED; urgency=medium
 
+  * New upstream release.
   * Use repacksuffix in watch file to append +dfsg for repacked tarball.
   * Clean up rules file, changes:
 - Remove .PHONY
@@ -7,7 +8,7 @@ jmapviewer (1.04+dfsg-1~exp3) UNRELEASED; urgency=medium
 - Remove unused SVN legacy
 - Add empty lines to improve readability
 
- -- Bas Couwenberg sebas...@xs4all.nl  Mon, 29 Dec 2014 21:09:49 +0100
+ -- Bas Couwenberg sebas...@xs4all.nl  Mon, 29 Dec 2014 21:38:12 +0100
 
 jmapviewer (1.04+dfsg-1~exp2) 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] branch pristine-tar updated (8097374 - 42b0db9)

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a change to branch pristine-tar
in repository jmapviewer.

  from  8097374   pristine-tar data for jmapviewer_1.04+dfsg.orig.tar.gz
   new  42b0db9   pristine-tar data for jmapviewer_1.05+dfsg.orig.tar.xz

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:
 jmapviewer_1.05+dfsg.orig.tar.xz.delta | Bin 0 - 2925 bytes
 jmapviewer_1.05+dfsg.orig.tar.xz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 jmapviewer_1.05+dfsg.orig.tar.xz.delta
 create mode 100644 jmapviewer_1.05+dfsg.orig.tar.xz.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] branch upstream updated (efa0a85 - e97508c)

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a change to branch upstream
in repository jmapviewer.

  from  efa0a85   Imported Upstream version 1.04+dfsg
   new  e97508c   Imported Upstream version 1.05+dfsg

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:
 src/org/openstreetmap/gui/jmapviewer/Demo.java |  16 +-
 .../gui/jmapviewer/FeatureAdapter.java |  21 +++
 .../openstreetmap/gui/jmapviewer/JMapViewer.java   | 174 +++-
 .../gui/jmapviewer/MemoryTileCache.java|   7 +-
 .../gui/jmapviewer/OsmFileCacheTileLoader.java | 178 +++--
 .../gui/jmapviewer/OsmTileLoader.java  |   6 +-
 .../gui/jmapviewer/TMSFileCacheTileLoader.java |  76 +
 src/org/openstreetmap/gui/jmapviewer/Tile.java |  55 ---
 .../gui/jmapviewer/TileController.java |   9 +-
 .../gui/jmapviewer/interfaces/TileCache.java   |   5 +
 .../jmapviewer/interfaces/TileLoaderListener.java  |  11 +-
 .../gui/jmapviewer/interfaces/TileSource.java  |  13 +-
 .../tilesources/AbstractMapQuestTileSource.java|   4 +-
 .../tilesources/AbstractOsmTileSource.java |   6 +-
 .../tilesources/AbstractTMSTileSource.java |   9 +-
 .../tilesources/BingAerialTileSource.java  |   9 +-
 .../tilesources/MapQuestOpenAerialTileSource.java  |   2 +-
 .../tilesources/MapQuestOsmTileSource.java |   2 +-
 .../gui/jmapviewer/tilesources/OsmTileSource.java  |   4 +-
 .../jmapviewer/tilesources/ScanexTileSource.java   |   4 +-
 .../gui/jmapviewer/tilesources/TMSTileSource.java  |   9 +-
 .../tilesources/TemplatedTMSTileSource.java|   8 +-
 22 files changed, 390 insertions(+), 238 deletions(-)
 create mode 100644 
src/org/openstreetmap/gui/jmapviewer/TMSFileCacheTileLoader.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
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[jmapviewer] annotated tag upstream/1.05+dfsg created (now d40631e)

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a change to annotated tag upstream/1.05+dfsg
in repository jmapviewer.

at  d40631e   (tag)
   tagging  e97508c9202e16540cde965fa75b4ca31697c74c (commit)
  replaces  upstream/1.04+dfsg
 tagged by  Bas Couwenberg
on  Mon Dec 29 21:37:04 2014 +0100

- Log -
Upstream version 1.05+dfsg

Bas Couwenberg (1):
  Imported Upstream version 1.05+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


Bug#774168: RFS: jmapviewer/1.05+dfsg-1~exp1

2014-12-29 Thread Bas Couwenberg
Package: sponsorship-requests
Severity: normal

Dear mentors,

I am looking for a sponsor for my package jmapviewer

 Package name: jmapviewer
 Version : 1.05+dfsg-1~exp1
 Upstream Author : Jan Peter Stotz and others
 URL : https://wiki.openstreetmap.org/wiki/JMapViewer
 License : GPL-2+
 Section : utils

It builds those binary packages:

 jmapviewer - Java OpenStreetMap Tile Viewer

To access further information about this package, please visit the following 
URL:

http://mentors.debian.net/package/jmapviewer


Alternatively, one can download the package with dget using this command:

  dget -x 
http://mentors.debian.net/debian/pool/main/j/jmapviewer/jmapviewer_1.05+dfsg-1~exp1.dsc

More information about JMapViewer can be obtained from 
https://wiki.openstreetmap.org/wiki/JMapViewer.

Changes since the last upload:

  * New upstream release.
  * Use repacksuffix in watch file to append +dfsg for repacked tarball.
  * Clean up rules file, changes:
- Remove .PHONY
- Rename VER to VERSION
- Remove unused SVN legacy
- Add empty lines to improve readability


Regards,
 Bas Couwenberg

___
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.05+dfsg-1~exp1_amd64.changes

2014-12-29 Thread Debian FTP Masters
jmapviewer_1.05+dfsg-1~exp1_amd64.changes uploaded successfully to localhost
along with the files:
  jmapviewer_1.05+dfsg-1~exp1.dsc
  jmapviewer_1.05+dfsg.orig.tar.xz
  jmapviewer_1.05+dfsg-1~exp1.debian.tar.xz
  jmapviewer_1.05+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] tag debian/1.05+dfsg-1.exp1 created (now b010df6)

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a change to tag debian/1.05+dfsg-1.exp1
in repository jmapviewer.

at  b010df6   (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.05+dfsg-1~exp1_amd64.changes ACCEPTED into experimental

2014-12-29 Thread Debian FTP Masters


Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Format: 1.8
Date: Mon, 29 Dec 2014 21:57:37 +0100
Source: jmapviewer
Binary: jmapviewer
Architecture: source all
Version: 1.05+dfsg-1~exp1
Distribution: experimental
Urgency: medium
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Changed-By: Bas Couwenberg sebas...@xs4all.nl
Description:
 jmapviewer - Java OpenStreetMap Tile Viewer
Changes:
 jmapviewer (1.05+dfsg-1~exp1) experimental; urgency=medium
 .
   * New upstream release.
   * Use repacksuffix in watch file to append +dfsg for repacked tarball.
   * Clean up rules file, changes:
 - Remove .PHONY
 - Rename VER to VERSION
 - Remove unused SVN legacy
 - Add empty lines to improve readability
Checksums-Sha1:
 070f72e2f2c6c4864e2ea1a3eaaffd91956f6456 2125 jmapviewer_1.05+dfsg-1~exp1.dsc
 eac92d26d72775db6497f9289c6562d6ee7f4780 56616 jmapviewer_1.05+dfsg.orig.tar.xz
 2ca2c19b9e38b94e73c6f2f96ca6fc35e80aff2c 6432 
jmapviewer_1.05+dfsg-1~exp1.debian.tar.xz
 8cdc9b685a6484bb420a5b13d90783895138c51c 139540 
jmapviewer_1.05+dfsg-1~exp1_all.deb
Checksums-Sha256:
 7b083dca1717374aa4e76d0afa20efbd185c469fed63f1aa1d5940546405065e 2125 
jmapviewer_1.05+dfsg-1~exp1.dsc
 1f82a2f2811d66b748a3318da72e1f5aaf42b7988bc71732ebc78f472bdb95b5 56616 
jmapviewer_1.05+dfsg.orig.tar.xz
 b7a3564052f7098240d9b10287277110cc914f629bd42eba4b768e7d385fc43b 6432 
jmapviewer_1.05+dfsg-1~exp1.debian.tar.xz
 84f0acb4b843b463ce899a535fcd34730daffbf02263c148e685dfa2820d7084 139540 
jmapviewer_1.05+dfsg-1~exp1_all.deb
Files:
 9ac75ec4f1306eb1d1818802e37697ed 2125 utils optional 
jmapviewer_1.05+dfsg-1~exp1.dsc
 dd66c57093ab654f83d350cd79b1bbfa 56616 utils optional 
jmapviewer_1.05+dfsg.orig.tar.xz
 67af6a2df28e658a8da6ce4eb7698d9c 6432 utils optional 
jmapviewer_1.05+dfsg-1~exp1.debian.tar.xz
 b8ec42aa1e2a461f090987cb644ab60f 139540 utils optional 
jmapviewer_1.05+dfsg-1~exp1_all.deb

-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAEBCAAGBQJUocbMAAoJEFeKBJTRxkbRsuwP+weZaYpl8G/CqW2TWvCMytin
CdZIFsTc9LEbmTOhDHcC82tYMNw1Z721J7tf+vHYJ28x1IlKZ4YulBUN1fUBqmY1
KGkhp/oKtF4tj0sShynDXEPMzGa8+KisJsBXJvWnON2tMO+E/0KgJ5+XDGBYr4Hu
Zm4RaW29NgKGn9lPTuBUV7tC2o5TQ9u4FGK/6Nt9mwwmXJDWy1lD0JM0GWkKzivY
ZoiyRDCP8QPG8tS6Lrpj3qqetMalgnPwkf1MafR+QNGzJr+ekaqKchPCX/vTgqa5
CYSoQiTTGAs/DzN3CW+yW2Ok7c35/wPx2SqKjK+srXyd9AnlHWjyGbRR5+n57qUB
ivVEyCxfYZQK7ZettJ6Qg5FqBY52Gs48o248SFkFsMP4KAE8OwMNRTADzV90Pj0t
34a8WoWi5WltZOPqfKiez3P+HQnJWYDU5hcCsRNzLWndS2SQyCt6fI9PYihTM+Hr
8DcbCQKP38V+72VPWXBYewXkujDeIi1TlMNOfnlrJkBz9igoS8ZKuxyDBIPAHuPN
+gwRRfqbSCZmWycR5mFNUA8q3WXxtzmQf+HFXyba3uwolA5dEL7dYN/GT1Sri7nq
YDYoJaM2UQFMmqJog/v3KUWJoPAnUaFnbHRJ3dcAS2+ZzuMDjhimv1b0p+M9mg4Q
VnEF8zU9+Tzmb8Ixp5HG
=QC3I
-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] branch master updated (4d9600f - 68a6eeb)

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a change to branch master
in repository josm.

  from  4d9600f   Set distribution to experimental.
   new  4adb53e   Imported Upstream version 0.0.svn7906+dfsg1
   new  5119e8f   Merge tag 'upstream/0.0.svn7906+dfsg1'
   new  776b61b   New tested snapshot.
   new  3eb0c70   Add (build) dependency on libcommons-compress-java, its 
bzip2 support is now used instead of Apache Ant.
   new  0b3b11b   Install upstream man page.
   new  c2bebcf   Also remove Windows installer from upstream tarball.
   new  e0e   Imported Upstream version 0.0.svn7906+dfsg2
   new  d5537fd   Merge tag 'upstream/0.0.svn7906+dfsg2'
   new  385632b   New repackaged tested snapshot.
   new  bceb3bd   Refresh patches.
   new  68a6eeb   Bump minimum requires jmapviewer version to 1.05, JOSM 
uses the TMSFileCacheTileLoader class introduced in JMapViewer 1.05.

The 11 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:
 .classpath |4 +-
 CONTRIBUTION   |4 +-
 README |   34 +-
 REVISION   |8 +-
 build.xml  |   16 +-
 data/defaultpresets.xml|  102 +-
 data/validator/combinations.mapcss |   22 +-
 data/validator/deprecated.mapcss   |   19 +-
 data/validator/geometry.mapcss |   49 +
 data/validator/highway.mapcss  |   29 +-
 data/validator/multiple.mapcss |   35 +-
 data/validator/numeric.mapcss  |   15 +-
 debian/changelog   |   13 +
 debian/control |6 +-
 debian/josm.1  |   79 -
 debian/josm.manpages   |2 +-
 debian/patches/00-build.patch  |   26 +-
 debian/patches/02-elemstyles.patch |4 +-
 debian/patches/04-use_system_jmapviewer.patch  |2 +-
 debian/patches/05-fix_version.patch|2 +-
 debian/patches/06-move_data_out_of_jar.patch   |   21 +-
 debian/rules   |2 +
 i18n/launchpad.pl  |6 +-
 i18n/po/af.po  |  188 +-
 i18n/po/am.po  |  188 +-
 i18n/po/ar.po  |  190 +-
 i18n/po/ast.po | 2894 +
 i18n/po/az.po  |  188 +-
 i18n/po/be.po  |  188 +-
 i18n/po/bg.po  |  192 +-
 i18n/po/bn.po  |  188 +-
 i18n/po/br.po  |  188 +-
 i18n/po/bs.po  |  188 +-
 i18n/po/ca.po  |  233 +-
 i18n/po/c...@valencia.po |  206 +-
 i18n/po/cs.po  |  229 +-
 i18n/po/cy.po  |  188 +-
 i18n/po/da.po  | 1723 +-
 i18n/po/de.po  |  242 +-
 i18n/po/de_DE.po   |  188 +-
 i18n/po/el.po  |  196 +-
 i18n/po/en_AU.po   |  196 +-
 i18n/po/en_CA.po   |  188 +-
 i18n/po/en_GB.po   |  210 +-
 i18n/po/eo.po  |  190 +-
 i18n/po/es.po  |  269 +-
 i18n/po/et.po  |  190 +-
 i18n/po/eu.po  |  194 +-
 i18n/po/fa.po  |  188 +-
 i18n/po/fi.po  |  204 +-
 i18n/po/fil.po |  188 +-
 i18n/po/fr.po  |  224 +-
 i18n/po/gl.po  |  198 +-
 i18n/po/he.po  |  190 +-
 i18n/po/hi.po  |  188 +-
 i18n/po/hr.po  |  188 +-
 i18n/po/ht.po  |  188 +-
 i18n/po/hu.po  |  208 +-
 i18n/po/hy.po  |  188 +-
 i18n/po/ia.po  |  188 +-
 i18n/po/id.po   

[josm] 05/11: Install upstream man page.

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository josm.

commit 0b3b11b19da674e037067e1c4296261b8a7a401d
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Dec 29 22:27:17 2014 +0100

Install upstream man page.
---
 debian/changelog |  1 +
 debian/josm.1| 79 
 debian/josm.manpages |  2 +-
 3 files changed, 2 insertions(+), 80 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index baa27f2..936af94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ josm (0.0.svn7906+dfsg1-1) UNRELEASED; urgency=medium
   * New tested snapshot.
   * Add (build) dependency on libcommons-compress-java,
 its bzip2 support is now used instead of Apache Ant.
+  * Install upstream man page.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Mon, 29 Dec 2014 22:04:46 +0100
 
diff --git a/debian/josm.1 b/debian/josm.1
deleted file mode 100644
index ca89779..000
--- a/debian/josm.1
+++ /dev/null
@@ -1,79 +0,0 @@
-.TH JOSM 1 December 26, 2012
-.\ Please adjust this date whenever revising the manpage.
-.SH NAME
-josm \- Java OpenStreetMap Editor
-.SH SYNOPSIS
-.B josm
-.SH DESCRIPTION
-.B josm 
-is an extensible editor for OpenStreetMap written in Java 6.
-.PP
-\fBOpenStreetMap\fR is a project aimed squarely at creating and providing
-free geographic data such as street maps to anyone who wants them. It
-allows you to view, edit and use geographical data in a collaborative way
-from anywhere on Earth.
-.PP
-The project was started because most maps you think of as free actually
-have legal or technical restrictions on their use, holding back people
-from using them in creative, productive or unexpected ways.
-.SH OPTIONS
-.TP
-.B \-h, \-?, \-\-help
-Show help.
-.TP
-.B \-\-version
-Display the JOSM version and exit.
-.TP
-\fB\-\-geometry=\fIwidth\fBx\fIheight\fB(+|-)x(+|-)y\fR
-Standard X geometry argument.
-.TP
-\fB[\-\-download=]\fIminlat\fB,\fIminlon\fB,\fImaxlat\fB,maxlon\fR
-Download the bounding box.
-.TP
-\fB[\-\-download=]\fIurl\fR
-Download the location at the url (with lat=xlon=yzoom=z).
-.TP
-\fB[\-\-download=]\fIfilename\fR
-Open a file (any filetype that can be opened with File/Open from the GUI).
-.TP
-\fB\-\-downloadgps=\fIminlat\fB,\fIminlon\fB,\fImaxlat\fB,\fImaxlon\fR
-Download the bounding box as raw GPS.
-.TP
-\fB\-\-selection=\fIsearchstring\fR
-Select with the given search.
-.TP
-.B \-\-[no\-]maximize
-Launch in maximized (or minimized) mode.
-.TP
-.B \-\-reset\-preferences
-Reset the preferences to the default.
-.TP
-\fB\-\-load\-preferences=\fIurl\fR
-Load preferences from the given \fIurl\fR (in XML format).
-.TP
-\fB\-\-set=\fIkey\fB=\fIvalue\fR
-Set the preference \fIkey\fR to \fIvalue\fR.
-.TP
-\fB\-\-language=\fIlanguage\fR
-Set the language.
-.SH JAVA PROPERTIES
-The following options can be set by using Java system properties (i.e. 
\-Dkey=value
-passed to \fBjava\fR, or specified inside \fBJAVA_OPTS\fR).
-.TP
-\fBjosm.home=\fIpath\fR
-Set the JOSM home directory to \fIpath\fR. This will contain all user settings.
-Default is \fI~/.josm/\fR.
-.SH ENVIRONMENT
-.IP JAVA_HOME
-Specify an alternate Java environment.
-.IP JAVA_OPTS
-Specify Java options.
-For example, to use a HTTP proxy server with this program, set this 
environment variable
-to something like \fIJAVA_OPTS=\-Dhttp.proxyHost=yourProxyURL\fR before 
starting josm.
-.SH AUTHOR
-josm was written by Immanuel Scholz.
-The current maintainer is Dirk Stöcker.
-.PP
-This manual page was written by Andreas Putzo andr...@putzo.net and David 
Paleino
-da...@debian.org, and is licensed under the same terms of JOSM itself 
(currently,
-the GNU General Public License, version 3 or later).
diff --git a/debian/josm.manpages b/debian/josm.manpages
index d4321c9..c0c9621 100644
--- a/debian/josm.manpages
+++ b/debian/josm.manpages
@@ -1 +1 @@
-debian/josm.1
+linux/tested/usr/share/man/man1/josm.1

-- 
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/11: Also remove Windows installer from upstream tarball.

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository josm.

commit c2bebcfef0552140d95cb70622aad6de1309c1e1
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Dec 29 22:39:50 2014 +0100

Also remove Windows installer from upstream tarball.
---
 debian/changelog | 1 +
 debian/rules | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 936af94..06c6145 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ josm (0.0.svn7906+dfsg1-1) UNRELEASED; urgency=medium
   * Add (build) dependency on libcommons-compress-java,
 its bzip2 support is now used instead of Apache Ant.
   * Install upstream man page.
+  * Also remove Windows installer from upstream tarball.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Mon, 29 Dec 2014 22:04:46 +0100
 
diff --git a/debian/rules b/debian/rules
index 0d717df..627d7d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,6 +91,8 @@ get-orig-source:
rm -fr ${DESTDIR}/src/org/json/
@echo Removing embedded fonts
rm -fr ${DESTDIR}/data/fonts/
+   @echo Removing Windows installer
+   rm -fr ${DESTDIR}/windows/
@echo Building snapshot tarball
tar czf ${DESTTGZ} -C `dirname ${DESTDIR}` `basename ${DESTDIR}`
@echo Cleaning up

-- 
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/11: Merge tag 'upstream/0.0.svn7906+dfsg2'

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository josm.

commit d5537fd6e5f45ef7c5a5289b93ee64b39c123174
Merge: c2bebcf e0e
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Dec 29 22:44:56 2014 +0100

Merge tag 'upstream/0.0.svn7906+dfsg2'

Upstream version 0.0.svn7906+dfsg2

 windows/README.txt |  66 --
 windows/josm-nsis-brand.bmp| Bin 154542 - 0 bytes
 windows/josm-setup-unix.sh | 151 
 windows/josm.nsi   | 471 ---
 windows/langmacros.nsh |  84 --
 windows/launch4j.xml   |  35 -
 windows/locale/english.nsh |  51 --
 windows/locale/french.nsh  |  51 --
 windows/locale/german.nsh  |  51 --
 windows/logo.ico   | Bin 370070 - 0 bytes
 .../plugins/stdutils/Contrib/StdUtils/ComUtils.h   |  96 ---
 .../stdutils/Contrib/StdUtils/DetectOsVersion.cpp  | 294 ---
 .../stdutils/Contrib/StdUtils/DetectOsVersion.h|  26 -
 .../stdutils/Contrib/StdUtils/InvokeShellVerb.cpp  | 258 --
 .../stdutils/Contrib/StdUtils/InvokeShellVerb.h|  26 -
 .../stdutils/Contrib/StdUtils/ParameterParser.cpp  | 152 
 .../stdutils/Contrib/StdUtils/ParameterParser.h|  23 -
 .../plugins/stdutils/Contrib/StdUtils/RandUtils.h  | 101 ---
 .../stdutils/Contrib/StdUtils/ShellExecAsUser.cpp  | 189 -
 .../stdutils/Contrib/StdUtils/ShellExecAsUser.h|  26 -
 .../plugins/stdutils/Contrib/StdUtils/StdUtils.aps | Bin 18740 - 0 bytes
 .../plugins/stdutils/Contrib/StdUtils/StdUtils.cpp | 921 -
 .../plugins/stdutils/Contrib/StdUtils/StdUtils.h   |  43 -
 .../plugins/stdutils/Contrib/StdUtils/StdUtils.rc  | Bin 4986 - 0 bytes
 .../plugins/stdutils/Contrib/StdUtils/StdUtils.sln |  22 -
 .../stdutils/Contrib/StdUtils/StdUtils.vcxproj | 205 -
 .../Contrib/StdUtils/StdUtils.vcxproj.filters  |  63 --
 .../Contrib/StdUtils/StdUtils.vcxproj.user |   7 -
 .../stdutils/Contrib/StdUtils/UnicodeSupport.cpp   |  96 ---
 .../stdutils/Contrib/StdUtils/UnicodeSupport.h |  47 --
 .../Contrib/StdUtils/include/ansi/nsis/api.h   |  83 --
 .../Contrib/StdUtils/include/ansi/nsis/pluginapi.h |  77 --
 .../Contrib/StdUtils/include/common/msvc_utils.h   |  55 --
 .../Contrib/StdUtils/include/unicode/nsis/api.h|  83 --
 .../StdUtils/include/unicode/nsis/nsis_tchar.h | 214 -
 .../StdUtils/include/unicode/nsis/pluginapi.h  | 101 ---
 .../stdutils/Contrib/StdUtils/lib/msvcrt_vc6.lib   | Bin 235942 - 0 bytes
 .../Contrib/StdUtils/lib/nsis_pluginapi_ansi.lib   | Bin 4668 - 0 bytes
 .../StdUtils/lib/nsis_pluginapi_unicode.lib| Bin 6902 - 0 bytes
 .../plugins/stdutils/Contrib/StdUtils/resource.h   |  26 -
 .../stdutils/Contrib/StdUtils/utils/Date.exe   | Bin 39424 - 0 bytes
 .../stdutils/Contrib/StdUtils/utils/Zip.exe| Bin 68096 - 0 bytes
 .../plugins/stdutils/Docs/StdUtils/StdUtils.html   | 752 -
 .../plugins/stdutils/Examples/StdUtils/!_Make.bat  |  29 -
 .../stdutils/Examples/StdUtils/GetParameters.nsi   |  38 -
 .../stdutils/Examples/StdUtils/InvokeShellVerb.nsi |  53 --
 .../stdutils/Examples/StdUtils/ShellExecAsUser.nsi |  29 -
 .../stdutils/Examples/StdUtils/ShellExecWait.nsi   |  44 -
 .../stdutils/Examples/StdUtils/StdUtilsTest.nsi| 399 -
 windows/plugins/stdutils/Include/StdUtils.nsh  | 301 ---
 windows/plugins/stdutils/LGPL.txt  | 502 ---
 windows/plugins/stdutils/LGPL_EXCEPTION.txt|   4 -
 .../stdutils/Plugins/Release_ANSI/StdUtils.dll | Bin 22016 - 0 bytes
 .../stdutils/Plugins/Release_Unicode/StdUtils.dll  | Bin 23040 - 0 bytes
 windows/plugins/stdutils/ReadMe.txt|  30 -
 windows/plugins/stdutils/make_pack.bat |  54 --
 windows/plugins/stdutils/make_pack.lst |  13 -
 57 files changed, 6442 deletions(-)

-- 
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/11: Refresh patches.

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository josm.

commit bceb3bded673c0328dce8467e18fbd022eb4e0ee
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Dec 29 23:06:05 2014 +0100

Refresh patches.
---
 debian/changelog  |  1 +
 debian/patches/00-build.patch | 26 ++
 debian/patches/02-elemstyles.patch|  4 ++--
 debian/patches/04-use_system_jmapviewer.patch |  2 +-
 debian/patches/05-fix_version.patch   |  2 +-
 debian/patches/06-move_data_out_of_jar.patch  | 21 +++--
 6 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 74718d9..5df365d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ josm (0.0.svn7906+dfsg2-1) UNRELEASED; urgency=medium
 its bzip2 support is now used instead of Apache Ant.
   * Install upstream man page.
   * Also remove Windows installer from upstream tarball.
+  * Refresh patches.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Mon, 29 Dec 2014 22:04:46 +0100
 
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 6012beb..3170b63 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -21,7 +21,7 @@ JARs and not depend on Internet connection.
  property name=imagerytypes.dir 
location=${src.dir}/org/openstreetmap/josm/data/imagery/types/
  !-- build parameter: compression level (ant -Dclevel=N)
   N ranges from 0 (no compression) to 9 (maximum compression)
-@@ -25,6 +26,19 @@
+@@ -25,6 +26,20 @@
  condition property=isWindows
  os family=Windows/
  /condition
@@ -34,6 +34,7 @@ JARs and not depend on Internet connection.
 +include name=signpost-core.jar/
 +include name=ant.jar/
 +include name=commons-codec.jar/
++include name=commons-compress.jar/
 +include name=jmapviewer.jar/
 +/fileset
 +/path
@@ -41,7 +42,7 @@ JARs and not depend on Internet connection.
  
  !--
** Used by Eclipse ant builder for updating
-@@ -71,10 +85,9 @@
+@@ -71,10 +86,9 @@
  !--
** Creates the REVISION file to be included in the distribution
  --
@@ -54,7 +55,7 @@ JARs and not depend on Internet connection.
  tstamp
  format property=build.tstamp pattern=-MM-dd HH:mm:ss/
  /tstamp
-@@ -87,6 +100,7 @@
+@@ -87,6 +101,7 @@
  Revision: ${version.entry.commit.revision}
  Is-Local-Build: true
  Build-Date: ${build.tstamp}
@@ -62,7 +63,7 @@ JARs and not depend on Internet connection.
  /echo
  /target
  !--
-@@ -106,7 +120,8 @@ Build-Date: ${build.tstamp}
+@@ -106,7 +121,8 @@ Build-Date: ${build.tstamp}
  copy file=README todir=build/
  copy file=LICENSE todir=build/
  !-- create josm-custom.jar --
@@ -72,7 +73,7 @@ JARs and not depend on Internet connection.
  jar destfile=dist/josm-custom.jar basedir=build 
level=${clevel}
  !-- add attribute excludes=**/*BZip2*,**/*Bzip2* to create a 
non-bzip2 supporting jar --
  manifest
-@@ -116,6 +131,8 @@ Build-Date: ${build.tstamp}
+@@ -116,6 +132,8 @@ Build-Date: ${build.tstamp}
  attribute name=Permissions value=all-permissions/
  attribute name=Codebase value=josm.openstreetmap.de/
  attribute name=Application-Name value=JOSM - Java 
OpenStreetMap Editor/
@@ -81,7 +82,7 @@ JARs and not depend on Internet connection.
  /manifest
  zipfileset dir=images prefix=images/
  zipfileset dir=data prefix=data/
-@@ -179,10 +196,7 @@ Build-Date: ${build.tstamp}
+@@ -186,10 +204,7 @@ Build-Date: ${build.tstamp}
  /target
  target name=javacc depends=init unless=javacc.notRequired
  mkdir dir=${mapcss.dir}/parsergen/
@@ -93,12 +94,13 @@ JARs and not depend on Internet connection.
  arg value=-DEBUG_PARSER=false/
  arg value=-DEBUG_TOKEN_MANAGER=false/
  arg value=-JDK_VERSION=1.7/
-@@ -207,14 +221,10 @@ Build-Date: ${build.tstamp}
+@@ -214,15 +229,10 @@ Build-Date: ${build.tstamp}
  /exec
  /target
  target name=compile depends=init,javacc,jaxb
 -!-- COTS --
--javac srcdir=${src.dir} 
includes=com/**,oauth/**,org/apache/commons/codec/**,org/glassfish/** 
nowarn=on
+-javac srcdir=${src.dir} 
includes=com/**,oauth/**,org/apache/commons/**,org/glassfish/** nowarn=on
+-

[josm] 02/11: Merge tag 'upstream/0.0.svn7906+dfsg1'

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository josm.

commit 5119e8f9cea64c8f3ff74dff9dc459c11a73ba1b
Merge: 4d9600f 4adb53e
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Dec 29 22:02:09 2014 +0100

Merge tag 'upstream/0.0.svn7906+dfsg1'

Upstream version 0.0.svn7906+dfsg1

 .classpath |4 +-
 CONTRIBUTION   |4 +-
 README |   34 +-
 REVISION   |8 +-
 build.xml  |   16 +-
 data/defaultpresets.xml|  102 +-
 data/validator/combinations.mapcss |   22 +-
 data/validator/deprecated.mapcss   |   19 +-
 data/validator/geometry.mapcss |   49 +
 data/validator/highway.mapcss  |   29 +-
 data/validator/multiple.mapcss |   35 +-
 data/validator/numeric.mapcss  |   15 +-
 i18n/launchpad.pl  |6 +-
 i18n/po/af.po  |  188 +-
 i18n/po/am.po  |  188 +-
 i18n/po/ar.po  |  190 +-
 i18n/po/ast.po | 2894 +
 i18n/po/az.po  |  188 +-
 i18n/po/be.po  |  188 +-
 i18n/po/bg.po  |  192 +-
 i18n/po/bn.po  |  188 +-
 i18n/po/br.po  |  188 +-
 i18n/po/bs.po  |  188 +-
 i18n/po/ca.po  |  233 +-
 i18n/po/c...@valencia.po |  206 +-
 i18n/po/cs.po  |  229 +-
 i18n/po/cy.po  |  188 +-
 i18n/po/da.po  | 1723 +-
 i18n/po/de.po  |  242 +-
 i18n/po/de_DE.po   |  188 +-
 i18n/po/el.po  |  196 +-
 i18n/po/en_AU.po   |  196 +-
 i18n/po/en_CA.po   |  188 +-
 i18n/po/en_GB.po   |  210 +-
 i18n/po/eo.po  |  190 +-
 i18n/po/es.po  |  269 +-
 i18n/po/et.po  |  190 +-
 i18n/po/eu.po  |  194 +-
 i18n/po/fa.po  |  188 +-
 i18n/po/fi.po  |  204 +-
 i18n/po/fil.po |  188 +-
 i18n/po/fr.po  |  224 +-
 i18n/po/gl.po  |  198 +-
 i18n/po/he.po  |  190 +-
 i18n/po/hi.po  |  188 +-
 i18n/po/hr.po  |  188 +-
 i18n/po/ht.po  |  188 +-
 i18n/po/hu.po  |  208 +-
 i18n/po/hy.po  |  188 +-
 i18n/po/ia.po  |  188 +-
 i18n/po/id.po  |  206 +-
 i18n/po/is.po  |  190 +-
 i18n/po/it.po  |  211 +-
 i18n/po/ja.po  |  212 +-
 i18n/po/ka.po  |  188 +-
 i18n/po/km.po  | 3354 
 i18n/po/ko.po  |  188 +-
 i18n/po/ky.po  |  188 +-
 i18n/po/lo.po  |  188 +-
 i18n/po/lt.po  |  196 +-
 i18n/po/lv.po  |  188 +-
 i18n/po/mk.po  |  188 +-
 i18n/po/ms.po  |  188 +-
 i18n/po/nb.po  |  192 +-
 i18n/po/nds.po |  188 +-
 i18n/po/nl.po  |  210 +-
 i18n/po/nn.po  |  188 +-
 i18n/po/oc.po  |  188 +-
 i18n/po/pa.po  |  188 +-
 i18n/po/pl.po  |  362 ++-
 i18n/po/pt.po  |  206 +-
 i18n/po/pt_BR.po   |  235 +-
 i18n/po/rm.po  |  188 +-
 i18n/po/ro.po  

[josm] branch pristine-tar updated (9d5090f - a189013)

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a change to branch pristine-tar
in repository josm.

  from  9d5090f   pristine-tar data for josm_0.0.svn7778+dfsg1.orig.tar.gz
   new  bb073c8   pristine-tar data for josm_0.0.svn7906+dfsg1.orig.tar.gz
   new  a189013   pristine-tar data for josm_0.0.svn7906+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.svn7906+dfsg1.orig.tar.gz.delta | Bin 0 - 104767 bytes
 josm_0.0.svn7906+dfsg1.orig.tar.gz.id|   1 +
 josm_0.0.svn7906+dfsg2.orig.tar.gz.delta | Bin 0 - 104800 bytes
 josm_0.0.svn7906+dfsg2.orig.tar.gz.id|   1 +
 4 files changed, 2 insertions(+)
 create mode 100644 josm_0.0.svn7906+dfsg1.orig.tar.gz.delta
 create mode 100644 josm_0.0.svn7906+dfsg1.orig.tar.gz.id
 create mode 100644 josm_0.0.svn7906+dfsg2.orig.tar.gz.delta
 create mode 100644 josm_0.0.svn7906+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] 03/11: New tested snapshot.

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository josm.

commit 776b61b13db556aa33728bc262e554b9959afdf1
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Dec 29 22:16:15 2014 +0100

New tested snapshot.
---
 debian/changelog | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f86470c..a441115 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn7906+dfsg1-1) UNRELEASED; urgency=medium
+
+  * New tested snapshot.
+
+ -- Bas Couwenberg sebas...@xs4all.nl  Mon, 29 Dec 2014 22:04:46 +0100
+
 josm (0.0.svn7778+dfsg1-1~exp2) experimental; urgency=medium
 
   * Add alternative dependency on minimum required JRE.

-- 
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] 11/11: Bump minimum requires jmapviewer version to 1.05, JOSM uses the TMSFileCacheTileLoader class introduced in JMapViewer 1.05.

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository josm.

commit 68a6eeb9bf986387b67cd196cffcc5cd34eadb18
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Dec 30 00:05:19 2014 +0100

Bump minimum requires jmapviewer version to 1.05, JOSM uses the 
TMSFileCacheTileLoader class introduced in JMapViewer 1.05.
---
 debian/changelog | 2 ++
 debian/control   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5df365d..e8fb3c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ josm (0.0.svn7906+dfsg2-1) UNRELEASED; urgency=medium
   * Install upstream man page.
   * Also remove Windows installer from upstream tarball.
   * Refresh patches.
+  * Bump minimum requires jmapviewer version to 1.05, JOSM uses the
+TMSFileCacheTileLoader class introduced in JMapViewer 1.05.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Mon, 29 Dec 2014 22:04:46 +0100
 
diff --git a/debian/control b/debian/control
index 4e9dcb2..c344c59 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends: ant,
libsvgsalamander-java,
libterm-readkey-perl,
libandroid-json-org-java,
-   jmapviewer (= 1.02+svn30322.really+dfsg1)
+   jmapviewer (= 1.05)
 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
@@ -39,7 +39,7 @@ Depends: default-jre | java7-runtime,
  openstreetmap-map-icons-classic,
  ant,
  libandroid-json-org-java,
- jmapviewer (= 1.02+svn30322.really+dfsg1),
+ jmapviewer (= 1.05),
  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] 09/11: New repackaged tested snapshot.

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository josm.

commit 385632bc29a0d1d396b79b149fa34d039e954721
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Dec 29 22:45:32 2014 +0100

New repackaged tested snapshot.
---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 06c6145..74718d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-josm (0.0.svn7906+dfsg1-1) UNRELEASED; urgency=medium
+josm (0.0.svn7906+dfsg2-1) UNRELEASED; urgency=medium
 
   * New tested snapshot.
   * Add (build) dependency on libcommons-compress-java,

-- 
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/11: Add (build) dependency on libcommons-compress-java, its bzip2 support is now used instead of Apache Ant.

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository josm.

commit 3eb0c701b3060b243475795519ed578d90c96454
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Dec 29 22:18:21 2014 +0100

Add (build) dependency on libcommons-compress-java, its bzip2 support is 
now used instead of Apache Ant.
---
 debian/changelog | 2 ++
 debian/control   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a441115..baa27f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 josm (0.0.svn7906+dfsg1-1) UNRELEASED; urgency=medium
 
   * New tested snapshot.
+  * Add (build) dependency on libcommons-compress-java,
+its bzip2 support is now used instead of Apache Ant.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Mon, 29 Dec 2014 22:04:46 +0100
 
diff --git a/debian/control b/debian/control
index 4747628..4e9dcb2 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends: ant,
gettext,
default-jdk,
libcommons-codec-java,
+   libcommons-compress-java,
libgettext-commons-java (= 0.9.6),
libmetadata-extractor-java (= 2.6.4),
libgettext-ant-tasks-java,
@@ -30,6 +31,7 @@ Package: josm
 Architecture: all
 Depends: default-jre | java7-runtime,
  libcommons-codec-java,
+ libcommons-compress-java,
  libgettext-commons-java (= 0.9.6),
  libmetadata-extractor-java (= 2.6.4),
  liboauth-signpost-java (= 1.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] 02/02: pristine-tar data for josm_0.0.svn7906+dfsg2.orig.tar.gz

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch pristine-tar
in repository josm.

commit a18901372f8922de969d1c6bb11afad98faf2dca
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Dec 29 22:44:56 2014 +0100

pristine-tar data for josm_0.0.svn7906+dfsg2.orig.tar.gz
---
 josm_0.0.svn7906+dfsg2.orig.tar.gz.delta | Bin 0 - 104800 bytes
 josm_0.0.svn7906+dfsg2.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/josm_0.0.svn7906+dfsg2.orig.tar.gz.delta 
b/josm_0.0.svn7906+dfsg2.orig.tar.gz.delta
new file mode 100644
index 000..7193377
Binary files /dev/null and b/josm_0.0.svn7906+dfsg2.orig.tar.gz.delta differ
diff --git a/josm_0.0.svn7906+dfsg2.orig.tar.gz.id 
b/josm_0.0.svn7906+dfsg2.orig.tar.gz.id
new file mode 100644
index 000..56a1c78
--- /dev/null
+++ b/josm_0.0.svn7906+dfsg2.orig.tar.gz.id
@@ -0,0 +1 @@
+5f31ec7cc48fe05e749f3ff6bf85ad6350cf8994

-- 
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.svn7906+dfsg2 created (now 28fa477)

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a change to annotated tag upstream/0.0.svn7906+dfsg2
in repository josm.

at  28fa477   (tag)
   tagging  e0eff098872ab15b2e7c92823a4419bc9c47 (commit)
  replaces  upstream/0.0.svn7906+dfsg1
 tagged by  Bas Couwenberg
on  Mon Dec 29 22:44:56 2014 +0100

- Log -
Upstream version 0.0.svn7906+dfsg2

Bas Couwenberg (1):
  Imported Upstream version 0.0.svn7906+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] 01/02: pristine-tar data for josm_0.0.svn7906+dfsg1.orig.tar.gz

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch pristine-tar
in repository josm.

commit bb073c82a71b339a4b6592d7db31155d50ca2b12
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Dec 29 22:02:08 2014 +0100

pristine-tar data for josm_0.0.svn7906+dfsg1.orig.tar.gz
---
 josm_0.0.svn7906+dfsg1.orig.tar.gz.delta | Bin 0 - 104767 bytes
 josm_0.0.svn7906+dfsg1.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/josm_0.0.svn7906+dfsg1.orig.tar.gz.delta 
b/josm_0.0.svn7906+dfsg1.orig.tar.gz.delta
new file mode 100644
index 000..835613e
Binary files /dev/null and b/josm_0.0.svn7906+dfsg1.orig.tar.gz.delta differ
diff --git a/josm_0.0.svn7906+dfsg1.orig.tar.gz.id 
b/josm_0.0.svn7906+dfsg1.orig.tar.gz.id
new file mode 100644
index 000..2438ad0
--- /dev/null
+++ b/josm_0.0.svn7906+dfsg1.orig.tar.gz.id
@@ -0,0 +1 @@
+700485be3cf8bb871fdd6c20aeed5e288bd59b12

-- 
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 upstream updated (94c0380 - 0000e0e)

2014-12-29 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a change to branch upstream
in repository josm.

  from  94c0380   Imported Upstream version 0.0.svn7778+dfsg1
   new  4adb53e   Imported Upstream version 0.0.svn7906+dfsg1
   new  e0e   Imported Upstream version 0.0.svn7906+dfsg2

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:
 .classpath |4 +-
 CONTRIBUTION   |4 +-
 README |   34 +-
 REVISION   |8 +-
 build.xml  |   16 +-
 data/defaultpresets.xml|  102 +-
 data/validator/combinations.mapcss |   22 +-
 data/validator/deprecated.mapcss   |   19 +-
 data/validator/geometry.mapcss |   49 +
 data/validator/highway.mapcss  |   29 +-
 data/validator/multiple.mapcss |   35 +-
 data/validator/numeric.mapcss  |   15 +-
 i18n/launchpad.pl  |6 +-
 i18n/po/af.po  |  188 +-
 i18n/po/am.po  |  188 +-
 i18n/po/ar.po  |  190 +-
 i18n/po/ast.po | 2894 +
 i18n/po/az.po  |  188 +-
 i18n/po/be.po  |  188 +-
 i18n/po/bg.po  |  192 +-
 i18n/po/bn.po  |  188 +-
 i18n/po/br.po  |  188 +-
 i18n/po/bs.po  |  188 +-
 i18n/po/ca.po  |  233 +-
 i18n/po/c...@valencia.po |  206 +-
 i18n/po/cs.po  |  229 +-
 i18n/po/cy.po  |  188 +-
 i18n/po/da.po  | 1723 +-
 i18n/po/de.po  |  242 +-
 i18n/po/de_DE.po   |  188 +-
 i18n/po/el.po  |  196 +-
 i18n/po/en_AU.po   |  196 +-
 i18n/po/en_CA.po   |  188 +-
 i18n/po/en_GB.po   |  210 +-
 i18n/po/eo.po  |  190 +-
 i18n/po/es.po  |  269 +-
 i18n/po/et.po  |  190 +-
 i18n/po/eu.po  |  194 +-
 i18n/po/fa.po  |  188 +-
 i18n/po/fi.po  |  204 +-
 i18n/po/fil.po |  188 +-
 i18n/po/fr.po  |  224 +-
 i18n/po/gl.po  |  198 +-
 i18n/po/he.po  |  190 +-
 i18n/po/hi.po  |  188 +-
 i18n/po/hr.po  |  188 +-
 i18n/po/ht.po  |  188 +-
 i18n/po/hu.po  |  208 +-
 i18n/po/hy.po  |  188 +-
 i18n/po/ia.po  |  188 +-
 i18n/po/id.po  |  206 +-
 i18n/po/is.po  |  190 +-
 i18n/po/it.po  |  211 +-
 i18n/po/ja.po  |  212 +-
 i18n/po/ka.po  |  188 +-
 i18n/po/km.po  | 3354 
 i18n/po/ko.po  |  188 +-
 i18n/po/ky.po  |  188 +-
 i18n/po/lo.po  |  188 +-
 i18n/po/lt.po  |  196 +-
 i18n/po/lv.po  |  188 +-
 i18n/po/mk.po  |  188 +-
 i18n/po/ms.po  |  188 +-
 i18n/po/nb.po  |  192 +-
 i18n/po/nds.po |  188 +-
 i18n/po/nl.po  |  210 +-
 i18n/po/nn.po  |  188 +-
 i18n/po/oc.po  |  188 +-
 i18n/po/pa.po  |  188 +-
 i18n/po/pl.po  |  362 ++-
 i18n/po/pt.po