date:20151103

grass_7.0.2~rc2-1~exp1_amd64.changes ACCEPTED into experimental

2015-11-03 Thread Debian FTP Masters



Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Format: 1.8
Date: Tue, 03 Nov 2015 12:42:11 +0100
Source: grass
Binary: grass grass-core grass-gui grass-doc grass-dev-doc grass-dev
Architecture: source amd64 all
Version: 7.0.2~rc2-1~exp1
Distribution: experimental
Urgency: medium
Maintainer: Debian GIS Project 
Changed-By: Bas Couwenberg 
Description:
 grass  - Geographic Resources Analysis Support System (GRASS GIS)
 grass-core - GRASS GIS core components
 grass-dev  - GRASS GIS development files
 grass-dev-doc - GRASS GIS Programmers' Manual
 grass-doc  - GRASS GIS user documentation
 grass-gui  - GRASS GIS graphical user interfaces
Changes:
 grass (7.0.2~rc2-1~exp1) experimental; urgency=medium
 .
   * New upstream release candidate.
   * Use desktop file in favor of menu file per CTTE #741573.
   * Drop various-typos.patch, applied upstream.
Checksums-Sha1:
 7304e755aeb9452a5f209be08b439ff72dd82ad0 2798 grass_7.0.2~rc2-1~exp1.dsc
 602f90a4a5cbb37f92d887e842abfbf12d4ae2be 38068692 grass_7.0.2~rc2.orig.tar.gz
 a5c9865df3a0876d35e73af2a0dff0323ee02f31 27980 
grass_7.0.2~rc2-1~exp1.debian.tar.xz
 a0ff0ef732141de2ca6316f8588bf01502fa3e88 7214812 
grass-core_7.0.2~rc2-1~exp1_amd64.deb
 d4449729030eaf4e98967aaf0cb72252ea4e730b 15777562 
grass-dev-doc_7.0.2~rc2-1~exp1_all.deb
 08df431d20aa49ac6cb54bf4f75aa813cdd19d96 194878 
grass-dev_7.0.2~rc2-1~exp1_amd64.deb
 028d0508a097d1a3f43c3ed2ba8b92fc14c41d88 17052992 
grass-doc_7.0.2~rc2-1~exp1_all.deb
 b75e8025100925fd4e488660d0becd45ad5ae7be 1931356 
grass-gui_7.0.2~rc2-1~exp1_amd64.deb
 46e34e004462e2d604323974a1390f3a2781d616 17380 grass_7.0.2~rc2-1~exp1_all.deb
Checksums-Sha256:
 a8c24575160cd03f278f8af52c5408284202e8450a7f350b10d4db0e9a215a66 2798 
grass_7.0.2~rc2-1~exp1.dsc
 21c3d05653bf1848a69c6b41215864fafdbd9d986c780c5b008ee112cde82b76 38068692 
grass_7.0.2~rc2.orig.tar.gz
 482c6a52ebfcb21c5186431180ede22b760e9b1ac4bf3a99c09f2f039e006485 27980 
grass_7.0.2~rc2-1~exp1.debian.tar.xz
 d84e7e65bdc09411bc2a750c682b9840d3e93c4c549e5065c33527eff39a022f 7214812 
grass-core_7.0.2~rc2-1~exp1_amd64.deb
 6de27246bc57d196efa5e377eb836237fa9adce3d6416bb4fa531e010ae14be0 15777562 
grass-dev-doc_7.0.2~rc2-1~exp1_all.deb
 b619580ae0ad26861159275f68b7759141de5e3e63e2e563d482381eb31d7a40 194878 
grass-dev_7.0.2~rc2-1~exp1_amd64.deb
 6d00476c301a7592db32383bcd9377cc41d5e9b4b088a0830dd445c1da3e4c85 17052992 
grass-doc_7.0.2~rc2-1~exp1_all.deb
 6861c29a15b9f78fa39e57c6629cfd6c87663d59184126c8f13f777b474e623f 1931356 
grass-gui_7.0.2~rc2-1~exp1_amd64.deb
 0d6492a83faa17d55de3af7578a6222e49180bb7aca1ae7ec9eac67694eb3cf6 17380 
grass_7.0.2~rc2-1~exp1_all.deb
Files:
 f0f534b3218d8df2baa013478e64239d 2798 science optional 
grass_7.0.2~rc2-1~exp1.dsc
 72830fc34c43cb448621a8ffdbf7bba1 38068692 science optional 
grass_7.0.2~rc2.orig.tar.gz
 c626b030ebf2907b66b0c6e0638d0f2e 27980 science optional 
grass_7.0.2~rc2-1~exp1.debian.tar.xz
 01469b9259a1e700bae923e5c3990c54 7214812 science optional 
grass-core_7.0.2~rc2-1~exp1_amd64.deb
 c7ec4d512d9d75b1adcf6c4fc74fa844 15777562 doc optional 
grass-dev-doc_7.0.2~rc2-1~exp1_all.deb
 e1c595429592384d80f0edcaf0e94af4 194878 devel optional 
grass-dev_7.0.2~rc2-1~exp1_amd64.deb
 58e3bac7f43566b970810c04dfdb70cf 17052992 doc optional 
grass-doc_7.0.2~rc2-1~exp1_all.deb
 0c7651e0fa62623fc9342ba511ac892a 1931356 science optional 
grass-gui_7.0.2~rc2-1~exp1_amd64.deb
 19cb5c86965bccdb9835f0dd7a67ce95 17380 metapackages optional 
grass_7.0.2~rc2-1~exp1_all.deb

-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAEBCgAGBQJWOKK4AAoJEGdQ8QrojUrx514P/3X5KdNAOqMpUvNZUjhqZvLD
KYU4uxtKHHfFFLl0/6zqkEhD17TZmzutHncsfPsxqbNvyMPrl0QenSU0lTnzSHs8
Z4kCe6E6wUaAGqAkwjzp7NO7QT1gdMMLY14Lw/1DCMwikWsenSm+sD2EthQF3Xt0
USIHBbIg3177SUp2LsbNNS2TwQNfd9orqMD8j1iJWza1QF+wy1BWSBcp2dewxzaS
MD3UpoHTKFx5FTTlfdTj9GpHwElwdqEOZoezo30m3+mhLIPRNH8BHf4SwR3MHWt6
UPFWnmiMzPYZ5dUJ7QVn3gEv2tZiUV4xI3EEzCr77ALQb0ttIeQu7g+VqUJ69Bn3
NVAa5u8lBMBzINvGiFA/jQFFh5Z5mM2HgQJFNvxO0+crDIuoBIKGQ8s/mUlLkmtN
LKVFOXZA6pAWo07IKFQAt9EuuudNFRGJt1zYRsGxwqqC6k2V3w1HKnojHEIhre8e
4n2JhrB/l4w6GkePW13YinKhQ0GLZmqzNhU5yQtEK6uqwiCYbp2FEaijmVOU3Dex
CsOEUoIn3C4ltf1r2jBNAJof7AApj1HC40J3obfadkH3phmyDVnt0J56zlY4/PxX
UAScAwel5YlYl7WPd1I58MJtn5GMLRJhTcym/JA6kwepFUwxZUKC89e9s/7LHrRb
2+Ribes2RsfuHy2smAnA
=5n8b
-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

[grass] 01/01: pristine-tar data for grass_7.0.2~rc2.orig.tar.gz

2015-11-03 Thread Sebastiaan Couwenberg

This is an automated email from the git hooks/post-receive script.

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

commit 9de66da8382060cc3f9e8db8c2158e9c87e44483
Author: Bas Couwenberg 
Date:   Tue Nov 3 12:11:37 2015 +0100

pristine-tar data for grass_7.0.2~rc2.orig.tar.gz
---
 grass_7.0.2~rc2.orig.tar.gz.delta | Bin 0 -> 247464 bytes
 grass_7.0.2~rc2.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/grass_7.0.2~rc2.orig.tar.gz.delta 
b/grass_7.0.2~rc2.orig.tar.gz.delta
new file mode 100644
index 000..af4dab7
Binary files /dev/null and b/grass_7.0.2~rc2.orig.tar.gz.delta differ
diff --git a/grass_7.0.2~rc2.orig.tar.gz.id b/grass_7.0.2~rc2.orig.tar.gz.id
new file mode 100644
index 000..eee09ad
--- /dev/null
+++ b/grass_7.0.2~rc2.orig.tar.gz.id
@@ -0,0 +1 @@
+b007dc0b78d8b49740b9666ac1efb8d33b8f5c09

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

[grass] branch experimental updated (1c42c5f -> 1a308ed)

2015-11-03 Thread Sebastiaan Couwenberg

This is an automated email from the git hooks/post-receive script.

sebastic pushed a change to branch experimental
in repository grass.

  from  1c42c5f   Use desktop file in favor of menu file per CTTE #741573.
   new  83308c9   Imported Upstream version 7.0.2~rc2
   new  9f408a1   Merge tag 'upstream/7.0.2_rc2' into experimental
   new  fc0ba91   New upstream release candidate.
   new  b77b8e7   Drop various-typos.patch, applied upstream.
   new  1a308ed   Set distribution to experimental.

The 5 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:
 ChangeLog_7.0.2RC1.gz  | Bin 807802 -> 0 bytes
 ChangeLog_7.0.2RC2.gz  | Bin 0 -> 809698 bytes
 db/drivers/dbf/column.c|   2 +-
 db/drivers/ogr/select.c|   2 +-
 db/drivers/postgres/db.c   |   4 +-
 debian/changelog   |   6 +-
 debian/control |   2 +-
 debian/patches/series  |   1 -
 debian/patches/various-typos.patch | 669 -
 doc/howto_release.txt  |  10 +-
 gui/wxpython/core/workspace.py |   5 +
 gui/wxpython/docs/wxGUI.iscatt.html|   4 +-
 gui/wxpython/gmodeler/dialogs.py   |   5 +-
 gui/wxpython/iscatt/controllers.py |   4 +-
 gui/wxpython/mapdisp/main.py   |   2 +-
 gui/wxpython/nviz/mapwindow.py |   2 +-
 gui/wxpython/vnet/toolbars.py  |  12 +
 gui/wxpython/vnet/vnet_core.py |   2 +-
 gui/wxpython/vnet/vnet_data.py |  24 +-
 gui/wxpython/wxplot/histogram.py   |   3 +
 gui/wxpython/wxplot/scatter.py |   8 +-
 gui/wxpython/xml/menudata.README   |  11 +-
 gui/wxpython/xml/toolboxes.xml |   6 +
 imagery/i.landsat.toar/landsat_met.c   |   4 +-
 imagery/i.modis.qc/main.c  |  80 ++-
 imagery/i.ortho.photo/i.ortho.rectify/cp.c |   4 +-
 imagery/i.ortho.photo/i.ortho.rectify/target.c |   2 +-
 imagery/i.ortho.photo/lib/camera.c |   2 +-
 imagery/i.ortho.photo/lib/conz_points.c|  10 +-
 imagery/i.ortho.photo/lib/fopen_camera.c   |   2 +-
 imagery/i.ortho.photo/lib/init_info.c  |   6 +-
 imagery/i.ortho.photo/lib/m_mult.c |   2 +-
 imagery/i.ortho.photo/lib/open_camera.c|   2 +-
 imagery/i.ortho.photo/lib/ref_points.c |   6 +-
 imagery/i.rectify/cp.c |   2 +-
 imagery/i.rectify/target.c |   2 +-
 include/VERSION|   2 +-
 lib/gis/parser_standard_options.c  |   4 +-
 lib/init/grass7.html   |   4 +-
 lib/python/docs/Makefile   |   2 +
 lib/python/docs/conf.py|   5 +-
 lib/python/pygrass/utils.py|   2 +-
 lib/raster3d/test/test_put_get_value_large_file.c  |   1 +
 lib/temporal/lib/connect.c |   8 +-
 lib/vector/Vlib/dgraph.h   |   2 +-
 lib/vector/Vlib/write_nat.c|   2 +-
 lib/vector/vectorlib.dox   |   2 +-
 lib/vector/vectorlib_lists.dox |   2 +-
 lib/vector/vectorlib_pg.dox|   2 +-
 locale/po/grassmods_it.po  |   2 +-
 locale/po/grasswxpy_cs.po  |   4 +-
 locale/po/grasswxpy_de.po  |   4 +-
 locale/po/grasswxpy_el.po  |   4 +-
 locale/po/grasswxpy_es.po  |   4 +-
 locale/po/grasswxpy_fi.po  |   4 +-
 locale/po/grasswxpy_fr.po  |   4 +-
 locale/po/grasswxpy_id.po  |   4 +-
 locale/po/grasswxpy_it.po  |   4 +-
 locale/po/grasswxpy_ja.po  |   4 +-
 locale/po/grasswxpy_ko.po  |   4 +-
 locale/po/grasswxpy_lv.po  |   4 +-
 locale/po/grasswxpy_ml.po  |   4 +-
 locale/po/grasswxpy_pl.po  |   4 +-
 locale/po/grasswxpy_pt.po  |   4 +-
 locale/po/grasswxpy_pt_br.po   |   4 +-
 locale/po/grasswxpy_ro.po  |   4 +-
 locale/po/grasswxpy_ru.po  |   4 +-
 locale/po/grasswxpy_th.po  |   4 +-
 locale/po/grasswxpy_tr.po

[grass] 02/05: Merge tag 'upstream/7.0.2_rc2' into experimental

2015-11-03 Thread Sebastiaan Couwenberg

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository grass.

commit 9f408a18c928a6360a0920bfb111508a6bf84930
Merge: 1c42c5f 83308c9
Author: Bas Couwenberg 
Date:   Tue Nov 3 12:11:38 2015 +0100

Merge tag 'upstream/7.0.2_rc2' into experimental

Upstream version 7.0.2~rc2

 ChangeLog_7.0.2RC1.gz  | Bin 807802 -> 0 bytes
 ChangeLog_7.0.2RC2.gz  | Bin 0 -> 809698 bytes
 db/drivers/dbf/column.c|   2 +-
 db/drivers/ogr/select.c|   2 +-
 db/drivers/postgres/db.c   |   4 +-
 doc/howto_release.txt  |  10 +--
 gui/wxpython/core/workspace.py |   5 ++
 gui/wxpython/docs/wxGUI.iscatt.html|   4 +-
 gui/wxpython/gmodeler/dialogs.py   |   5 +-
 gui/wxpython/iscatt/controllers.py |   4 +-
 gui/wxpython/mapdisp/main.py   |   2 +-
 gui/wxpython/nviz/mapwindow.py |   2 +-
 gui/wxpython/vnet/toolbars.py  |  12 
 gui/wxpython/vnet/vnet_core.py |   2 +-
 gui/wxpython/vnet/vnet_data.py |  24 +--
 gui/wxpython/wxplot/histogram.py   |   3 +
 gui/wxpython/wxplot/scatter.py |   8 ++-
 gui/wxpython/xml/menudata.README   |  11 ++-
 gui/wxpython/xml/toolboxes.xml |   6 ++
 imagery/i.landsat.toar/landsat_met.c   |   4 +-
 imagery/i.modis.qc/main.c  |  80 -
 imagery/i.ortho.photo/i.ortho.rectify/cp.c |   4 +-
 imagery/i.ortho.photo/i.ortho.rectify/target.c |   2 +-
 imagery/i.ortho.photo/lib/camera.c |   2 +-
 imagery/i.ortho.photo/lib/conz_points.c|  10 +--
 imagery/i.ortho.photo/lib/fopen_camera.c   |   2 +-
 imagery/i.ortho.photo/lib/init_info.c  |   6 +-
 imagery/i.ortho.photo/lib/m_mult.c |   2 +-
 imagery/i.ortho.photo/lib/open_camera.c|   2 +-
 imagery/i.ortho.photo/lib/ref_points.c |   6 +-
 imagery/i.rectify/cp.c |   2 +-
 imagery/i.rectify/target.c |   2 +-
 include/VERSION|   2 +-
 lib/gis/parser_standard_options.c  |   4 +-
 lib/init/grass7.html   |   4 +-
 lib/python/docs/Makefile   |   2 +
 lib/python/docs/conf.py|   5 +-
 lib/python/pygrass/utils.py|   2 +-
 lib/raster3d/test/test_put_get_value_large_file.c  |   1 +
 lib/temporal/lib/connect.c |   8 ++-
 lib/vector/Vlib/dgraph.h   |   2 +-
 lib/vector/Vlib/write_nat.c|   2 +-
 lib/vector/vectorlib.dox   |   2 +-
 lib/vector/vectorlib_lists.dox |   2 +-
 lib/vector/vectorlib_pg.dox|   2 +-
 locale/po/grassmods_it.po  |   2 +-
 locale/po/grasswxpy_cs.po  |   4 +-
 locale/po/grasswxpy_de.po  |   4 +-
 locale/po/grasswxpy_el.po  |   4 +-
 locale/po/grasswxpy_es.po  |   4 +-
 locale/po/grasswxpy_fi.po  |   4 +-
 locale/po/grasswxpy_fr.po  |   4 +-
 locale/po/grasswxpy_id.po  |   4 +-
 locale/po/grasswxpy_it.po  |   4 +-
 locale/po/grasswxpy_ja.po  |   4 +-
 locale/po/grasswxpy_ko.po  |   4 +-
 locale/po/grasswxpy_lv.po  |   4 +-
 locale/po/grasswxpy_ml.po  |   4 +-
 locale/po/grasswxpy_pl.po  |   4 +-
 locale/po/grasswxpy_pt.po  |   4 +-
 locale/po/grasswxpy_pt_br.po   |   4 +-
 locale/po/grasswxpy_ro.po  |   4 +-
 locale/po/grasswxpy_ru.po  |   4 +-
 locale/po/grasswxpy_th.po  |   4 +-
 locale/po/grasswxpy_tr.po  |   4 +-
 locale/po/grasswxpy_vi.po  |   4 +-
 locale/po/grasswxpy_zh.po  |   4 +-
 man/build_html.py  |   2 +-
 mswindows/GRASS-Installer.nsi.tmpl |   4 +-
 mswindows/env.bat  |   2 +-
 mswindows/osgeo4w/env.bat.tmpl |   2 +-
 mswindows/osgeo4w/postinstall.bat  |  18 +
 raster/r.carve/enforce_ds.c|   1 +
 raster/r.external.out/r.external.out.html  |  23 +++---
 raster/r.external/proj.c

[grass] branch pristine-tar updated (9b38c8e -> 9de66da)

2015-11-03 Thread Sebastiaan Couwenberg

This is an automated email from the git hooks/post-receive script.

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

  from  9b38c8e   pristine-tar data for grass_7.0.2~rc1.orig.tar.gz
   new  9de66da   pristine-tar data for grass_7.0.2~rc2.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:
 grass_7.0.2~rc2.orig.tar.gz.delta | Bin 0 -> 247464 bytes
 grass_7.0.2~rc2.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 grass_7.0.2~rc2.orig.tar.gz.delta
 create mode 100644 grass_7.0.2~rc2.orig.tar.gz.id

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

[grass] 05/05: Set distribution to experimental.

2015-11-03 Thread Sebastiaan Couwenberg

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository grass.

commit 1a308ed8f20c30f14bb335d499f989a1e499f5f3
Author: Bas Couwenberg 
Date:   Tue Nov 3 12:42:28 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 344bc79..c45fdc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-grass (7.0.2~rc2-1~exp1) UNRELEASED; urgency=medium
+grass (7.0.2~rc2-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.
   * Use desktop file in favor of menu file per CTTE #741573.
   * Drop various-typos.patch, applied upstream.
 
- -- Bas Couwenberg   Tue, 03 Nov 2015 12:11:52 +0100
+ -- Bas Couwenberg   Tue, 03 Nov 2015 12:42:11 +0100
 
 grass (7.0.2~rc1-1~exp1) experimental; urgency=medium
 

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

[grass] 03/05: New upstream release candidate.

2015-11-03 Thread Sebastiaan Couwenberg

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository grass.

commit fc0ba91e6af9dd1117d86dd9a4d49c78c07c458d
Author: Bas Couwenberg 
Date:   Tue Nov 3 12:12:33 2015 +0100

New upstream release candidate.
---
 debian/changelog | 5 +++--
 debian/control   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f47450f..834ba6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-grass (7.0.2~rc1-1~exp2) UNRELEASED; urgency=medium
+grass (7.0.2~rc2-1~exp1) UNRELEASED; urgency=medium
 
+  * New upstream release candidate.
   * Use desktop file in favor of menu file per CTTE #741573.
 
- -- Bas Couwenberg   Thu, 22 Oct 2015 21:38:14 +0200
+ -- Bas Couwenberg   Tue, 03 Nov 2015 12:11:52 +0100
 
 grass (7.0.2~rc1-1~exp1) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index 0ed93c3..67ab837 100644
--- a/debian/control
+++ b/debian/control
@@ -106,7 +106,7 @@ Suggests: grass-doc,
 Breaks: grass (<< 6.4.2-1~)
 Conflicts: grass70-core,
grass7-core
-Provides: grass702-1,
+Provides: grass702-2,
   grass70-core,
   grass7-core
 Replaces: grass70-core,

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

[grass] branch upstream updated (bec3b37 -> 83308c9)

2015-11-03 Thread Sebastiaan Couwenberg

This is an automated email from the git hooks/post-receive script.

sebastic pushed a change to branch upstream
in repository grass.

  from  bec3b37   Imported Upstream version 7.0.2~rc1
   new  83308c9   Imported Upstream version 7.0.2~rc2

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:
 ChangeLog_7.0.2RC1.gz  | Bin 807802 -> 0 bytes
 ChangeLog_7.0.2RC2.gz  | Bin 0 -> 809698 bytes
 db/drivers/dbf/column.c|   2 +-
 db/drivers/ogr/select.c|   2 +-
 db/drivers/postgres/db.c   |   4 +-
 doc/howto_release.txt  |  10 +--
 gui/wxpython/core/workspace.py |   5 ++
 gui/wxpython/docs/wxGUI.iscatt.html|   4 +-
 gui/wxpython/gmodeler/dialogs.py   |   5 +-
 gui/wxpython/iscatt/controllers.py |   4 +-
 gui/wxpython/mapdisp/main.py   |   2 +-
 gui/wxpython/nviz/mapwindow.py |   2 +-
 gui/wxpython/vnet/toolbars.py  |  12 
 gui/wxpython/vnet/vnet_core.py |   2 +-
 gui/wxpython/vnet/vnet_data.py |  24 +--
 gui/wxpython/wxplot/histogram.py   |   3 +
 gui/wxpython/wxplot/scatter.py |   8 ++-
 gui/wxpython/xml/menudata.README   |  11 ++-
 gui/wxpython/xml/toolboxes.xml |   6 ++
 imagery/i.landsat.toar/landsat_met.c   |   4 +-
 imagery/i.modis.qc/main.c  |  80 -
 imagery/i.ortho.photo/i.ortho.rectify/cp.c |   4 +-
 imagery/i.ortho.photo/i.ortho.rectify/target.c |   2 +-
 imagery/i.ortho.photo/lib/camera.c |   2 +-
 imagery/i.ortho.photo/lib/conz_points.c|  10 +--
 imagery/i.ortho.photo/lib/fopen_camera.c   |   2 +-
 imagery/i.ortho.photo/lib/init_info.c  |   6 +-
 imagery/i.ortho.photo/lib/m_mult.c |   2 +-
 imagery/i.ortho.photo/lib/open_camera.c|   2 +-
 imagery/i.ortho.photo/lib/ref_points.c |   6 +-
 imagery/i.rectify/cp.c |   2 +-
 imagery/i.rectify/target.c |   2 +-
 include/VERSION|   2 +-
 lib/gis/parser_standard_options.c  |   4 +-
 lib/init/grass7.html   |   4 +-
 lib/python/docs/Makefile   |   2 +
 lib/python/docs/conf.py|   5 +-
 lib/python/pygrass/utils.py|   2 +-
 lib/raster3d/test/test_put_get_value_large_file.c  |   1 +
 lib/temporal/lib/connect.c |   8 ++-
 lib/vector/Vlib/dgraph.h   |   2 +-
 lib/vector/Vlib/write_nat.c|   2 +-
 lib/vector/vectorlib.dox   |   2 +-
 lib/vector/vectorlib_lists.dox |   2 +-
 lib/vector/vectorlib_pg.dox|   2 +-
 locale/po/grassmods_it.po  |   2 +-
 locale/po/grasswxpy_cs.po  |   4 +-
 locale/po/grasswxpy_de.po  |   4 +-
 locale/po/grasswxpy_el.po  |   4 +-
 locale/po/grasswxpy_es.po  |   4 +-
 locale/po/grasswxpy_fi.po  |   4 +-
 locale/po/grasswxpy_fr.po  |   4 +-
 locale/po/grasswxpy_id.po  |   4 +-
 locale/po/grasswxpy_it.po  |   4 +-
 locale/po/grasswxpy_ja.po  |   4 +-
 locale/po/grasswxpy_ko.po  |   4 +-
 locale/po/grasswxpy_lv.po  |   4 +-
 locale/po/grasswxpy_ml.po  |   4 +-
 locale/po/grasswxpy_pl.po  |   4 +-
 locale/po/grasswxpy_pt.po  |   4 +-
 locale/po/grasswxpy_pt_br.po   |   4 +-
 locale/po/grasswxpy_ro.po  |   4 +-
 locale/po/grasswxpy_ru.po  |   4 +-
 locale/po/grasswxpy_th.po  |   4 +-
 locale/po/grasswxpy_tr.po  |   4 +-
 locale/po/grasswxpy_vi.po  |   4 +-
 locale/po/grasswxpy_zh.po  |   4 +-
 man/build_html.py  |   2 +-
 mswindows/GRASS-Installer.nsi.tmpl |   4 +-
 mswindows/env.bat  |   2 +-
 mswindows/osgeo4w/env.bat.tmpl |   2 +-
 mswindows/osgeo4w/postinstall.bat  |  18 +
 raster/r.carve/enforce_ds.c

Processing of grass_7.0.2~rc2-1~exp1_amd64.changes

2015-11-03 Thread Debian FTP Masters

grass_7.0.2~rc2-1~exp1_amd64.changes uploaded successfully to localhost
along with the files:
  grass_7.0.2~rc2-1~exp1.dsc
  grass_7.0.2~rc2.orig.tar.gz
  grass_7.0.2~rc2-1~exp1.debian.tar.xz
  grass-core_7.0.2~rc2-1~exp1_amd64.deb
  grass-dev-doc_7.0.2~rc2-1~exp1_all.deb
  grass-dev_7.0.2~rc2-1~exp1_amd64.deb
  grass-doc_7.0.2~rc2-1~exp1_all.deb
  grass-gui_7.0.2~rc2-1~exp1_amd64.deb
  grass_7.0.2~rc2-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

[grass] 04/05: Drop various-typos.patch, applied upstream.

2015-11-03 Thread Sebastiaan Couwenberg

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository grass.

commit b77b8e7ce4d48b65c17c21d727d774501a6c6936
Author: Bas Couwenberg 
Date:   Tue Nov 3 12:18:47 2015 +0100

Drop various-typos.patch, applied upstream.
---
 debian/changelog   |   1 +
 debian/patches/series  |   1 -
 debian/patches/various-typos.patch | 669 -
 3 files changed, 1 insertion(+), 670 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 834ba6b..344bc79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ grass (7.0.2~rc2-1~exp1) UNRELEASED; urgency=medium
 
   * New upstream release candidate.
   * Use desktop file in favor of menu file per CTTE #741573.
+  * Drop various-typos.patch, applied upstream.
 
  -- Bas Couwenberg   Tue, 03 Nov 2015 12:11:52 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 8c61877..64733d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,4 @@ instdir
 no-fail-html.patch
 desktop.patch
 appstream.patch
-various-typos.patch
 ctte-741573.patch
diff --git a/debian/patches/various-typos.patch 
b/debian/patches/various-typos.patch
deleted file mode 100644
index 2f75b51..000
--- a/debian/patches/various-typos.patch
+++ /dev/null
@@ -1,669 +0,0 @@
-Description: Fix various typos.
- 'allows to ' -> 'allows ing'
- 'Ouput'-> 'Output'
- 'bellow'   -> 'below'
-Author: Bas Couwenberg 
-Forwarded: https://trac.osgeo.org/grass/ticket/2776
-Applied-Upstream: https://trac.osgeo.org/grass/changeset/66568
-
 a/gui/wxpython/docs/wxGUI.iscatt.html
-+++ b/gui/wxpython/docs/wxGUI.iscatt.html
-@@ -5,7 +5,7 @@
- 
- Interactive Scatter Plot Tool allows analyzing group of raster
- maps. The tool is integrated into 
--Supervised Classification Tool (see the screen shot bellow).
-+Supervised Classification Tool (see the screen shot below).
- Also it is possible to launch it from Map Display Window (Analyze map
-  Interactive Scatter Plot Tool).
- 
 a/gui/wxpython/iscatt/controllers.py
-+++ b/gui/wxpython/iscatt/controllers.py
-@@ -228,7 +228,7 @@ class ScattsManager:
-  message=_("Number of cells (rows*cols) <%d> in current 
region is "
-"higher than recommended threshold <%d>.\n"
-"It is strongly advised to reduce number of 
cells "
--   "in current region bellow recommend 
threshold.\n "
-+   "in current region below recommend 
threshold.\n "
-"It can be done by  command.\n\n" 
-"Do you want to continue using "
-"Interactive Scatter Plot Tool with this 
region?" 
-@@ -314,7 +314,7 @@ class ScattsManager:
-  message=_("Multiple of bands ranges <%s:%d * %s:%d = %d> 
" 
-"is higher than recommended limit <%d>.\n" 
-"It is strongly advised to reduce range extend 
of bands" 
--   "(e. g. using r.rescale) bellow recommended 
threshold.\n\n"
-+   "(e. g. using r.rescale) below recommended 
threshold.\n\n"
-"Do you really want to add this scatter plot?" 
- % (b_1_name, b_1_i['range'], b_1_name, 
b_2_i['range'], 
-mrange, WARN_SCATT_SIZE)), 
 a/lib/gis/parser_standard_options.c
-+++ b/lib/gis/parser_standard_options.c
-@@ -25,7 +25,7 @@
-   parameter opt.
- 
-   Valid parameters are defined by the STD_OPT enum in the file gis.h.
--  A list of valid parameter values sorted to groups is bellow.
-+  A list of valid parameter values sorted to groups is below.
- 
-   This function allocates memory for the Option structure and returns a
-   pointer to this memory.
-@@ -889,7 +889,7 @@ struct Option *G_define_standard_option(
-   \brief Create standardised Flag structure.
-   
-   This function will create a standardised Flag structure defined by
--  parameter flag. A list of valid parameters bellow. It
-+  parameter flag. A list of valid parameters below. It
-   allocates memory for the Flag structure and returns a pointer to
-   this memory.
-   
 a/lib/init/grass7.html
-+++ b/lib/init/grass7.html
-@@ -223,7 +223,7 @@ script. The script file must have its ex
- grass70 -text
-  Start GRASS using the text-based user interface. Appropriate
- location and mapset must be set by environmental variables (see
--examples bellow) otherwise taken from the last GRASS session.
-+examples below) otherwise taken from the last GRASS session.
- 
- grass70 -gtext
-  Start GRASS using the text-based user interface. The user will be
 a/lib/vector/Vlib/dgraph.h
-+++

[grass] tag debian/7.0.2.rc2-1.exp1 created (now 1a308ed)

2015-11-03 Thread Sebastiaan Couwenberg

This is an automated email from the git hooks/post-receive script.

sebastic pushed a change to tag debian/7.0.2.rc2-1.exp1
in repository grass.

at  1a308ed   (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/grass.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

[grass] annotated tag upstream/7.0.2_rc2 created (now 190839b)

2015-11-03 Thread Sebastiaan Couwenberg

This is an automated email from the git hooks/post-receive script.

sebastic pushed a change to annotated tag upstream/7.0.2_rc2
in repository grass.

at  190839b   (tag)
   tagging  83308c9dc39fd91301da885353d7a6d5bc576c81 (commit)
  replaces  upstream/7.0.2_rc1
 tagged by  Bas Couwenberg
on  Tue Nov 3 12:11:37 2015 +0100

- Log -
Upstream version 7.0.2~rc2

Bas Couwenberg (1):
  Imported Upstream version 7.0.2~rc2

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/grass.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] branch upstream updated (ecefdf0 -> 9872e31)

2015-11-03 Thread Sebastiaan Couwenberg

This is an automated email from the git hooks/post-receive script.

sebastic pushed a change to branch upstream
in repository mapnik.

  from  ecefdf0   Imported Upstream version 3.0.8+ds
   new  9872e31   Imported Upstream version 3.0.9~rc1+ds

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:
 .travis.yml|   8 +-
 demo/python/rundemo.py |   9 +-
 demo/simple-renderer/render.py |   4 +-
 include/mapnik/json/error_handler.hpp  |  36 ++-
 .../json/extract_bounding_box_grammar_impl.hpp |  32 +--
 include/mapnik/json/feature_collection_grammar.hpp |  16 +-
 .../json/feature_collection_grammar_impl.hpp   |  53 +
 include/mapnik/json/geometry_grammar.hpp   |   2 +-
 include/mapnik/json/geometry_grammar_impl.hpp  |  23 +-
 include/mapnik/util/variant.hpp|  65 +-
 include/mapnik/value.hpp   | 121 +++---
 plugins/input/csv/csv_datasource.cpp   |   1 -
 plugins/input/geojson/geojson_datasource.cpp   |  10 +-
 plugins/input/geojson/geojson_index_featureset.cpp |   6 +-
 .../geojson/geojson_memory_index_featureset.cpp|   7 +-
 src/image.cpp  |   5 +-
 test/unit/core/box2d_test.cpp  |   1 -
 test/unit/core/comparison_test.cpp |  69 +-
 test/unit/core/conversions_test.cpp|   2 -
 test/unit/core/copy_move_test.cpp  |   3 -
 test/unit/core/params_test.cpp |   2 -
 test/unit/datasource/csv.cpp   | 245 ++---
 test/unit/datasource/ds_test_util.hpp  | 172 +++
 test/unit/datasource/geojson.cpp   |  21 +-
 test/unit/datasource/ogr.cpp   |   1 -
 test/unit/datasource/postgis.cpp   |  94 
 test/unit/datasource/spatial_index.cpp |   3 -
 test/unit/font/fontset_runtime_test.cpp|  10 -
 test/unit/geometry/geometry.cpp|   1 -
 test/unit/geometry/geometry_converters_test.cpp| 192 
 test/unit/geometry/geometry_envelope_test.cpp  |   2 -
 test/unit/geometry/geometry_is_simple.cpp  |   1 -
 test/unit/geometry/geometry_is_valid.cpp   |   1 -
 test/unit/geometry/geometry_reprojection.cpp   |   4 -
 test/unit/geometry/label_algo_test.cpp |  64 ++
 test/unit/imaging/image.cpp|  26 +--
 test/unit/imaging/image_io_test.cpp|   2 -
 test/unit/imaging/image_set_pixel.cpp  |   4 +-
 test/unit/imaging/image_view.cpp   |   2 +-
 test/unit/imaging/tiff_io.cpp  |   2 -
 test/unit/imaging/webp_io.cpp  |   3 +-
 test/unit/pixel/agg_blend_src_over_test.cpp|   3 -
 test/unit/serialization/wkb_formats_test.cpp   |   3 -
 test/unit/serialization/xml_parser_trim.cpp|   4 +-
 test/unit/svg/svg_parser_test.cpp  |   4 +-
 test/unit/symbolizer/symbolizer_test.cpp   |   2 -
 test/unit/vertex_adapter/clipping_test.cpp |   2 -
 test/unit/vertex_adapter/line_offset_test.cpp  |   6 +-
 test/unit/vertex_adapter/offset_converter.cpp  |   5 -
 .../vertex_adapter/simplify_converters_test.cpp|  14 +-
 utils/mapnik-index/process_geojson_file.cpp|  11 +-
 51 files changed, 713 insertions(+), 666 deletions(-)
 create mode 100644 test/unit/datasource/ds_test_util.hpp
 create mode 100644 test/unit/datasource/postgis.cpp
 delete mode 100644 test/unit/geometry/geometry_converters_test.cpp

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/mapnik.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] annotated tag upstream/3.0.9_rc1+ds created (now 2309ca2)

2015-11-03 Thread Sebastiaan Couwenberg

This is an automated email from the git hooks/post-receive script.

sebastic pushed a change to annotated tag upstream/3.0.9_rc1+ds
in repository mapnik.

at  2309ca2   (tag)
   tagging  9872e31f882054aa3d108bdfebfbaab0eaabb8b4 (commit)
  replaces  upstream/3.0.8+ds
 tagged by  Bas Couwenberg
on  Tue Nov 3 23:24:38 2015 +0100

- Log -
Upstream version 3.0.9~rc1+ds

Bas Couwenberg (1):
  Imported Upstream version 3.0.9~rc1+ds

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/mapnik.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

[osm-tile-server] 23/70: Fill in po/templates.pot header

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 5fdcbc327f16748a125e07efea7c4df0e9287c49
Author: Christopher Baines 
Date:   Fri Apr 17 19:29:01 2015 +0100

Fill in po/templates.pot header
---
 debian/po/templates.pot | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 8588239..b2ccec4 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,7 +1,8 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
+# openstreetmap-carto debconf templates.
+# Copyright (C) 2014 Christopher Baines 
+# This file is distributed under the same license as the openstreetmap-carto
+# package.
+# Christopher Baines , 2014.
 #
 #, fuzzy
 msgid ""

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 29/70: Imported Upstream version 2.32.0

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit c6ba36fc0e7dca77116ca0c6a2d74a5c7427267d
Author: Bas Couwenberg 
Date:   Sun Aug 30 16:57:01 2015 +0200

Imported Upstream version 2.32.0
---
 .travis.yml   |  10 ++-
 INSTALL.md|   2 +-
 admin.mss |   4 +
 aerialways.mss|  18 -
 amenity-points.mss| 140 +---
 buildings.mss |   4 +-
 get-shapefiles.sh |  23 ++
 landcover.mss |  71 ++---
 preview.png   | Bin 219577 -> 80167 bytes
 project.mml   |  78 ++
 project.yaml  | 127 ++---
 roads.mss | 163 --
 shapefiles.mss|  20 +
 stations.mss  |   6 +-
 symbols/computer-14.svg   |  30 +++
 symbols/elevator-12.svg   |  38 +
 symbols/emergency_phone.16.svg|  14 
 symbols/entrance.10.svg   |  40 ++
 symbols/ice-cream-14.svg  |  40 ++
 symbols/motorcycle-14.svg |  36 +
 symbols/motorcycle_parking.16.svg |  38 +
 symbols/orchard.png   | Bin 134 -> 94 bytes
 symbols/post_box-12.svg   |  37 +
 symbols/post_box.p.16.png | Bin 367 -> 0 bytes
 symbols/post_office-14.svg|  40 ++
 symbols/post_office.p.16.png  | Bin 494 -> 0 bytes
 symbols/seafood-14.svg|  24 ++
 symbols/sosphone.png  | Bin 508 -> 0 bytes
 symbols/telephone.16.svg  |  14 
 symbols/telephone.p.16.png| Bin 444 -> 0 bytes
 symbols/variety_store-14.svg  |  35 
 symbols/vineyard.png  | Bin 190 -> 196 bytes
 symbols/walking.n.12.png  | Bin 372 -> 0 bytes
 water.mss |   1 +
 34 files changed, 826 insertions(+), 227 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 70914eb..04bea38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,17 @@
 language: node_js
+sudo: false
 cache: apt
+addons:
+  apt:
+packages:
+- python-demjson
+- python-yaml
 node_js:
   - "0.10"
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y -q python-demjson python-yaml
 install:
   - npm install carto@0.12.1
   - mkdir -p data/world_boundaries data/simplified-land-polygons-complete-3857 
data/ne_110m_admin_0_boundary_lines_land data/ne_10m_populated_places 
data/land-polygons-split-3857
   - touch data/world_boundaries/builtup_area.shp 
data/simplified-land-polygons-complete-3857/simplified_land_polygons.shp 
data/ne_110m_admin_0_boundary_lines_land/ne_110m_admin_0_boundary_lines_land.shp
 data/ne_10m_populated_places/ne_10m_populated_places_fixed.shp 
data/land-polygons-split-3857/land_polygons.shp
-
 script:
   - jsonlint project.mml
   - ./node_modules/carto/bin/carto project.mml | xmllint - | wc -l
diff --git a/INSTALL.md b/INSTALL.md
index d7858dc..3633e6d 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -82,7 +82,7 @@ In Ubuntu 13.10 (Saucy) and lower, replace fonts-taml-tscu 
with ttf-tamil-fonts.
 If you aren't using TileMill, you can compile the CartoCSS stylesheets into 
Mapnik XML using the command-line `carto` command.
 
 * [carto](https://github.com/mapbox/carto) >= 0.9.5 (we're using instances 
with cascading rules and min/max zoom properties)
-* [mapnik](https://github.com/mapnik/mapnik/wiki/Mapnik-Installation) >= 2.1.0
+* [mapnik](https://github.com/mapnik/mapnik/wiki/Mapnik-Installation) >= 
2.1.0. Mapnik 3.0.0 support is not yet complete.
 
 ---
 
diff --git a/admin.mss b/admin.mss
index ca3c975..d586f74 100644
--- a/admin.mss
+++ b/admin.mss
@@ -123,6 +123,8 @@ overlapping borders correctly.
   text-halo-radius: 1.0;
   text-halo-fill: rgba(255,255,255,0.6);
   text-placement: line;
+  text-clip: true;
+  text-vertical-alignment: middle;
   text-dy: -10;
 }
 
@@ -133,6 +135,8 @@ overlapping borders correctly.
   text-halo-radius: 1.0;
   text-halo-fill: rgba(255,255,255,0.6);
   text-placement: line;
+  text-clip: true;
+  text-vertical-alignment: middle;
   text-dy: -10;
 }
 
diff --git a/aerialways.mss b/aerialways.mss
index 07e6e82..7cd9154 100644
--- a/aerialways.mss
+++ b/aerialways.mss
@@ -1,7 +1,6 @@
 #aerialways {
   [aerialway = 'cable_car'],
-  [aerialway = 'gondola'],
-  [aerialway = 'goods'] {
+  [aerialway = 'gondola'] {
 [zoom >= 12] {
   line/line-width: 1;
   line/line-join: round;
@@ -17,6 +16,21 @@
 }
   }
 
+  [aerialway = 'goods'] {
+[zoom >= 12] {
+  line/line-width: 1;
+  line/line-join: round;
+  line/line-cap: round;
+  line/line-color: #808080;
+
+  dash/line-width: 3.5;
+  dash/line-join:

[osm-tile-server] 12/70: Change maintainer

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit eabea39de0b732e9c7200f638b042bfc364022a7
Author: Christopher Baines 
Date:   Fri Apr 17 15:26:06 2015 +0100

Change maintainer

Change maintainer from Debian OpenStreetMap Team to Debian GIS Project.
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index d552405..21922bf 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: openstreetmap-carto
 Section: graphics
 Priority: optional
-Maintainer: Debian OpenStreetMap Team 
+Maintainer: Debian GIS Project 
 Uploaders: Christopher Baines 
 Build-Depends: debhelper (>= 9.0.0), node-carto, po-debconf
 Standards-Version: 3.9.6

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 28/70: Imported Upstream version 2.31.0

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 18fcbfc24ae8945c893e6126132511c4a89c202b
Author: Bas Couwenberg 
Date:   Sun Aug 30 16:57:00 2015 +0200

Imported Upstream version 2.31.0
---
 .gitignore   |   1 +
 aerialways.mss   |  23 +++-
 amenity-points.mss   | 244 ---
 citywalls.mss|  11 --
 landcover.mss|  19 +--
 project.mml  | 124 ++
 project.yaml | 301 +--
 roads.mss|   2 +-
 symbols/beauty-14.svg|  40 ++
 symbols/beverages-14.svg |  47 +++
 symbols/cable_car.png| Bin 229 -> 0 bytes
 symbols/car_parts-14.svg |  40 ++
 symbols/chair_lift.png   | Bin 230 -> 0 bytes
 symbols/chemist-14.svg   |  40 ++
 symbols/confectionery-14.svg |  33 +
 symbols/garden_centre-14.svg |  40 ++
 symbols/greengrocer-14.svg   |  40 ++
 symbols/hifi-14.svg  |  38 ++
 symbols/hostel.16.svg|  40 ++
 symbols/hostel.p.20.png  | Bin 597 -> 0 bytes
 symbols/hotel.16.svg |  40 ++
 symbols/hotel2.p.20.png  | Bin 368 -> 0 bytes
 symbols/laundry-14.svg   |  45 +++
 symbols/newsagent-14.svg |  46 +++
 symbols/perfumery-14.svg |  31 +
 symbols/photo-14.svg |  31 +
 symbols/stationery-14.svg|  33 +
 symbols/taxi.16.svg  |  14 ++
 symbols/tower_water.p.20.png | Bin 477 -> 0 bytes
 symbols/toys-14.svg  |  37 ++
 symbols/travel_agency-14.svg |  33 +
 symbols/view_point.p.16.png  | Bin 636 -> 0 bytes
 symbols/viewpoint.16.svg |  14 ++
 symbols/water_park.16.svg|  14 ++
 symbols/water_park.p.20.png  | Bin 802 -> 0 bytes
 symbols/water_tower.16.svg   |  41 ++
 symbols/windmill.16.svg  |  14 ++
 symbols/windmill.png | Bin 617 -> 0 bytes
 symbols/zoo.png  | Bin 165 -> 0 bytes
 39 files changed, 1195 insertions(+), 281 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3eead54..a5319ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ layers/
 data/
 *.xml
 node_modules/
+localconfig.json
diff --git a/aerialways.mss b/aerialways.mss
index 6fef77f..07e6e82 100644
--- a/aerialways.mss
+++ b/aerialways.mss
@@ -3,7 +3,17 @@
   [aerialway = 'gondola'],
   [aerialway = 'goods'] {
 [zoom >= 12] {
-  line-pattern-file: url('symbols/cable_car.png');
+  line/line-width: 1;
+  line/line-join: round;
+  line/line-cap: round;
+  line/line-color: #808080;
+
+  dash/line-width: 3;
+  dash/line-join: round;
+  dash/line-cap: round;
+  dash/line-color: black;
+  dash/line-dasharray: 0.4,13;
+  dash/line-clip: false;
 }
   }
 
@@ -14,7 +24,16 @@
   [aerialway = 'platter'],
   [aerialway = 'rope_tow'] {
 [zoom >= 12] {
-  line-pattern-file: url('symbols/chair_lift.png');
+  line/line-width: 1;
+  line/line-join: round;
+  line/line-cap: round;
+  line/line-color: #808080;
+
+  dash/line-width: 4;
+  dash/line-join: round;
+  dash/line-color: black;
+  dash/line-dasharray: 1,30;
+  dash/line-clip: false;
 }
   }
 }
diff --git a/amenity-points.mss b/amenity-points.mss
old mode 100644
new mode 100755
index 62386be..3cec897
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -78,6 +78,13 @@
 point-placement: interior;
   }
 
+  [feature = 'amenity_taxi'][zoom >= 16] {
+marker-file: url('symbols/taxi.16.svg');
+marker-fill: @transportation-icon;
+marker-placement: interior;
+marker-clip: false;
+  }
+
   [feature = 'highway_traffic_signals'][zoom >= 17] {
 marker-file: url('symbols/traffic_light.svg');
 marker-fill: #0a0a0a;
@@ -169,13 +176,17 @@
   }
 
   [feature = 'tourism_hostel'][zoom >= 17] {
-point-file: url('symbols/hostel.p.20.png');
-point-placement: interior;
+marker-file: url('symbols/hostel.16.svg');
+marker-placement: interior;
+marker-clip: false;
+marker-fill: @transportation-icon;
   }
 
   [feature = 'tourism_hotel'][zoom >= 17] {
-point-file: url('symbols/hotel2.p.20.png');
-point-placement: interior;
+marker-file: url('symbols/hotel.16.svg');
+marker-placement: interior;
+marker-clip: false;
+marker-fill: @transportation-icon;
   }
 
   [feature = 'tourism_motel'][zoom >= 17] {
@@ -253,6 +264,7 @@
 marker-clip: false;
   }
 
+  [feature = 'amenity_clinic'][zoom >= 16],
   [feature = 'amenity_doctors'][zoom >= 17] {
 marker-file: url('symbols/doctors.16.svg');
 marker-fill: @health-color;
@@ -332,7 +344,7 @@
 marker-clip: false;
   }
 
-  [feature = 'amenity_recycling'][zoom >= 16] {
+  [feature = 'amenity_recycling'][zoom >= 17] {
 marker-file: url('symbols/recycling.16.svg');
 marker-fill:

[osm-tile-server] 11/70: Bump standards version from 3.9.5 to 3.9.6

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit d219b352d316e64728e62b77f5f63b03b64de30f
Author: Christopher Baines 
Date:   Fri Apr 17 15:24:15 2015 +0100

Bump standards version from 3.9.5 to 3.9.6
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index d7c7266..d552405 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian OpenStreetMap Team 
 Uploaders: Christopher Baines 
 Build-Depends: debhelper (>= 9.0.0), node-carto, po-debconf
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: https://github.com/gravitystorm/openstreetmap-carto
 #Vcs-Git: git://git.debian.org/collab-maint/openstreetmap-carto.git
 #Vcs-Browser: 
http://git.debian.org/?p=collab-maint/openstreetmap-carto.git;a=summary

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 08/70: Update debian/copyright

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit a59f64b762925f58032ea46db71c46e280db1c60
Author: Christopher Baines 
Date:   Thu Apr 16 16:57:58 2015 +0100

Update debian/copyright
---
 debian/copyright | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index e2b40e1..a925d17 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,9 +20,13 @@ License: CC0
  
 
 Files: *
-Copyright: 2012-2014 Andy Allan 
+Copyright: 2012-2015 Andy Allan 
 License: CC0
 
+Files: scripts/create_shield scripts/create_standard_shields
+Copyright: 2014 Paul Norman
+Licence: CC0
+
 Files: debian/*
 Copyright: 2014 Christopher Baines 
 License: CC0

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 18/70: Add style.xml to debian/clean

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 58e764bf275748849c34c5360fc6c765503d424f
Author: Christopher Baines 
Date:   Fri Apr 17 15:50:44 2015 +0100

Add style.xml to debian/clean
---
 debian/clean | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 000..53407f4
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+style.xml

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 22/70: Fix Upstream-Name in copyright file.

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 047023a62da181b89ec3daf4ffd27cef7ee45b9b
Author: Bas Couwenberg 
Date:   Fri Apr 17 20:10:46 2015 +0200

Fix Upstream-Name in copyright file.
---
 debian/copyright | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index b68f28c..e20f4ed 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: openstreetmap-carto
+Upstream-Name: OpenStreetMap Carto
 Source: https://github.com/gravitystorm/openstreetmap-carto
 
 Files: *

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 27/70: Imported Upstream version 2.30.0

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 4b82da9617fb9a00682613eceefd6f6fa5c1b4b5
Author: Bas Couwenberg 
Date:   Sun Aug 30 16:56:58 2015 +0200

Imported Upstream version 2.30.0
---
 .gitattributes  |   1 +
 INSTALL.md  |   2 +-
 admin.mss   |   2 +-
 amenity-points.mss  | 425 ++--
 landcover.mss   |  66 -
 project.mml |  46 +--
 project.yaml| 281 +++---
 roads.mss   |  17 +-
 symbols/amenity_court.p.20.png  | Bin 802 -> 0 bytes
 symbols/archaeological_site.16.svg  |  14 +
 symbols/bench.16.svg|  40 +++
 symbols/bicycle_parking.16.svg  |  40 +++
 symbols/bus_stop.12.svg |  14 +
 symbols/bus_stop.p.12.png   | Bin 353 -> 0 bytes
 symbols/caravan_park.16.svg |  14 +
 symbols/caravan_park.p.24.png   | Bin 486 -> 0 bytes
 symbols/courthouse-16.svg   |  40 +++
 symbols/hunting-stand.16.svg|  40 +++
 symbols/lighthouse.16.svg   |  40 +++
 symbols/lighthouse.p.20.png | Bin 487 -> 0 bytes
 symbols/monument.16.svg |  14 +
 symbols/motel.16.svg|  40 +++
 symbols/motel.p.20.png  | Bin 657 -> 0 bytes
 symbols/power_wind-16.svg   |  40 +++
 symbols/power_wind.png  | Bin 638 -> 0 bytes
 symbols/shop_alcohol.16.svg |  14 +
 symbols/shop_bicycle.16.svg |  40 +++
 symbols/shop_clothes.16.svg |  14 +
 symbols/shop_clothes.svg|   4 -
 symbols/shop_diy.16.svg |  40 +++
 symbols/shop_diy.p.16.png   | Bin 383 -> 0 bytes
 symbols/shop_electronics.16.svg |  14 +
 symbols/shop_furniture.16.svg   |  14 +
 symbols/shop_gift.16.svg|  14 +
 symbols/shop_jewelry.16.svg |  14 +
 symbols/shop_mobile_phone.16.svg|  14 +
 symbols/shop_optician.16.svg|  14 +
 symbols/shop_shoes.16.svg   |  40 +++
 symbols/shopping_bicycle.p.16.png   | Bin 522 -> 0 bytes
 symbols/tourist_archaeological2.glow.24.png | Bin 1134 -> 0 bytes
 symbols/waste_basket.10.svg |  40 +++
 symbols/wetland.png | Bin 2832 -> 2698 bytes
 symbols/wetland_bog.png | Bin 0 -> 26984 bytes
 symbols/wetland_mangrove.png| Bin 0 -> 30426 bytes
 symbols/wetland_marsh.png   | Bin 0 -> 32247 bytes
 symbols/wetland_reed.png| Bin 0 -> 35227 bytes
 symbols/wetland_swamp.png   | Bin 0 -> 29181 bytes
 water-features.mss  |   8 +-
 water.mss   |  59 +++-
 49 files changed, 1208 insertions(+), 311 deletions(-)

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..c29e2c2
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.mml binary
diff --git a/INSTALL.md b/INSTALL.md
index ab22cee..d7858dc 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,6 +1,6 @@
 # Installation
 
-You need OpenStreetMap data loaded into a PostGIS database (see below for 
[dependencies](https://github.com/gravitystorm/openstreetmap-carto#dependencies)).
 These stylesheets currently work only with the osm2pgsql defaults (i.e. 
database name is `gis`, table names are `planet_osm_point`, etc).
+You need OpenStreetMap data loaded into a PostGIS database (see below for 
[dependencies](#dependencies)). These stylesheets currently work only with the 
osm2pgsql defaults (i.e. database name is `gis`, table names are 
`planet_osm_point`, etc).
 
 It's probably easiest to grab an PBF of OSM data from 
[Mapzen](https://mapzen.com/metro-extracts/) or 
[geofabrik](http://download.geofabrik.de/). Once you've set up your PostGIS 
database, import with osm2pgsql:
 
diff --git a/admin.mss b/admin.mss
index 290b0f6..ca3c975 100644
--- a/admin.mss
+++ b/admin.mss
@@ -3,7 +3,7 @@
 /* For performance reasons, the admin border layers are split into three groups
 for low, middle and high zoom levels.
 For each zoomlevel, all borders come from a single attachment, to handle
-overlapping borders correctly. 
+overlapping borders correctly.
 */
 
 #admin-low-zoom[zoom < 11],
diff --git a/amenity-points.mss b/amenity-points.mss
index 08ad3cc..62386be 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -1,6 +1,5 @@
 @marina-text: #576ddf; // also swimming_pool
-@wetland-text: darken(#017fff, 10%); /* Also for marsh */
-@mud-text:

[osm-tile-server] 24/70: Add upstream/metadata

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 074729b13c5a492a2b1f6bc3cf038295db8aa754
Author: Christopher Baines 
Date:   Fri Apr 17 19:31:38 2015 +0100

Add upstream/metadata
---
 debian/upstream/metadata | 5 +
 1 file changed, 5 insertions(+)

diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 000..4fc692b
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,5 @@
+Bug-Database: https://github.com/gravitystorm/openstreetmap-carto/issues
+Bug-Submit: https://github.com/gravitystorm/openstreetmap-carto/issues/new
+Name: OpenStreetMap Carto
+Repository: https://github.com//gravitystorm/openstreetmap-carto.git
+Repository-Browse: https://github.com/gravitystorm/openstreetmap-carto

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 26/70: Update watch file.

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit c281a14e0b924b7b5cf414c530b4c568dda950e3
Author: Bas Couwenberg 
Date:   Sat Aug 1 13:05:54 2015 +0200

Update watch file.

Changes:
- Add common version mangling
- Improve filename mangling
- Support other tar extensions
---
 debian/changelog | 10 ++
 debian/watch |  8 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d4e48b7..aab998c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+openstreetmap-carto (2.29.1-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Update watch file, changes:
+- Add common version mangling
+- Improve filename mangling
+- Support other tar extensions
+
+ -- Bas Couwenberg   Sat, 01 Aug 2015 13:04:21 +0200
+
 openstreetmap-carto (2.29.1-1) unstable; urgency=low
 
   * Initial release (Closes: #744842)
diff --git a/debian/watch b/debian/watch
index cfebd9d..0f6bc5c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,7 @@
 version=3
-opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/openstreetmap-carto-$1\.tar\.gz/ \
-  https://github.com/gravitystorm/openstreetmap-carto/tags 
.*/?(\d\.\d{2}.\d)\.tar\.gz
+opts=\
+dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/;s/-/./g,\
+filenamemangle=s/(?:.*)?(?:rel|v|openstreetmap-carto)[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/openstreetmap-carto-$1.$2/
 \
+https://github.com/gravitystorm/openstreetmap-carto/tags \
+(?:.*/)?(?:rel|v|openstreetmap-carto)[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 13/70: Add VCS info to debian/control

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit d71a0911f8a5ca17d44b3b1f17b1214e918a4226
Author: Christopher Baines 
Date:   Fri Apr 17 15:28:09 2015 +0100

Add VCS info to debian/control
---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 21922bf..483c67b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders: Christopher Baines 
 Build-Depends: debhelper (>= 9.0.0), node-carto, po-debconf
 Standards-Version: 3.9.6
 Homepage: https://github.com/gravitystorm/openstreetmap-carto
-#Vcs-Git: git://git.debian.org/collab-maint/openstreetmap-carto.git
-#Vcs-Browser: 
http://git.debian.org/?p=collab-maint/openstreetmap-carto.git;a=summary
+Vcs-Git: git://git.debian.org/pkg-grass/openstreetmap-carto.git
+Vcs-Browser: 
http://git.debian.org/?p=pkg-grass/openstreetmap-carto.git;a=summary
 
 Package: openstreetmap-carto
 Architecture: all

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 06/70: Update changelog

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 5907be1c910387982c15d3500a7da8332e1857bd
Author: Christopher Baines 
Date:   Sun Apr 12 14:51:46 2015 +0100

Update changelog
---
 debian/changelog | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0ae7302..bfcb845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openstreetmap-carto (2.29.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher Baines   Sun, 12 Apr 2015 14:50:59 +0100
+
 openstreetmap-carto (2.13.0-1) unstable; urgency=low
 
   * Initial release (Closes: #744842)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 20/70: Merge changelog entries

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 431ee1740eff88fe955a1bcf4139817605325760
Author: Christopher Baines 
Date:   Fri Apr 17 16:05:08 2015 +0100

Merge changelog entries

As the package has not yet been released.
---
 debian/changelog | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bfcb845..d4e48b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,5 @@
 openstreetmap-carto (2.29.1-1) unstable; urgency=low
 
-  * New upstream release.
-
- -- Christopher Baines   Sun, 12 Apr 2015 14:50:59 +0100
-
-openstreetmap-carto (2.13.0-1) unstable; urgency=low
-
   * Initial release (Closes: #744842)
 
- -- Christopher Baines   Sun, 13 Apr 2014 17:06:44 +0100
+ -- Christopher Baines   Sun, 12 Apr 2015 14:50:59 +0100

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 09/70: Fix typo in debian/copyright

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 4f28f19f1dbedf6bbf31a1801d38b24bdc7660cd
Author: Christopher Baines 
Date:   Thu Apr 16 16:59:54 2015 +0100

Fix typo in debian/copyright
---
 debian/copyright | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index a925d17..b9d4e84 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,7 +25,7 @@ License: CC0
 
 Files: scripts/create_shield scripts/create_standard_shields
 Copyright: 2014 Paul Norman
-Licence: CC0
+License: CC0
 
 Files: debian/*
 Copyright: 2014 Christopher Baines 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] branch master created (now 008fc5d)

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a change to branch master
in repository osm-tile-server.

at  008fc5d   Set distribution to unstable.

This branch includes the following new commits:

   new  e5acdb0   Imported Upstream version 2.13.0
   new  30f7916   Imported Debian patch 2.13.0-1
   new  4802338   Update watch file
   new  d0d3b71   Imported Upstream version 2.29.1
   new  360efeb   Merge branch 'upstream'
   new  5907be1   Update changelog
   new  fe5f203   Update the included documentation
   new  a59f64b   Update debian/copyright
   new  4f28f19   Fix typo in debian/copyright
   new  0a23773   Add debian/gbp.conf
   new  d219b35   Bump standards version from 3.9.5 to 3.9.6
   new  eabea39   Change maintainer
   new  d71a091   Add VCS info to debian/control
   new  3177be8   Run cme on debian/control
   new  eb10dca   Remove debian/README.source
   new  2804389   Include full CC0 license in debian/copyright
   new  2bc5763   Move installation of style.xml to debian/install
   new  58e764b   Add style.xml to debian/clean
   new  0d08ab3   Improve debian/watch
   new  431ee17   Merge changelog entries
   new  f49fcd4   Drop <> in Source URL.
   new  047023a   Fix Upstream-Name in copyright file.
   new  5fdcbc3   Fill in po/templates.pot header
   new  074729b   Add upstream/metadata
   new  8b9bce4   Fix YAML document syntax for upstream metadata.
   new  c281a14   Update watch file.
   new  4b82da9   Imported Upstream version 2.30.0
   new  18fcbfc   Imported Upstream version 2.31.0
   new  c6ba36f   Imported Upstream version 2.32.0
   new  88de0f2   Imported Upstream version 2.33.0
   new  f360d66   Imported Upstream version 2.34.0
   new  eb799fe   Merge tag 'upstream/2.34.0'
   new  cae4918   New upstream release.
   new  43153f2   Align paths in install file.
   new  a54f061   Enable parallel builds.
   new  a5f120c   Imported Upstream version 2.35.0
   new  aabbb66   Merge tag 'upstream/2.35.0'
   new  f8cd0f4   New upstream release.
   new  8ca10c3   Close bug in changelog.
   new  3cee663   Set distribution to unstable.
   new  9c3f389   Split in two binary packages
   new  7e7af5a   New changelog entry
   new  9211287   Delete style.xml when removing package
   new  611e3cf   Delete style.xml in prerm instead.
   new  85ad389   Added preinst for moving old data directory out of the 
way.
   new  97bbf88   Include debconf translation updates
   new  85c403a   Added lintian-override for broken symlink with explanation
   new  3349f17   Set openstreetmap-carto/fetch-data to false after 
completing download of shapefiles
   new  f2e1e88   More in changelog
   new  921d2e1   Remove data directory on purge
   new  1281661   UNRELEASED -> unstable
   new  55b1cd3   Check that dir is not a symlink before moving dir.
   new  a4ea7e2   Use POSIX compatible if expression
   new  9145d00   Move data.old to 
/usr/share/openstreetmap-carto-common/data if it exists
   new  d1dd0dc   Fixed path in translations of debconf message
   new  a757c3d   New changelog entry
   new  5d98b8e   Make sure /usr/share/openstreetmap-carto/symbols is 
removed if it is a directory.
   new  4bae5d6   Do not delete style.xml during upgrade, but only when 
removing the package.
   new  45d675c   Prepare for new upload
   new  8212642   Improved comment
   new  dc9dff9   Use dpkg-maintscript-helper to replace dir with symlink
   new  a6e9a9a   Clean up install directory if previous upgrade has left 
some strange files there
   new  ddc2bc4   Changelog updates
   new  db9506b   If data dir already in 
/usr/share/openstreetmap-carto-common, delete data.old
   new  b49b5ef   Minor comment fix
   new  ad5e8a9   Imported Upstream version 2.36.0
   new  3fdc9e0   Merge tag 'upstream/2.36.0'
   new  7d10cd4   New upstream release.
   new  5668fc6   Update copyright file for removed scripts.
   new  008fc5d   Set distribution to unstable.

The 70 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.


-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 05/70: Merge branch 'upstream'

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 360efeb90fd4a42eba62e7903ab7ecc1e433669d
Merge: 4802338 d0d3b71
Author: Christopher Baines 
Date:   Sun Apr 12 14:50:00 2015 +0100

Merge branch 'upstream'

 .gitignore   |1 +
 .travis.yml  |   16 +
 CONTRIBUTING.md  |   78 +
 INSTALL.md   |   96 ++
 README.md|  169 +--
 TODO.md  |   28 -
 addressing.mss   |8 +-
 admin.mss|  109 +-
 amenity-points.mss   | 2000 ++---
 amenity-symbols.mss  |  112 --
 buildings.mss|   78 +-
 ferry-routes.mss |   24 +-
 get-shapefiles.sh|   35 +-
 landcover.mss|  444 --
 openstreetmap-carto.style|   77 +-
 placenames.mss   |   97 +-
 power.mss|   18 +-
 preview.png  |  Bin 0 -> 219577 bytes
 project.mml  | 2709 +++---
 project.yaml | 2093 ++
 roads.mss| 1712 ++---
 scripts/create_shield|   34 +
 scripts/create_standard_shields  |   49 +
 scripts/shop_values.rb   |   41 +
 scripts/travis_check_project_files   |   15 +
 scripts/yaml2mml.py  |3 +
 shapefiles.mss   |1 +
 stations.mss |   23 +-
 style.mss|   17 +-
 symbols/aerodrome.p.16.png   |  Bin 377 -> 0 bytes
 symbols/aerodrome.png|  Bin 888 -> 0 bytes
 symbols/aerodrome.svg|4 +
 symbols/aiga_parking1.png|  Bin 1542 -> 0 bytes
 symbols/allotments.png   |  Bin 911 -> 227 bytes
 symbols/amenity_prison.p.20.png  |  Bin 417 -> 0 bytes
 symbols/arrow.png|  Bin 320 -> 0 bytes
 symbols/arrow_back.png   |  Bin 353 -> 0 bytes
 symbols/atm.16.svg   |   12 +
 symbols/atm.png  |  Bin 222 -> 0 bytes
 symbols/atm2.p.16.png|  Bin 437 -> 0 bytes
 symbols/bandb.p.20.png   |  Bin 398 -> 0 bytes
 symbols/bank.16.svg  |   12 +
 symbols/bank2.p.16.png   |  Bin 410 -> 0 bytes
 symbols/bar.16.svg   |   12 +
 symbols/bar.p.20.png |  Bin 459 -> 0 bytes
 symbols/beach.png|  Bin 162 -> 215 bytes
 symbols/biergarten.16.svg|   12 +
 symbols/biergarten.p.16.png  |  Bin 501 -> 0 bytes
 symbols/bollard.png  |  Bin 104 -> 0 bytes
 symbols/buddhist.16.svg  |   12 +
 symbols/buddhist.png |  Bin 406 -> 0 bytes
 symbols/bus_stop.png |  Bin 904 -> 0 bytes
 symbols/bus_stop_small.png   |  Bin 95 -> 0 bytes
 symbols/cafe.16.svg  |   12 +
 symbols/cafe.p.16.png|  Bin 361 -> 0 bytes
 symbols/camping.16.svg   |   12 +
 symbols/camping.n.16.png |  Bin 517 -> 0 bytes
 symbols/cemetery_jewish.18.png   |  Bin 400 -> 0 bytes
 symbols/christian.16.svg |   12 +
 symbols/christian3.p.14.png  |  Bin 252 -> 0 bytes
 symbols/cinema.16.svg|   12 +
 symbols/cinema.p.24.png  |  Bin 791 -> 0 bytes
 symbols/cliff.png|  Bin 26214 -> 360 bytes
 symbols/cliff2.png   |  Bin 26214 -> 379 bytes
 symbols/communications.16.svg|   12 +
 symbols/communications.p.20.png  |  Bin 445 -> 0 bytes
 symbols/dentist.16.svg   |   12 +
 symbols/doctors.16.svg   |   12 +
 symbols/drinking_water.16.svg|   12 +
 symbols/embankment.png   |  Bin 0 -> 351 bytes
 symbols/embassy.16.svg   |   12 +
 symbols/embassy.png  |  Bin 2893 -> 0 bytes
 symbols/fast_food.16.svg |   12 +
 symbols/fast_food.png|  Bin 3091 -> 0 bytes
 symbols/firestation.16.svg   |   12 +
 symbols/firestation.p.16.png |  Bin 479 -> 0 bytes
 symbols/florist.16.svg   |   40 +
 symbols/florist.p.16.png |  Bin 422 -> 0 bytes
 symbols/food_bar.p.16.png|  Bin 376 -> 0 bytes
 symbols/food_drinkingtap.p.20.png|  Bin 386 -> 0 bytes
 symbols/fuel.16.svg  |   12 +
 symbols/fuel.p.16.png|  Bin 306 -> 0 bytes
 symbols/gate.png |  Bin 106 -> 0 bytes
 symbols/gate.svg |   11 +
 symbols/gate2.png|  Bin 111 -> 0 bytes
 symbols/glacier.png  |  Bin 122 ->

[osm-tile-server] 07/70: Update the included documentation

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit fe5f2036a162d33da783e00ec9576504264c9247
Author: Christopher Baines 
Date:   Sun Apr 12 14:54:13 2015 +0100

Update the included documentation
---
 debian/docs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/docs b/debian/docs
index f3b13a1..8a64680 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,3 @@
 README.md
-TODO.md
 CARTOGRAPHY.md
+CONTRIBUTING.md

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 21/70: Drop <> in Source URL.

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit f49fcd499f98f9e16c0e5c35e5770aecbaea0e7b
Author: Bas Couwenberg 
Date:   Fri Apr 17 19:37:04 2015 +0200

Drop <> in Source URL.
---
 debian/copyright | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index 0894f79..b68f28c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: openstreetmap-carto
-Source: 
+Source: https://github.com/gravitystorm/openstreetmap-carto
 
 Files: *
 Copyright: 2012-2015 Andy Allan 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 10/70: Add debian/gbp.conf

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 0a23773aacf97758f58d5b8d41042382ba3e6d96
Author: Christopher Baines 
Date:   Fri Apr 17 15:21:42 2015 +0100

Add debian/gbp.conf
---
 debian/gbp.conf | 16 
 1 file changed, 16 insertions(+)

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000..21d0417
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,16 @@
+[DEFAULT]
+
+# The default name for the upstream branch is "upstream".
+# Change it if the name is different (for instance, "master").
+upstream-branch = upstream
+
+# The default name for the Debian branch is "master".
+# Change it if the name is different (for instance, "debian/unstable").
+debian-branch = master
+
+# git-import-orig uses the following names for the upstream tags.
+# Change the value if you are not using git-import-orig
+upstream-tag = upstream/%(version)s
+
+# Always use pristine-tar.
+pristine-tar = True

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

Processed: block bug

2015-11-03 Thread Debian Bug Tracking System

Processing commands for cont...@bugs.debian.org:

> block 803988 by 803985
Bug #803988 [wnpp] ITP: osm-tile-server -- OpenStreetMap tile server
803988 was not blocked by any bugs.
803988 was not blocking any bugs.
Added blocking bug(s) of 803988: 803985
> stop
Stopping processing here.

Please contact me if you need assistance.
-- 
803988: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803988
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

___
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] branch pristine-tar updated (bb83806 -> e262050)

2015-11-03 Thread Sebastiaan Couwenberg

This is an automated email from the git hooks/post-receive script.

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

  from  bb83806   pristine-tar data for mapnik_3.0.8+ds.orig.tar.gz
   new  e262050   pristine-tar data for mapnik_3.0.9~rc1+ds.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:
 mapnik_3.0.9~rc1+ds.orig.tar.gz.delta | Bin 0 -> 3581112 bytes
 mapnik_3.0.9~rc1+ds.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 mapnik_3.0.9~rc1+ds.orig.tar.gz.delta
 create mode 100644 mapnik_3.0.9~rc1+ds.orig.tar.gz.id

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/mapnik.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] 01/04: Imported Upstream version 3.0.9~rc1+ds

2015-11-03 Thread Sebastiaan Couwenberg

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mapnik.

commit 9872e31f882054aa3d108bdfebfbaab0eaabb8b4
Author: Bas Couwenberg 
Date:   Tue Nov 3 23:24:26 2015 +0100

Imported Upstream version 3.0.9~rc1+ds
---
 .travis.yml|   8 +-
 demo/python/rundemo.py |   9 +-
 demo/simple-renderer/render.py |   4 +-
 include/mapnik/json/error_handler.hpp  |  36 ++-
 .../json/extract_bounding_box_grammar_impl.hpp |  32 +--
 include/mapnik/json/feature_collection_grammar.hpp |  16 +-
 .../json/feature_collection_grammar_impl.hpp   |  53 +
 include/mapnik/json/geometry_grammar.hpp   |   2 +-
 include/mapnik/json/geometry_grammar_impl.hpp  |  23 +-
 include/mapnik/util/variant.hpp|  65 +-
 include/mapnik/value.hpp   | 121 +++---
 plugins/input/csv/csv_datasource.cpp   |   1 -
 plugins/input/geojson/geojson_datasource.cpp   |  10 +-
 plugins/input/geojson/geojson_index_featureset.cpp |   6 +-
 .../geojson/geojson_memory_index_featureset.cpp|   7 +-
 src/image.cpp  |   5 +-
 test/unit/core/box2d_test.cpp  |   1 -
 test/unit/core/comparison_test.cpp |  69 +-
 test/unit/core/conversions_test.cpp|   2 -
 test/unit/core/copy_move_test.cpp  |   3 -
 test/unit/core/params_test.cpp |   2 -
 test/unit/datasource/csv.cpp   | 245 ++---
 test/unit/datasource/ds_test_util.hpp  | 172 +++
 test/unit/datasource/geojson.cpp   |  21 +-
 test/unit/datasource/ogr.cpp   |   1 -
 test/unit/datasource/postgis.cpp   |  94 
 test/unit/datasource/spatial_index.cpp |   3 -
 test/unit/font/fontset_runtime_test.cpp|  10 -
 test/unit/geometry/geometry.cpp|   1 -
 test/unit/geometry/geometry_converters_test.cpp| 192 
 test/unit/geometry/geometry_envelope_test.cpp  |   2 -
 test/unit/geometry/geometry_is_simple.cpp  |   1 -
 test/unit/geometry/geometry_is_valid.cpp   |   1 -
 test/unit/geometry/geometry_reprojection.cpp   |   4 -
 test/unit/geometry/label_algo_test.cpp |  64 ++
 test/unit/imaging/image.cpp|  26 +--
 test/unit/imaging/image_io_test.cpp|   2 -
 test/unit/imaging/image_set_pixel.cpp  |   4 +-
 test/unit/imaging/image_view.cpp   |   2 +-
 test/unit/imaging/tiff_io.cpp  |   2 -
 test/unit/imaging/webp_io.cpp  |   3 +-
 test/unit/pixel/agg_blend_src_over_test.cpp|   3 -
 test/unit/serialization/wkb_formats_test.cpp   |   3 -
 test/unit/serialization/xml_parser_trim.cpp|   4 +-
 test/unit/svg/svg_parser_test.cpp  |   4 +-
 test/unit/symbolizer/symbolizer_test.cpp   |   2 -
 test/unit/vertex_adapter/clipping_test.cpp |   2 -
 test/unit/vertex_adapter/line_offset_test.cpp  |   6 +-
 test/unit/vertex_adapter/offset_converter.cpp  |   5 -
 .../vertex_adapter/simplify_converters_test.cpp|  14 +-
 utils/mapnik-index/process_geojson_file.cpp|  11 +-
 51 files changed, 713 insertions(+), 666 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 01ff425..656ac25 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,14 +46,18 @@ before_install:
 
 install:
  - if [[ $(uname -s) == 'Linux' ]]; then
- psql -U postgres -c 'create database template_postgis;' -U postgres;
- psql -U postgres -c 'create extension postgis;' -d template_postgis -U 
postgres;
  export CXX="ccache clang++-3.5 -Qunused-arguments";
  export CC="ccache clang-3.5 -Qunused-arguments";
  export PYTHONPATH=$(pwd)/mason_packages/.link/lib/python2.7/site-packages;
else
+ brew rm postgis --force;
+ brew install postgis --force;
+ pg_ctl -w start -l postgres.log --pgdata /usr/local/var/postgres;
+ createuser -s postgres;
  export PYTHONPATH=$(pwd)/mason_packages/.link/lib/python/site-packages;
fi
+ - psql -c 'create database template_postgis;' -U postgres;
+ - psql -c 'create extension postgis;' -d template_postgis -U postgres;
  - if [[ ${COVERAGE} == true ]]; then
  PYTHONUSERBASE=$(pwd)/mason_packages/.link pip install --user 
cpp-coveralls;
fi
diff --git a/demo/python/rundemo.py b/demo/python/rundemo.py
index 65ebe6a..7e6c42c 100755
--- a/demo/python/rundemo.py
+++ b/demo/python/rundemo.py
@@ -19,10 +19,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-

[mapnik] 03/04: New upstream release candidate.

2015-11-03 Thread Sebastiaan Couwenberg

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mapnik.

commit 5185a65ccb1d4f353735f7329be7395d53392536
Author: Bas Couwenberg 
Date:   Tue Nov 3 23:29:14 2015 +0100

New upstream release candidate.
---
 debian/changelog | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dc690e5..8e554ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapnik (3.0.9~rc1+ds-1) UNRELEASED; urgency=medium
+
+  * New upstream release candidate.
+
+ -- Bas Couwenberg   Tue, 03 Nov 2015 23:24:44 +0100
+
 mapnik (3.0.8+ds-1) unstable; urgency=medium
 
   * New upstream release.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/mapnik.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] branch master updated (6e773ef -> 69f493c)

2015-11-03 Thread Sebastiaan Couwenberg

This is an automated email from the git hooks/post-receive script.

sebastic pushed a change to branch master
in repository mapnik.

  from  6e773ef   Set distribution to unstable.
   new  9872e31   Imported Upstream version 3.0.9~rc1+ds
   new  5397d5d   Merge tag 'upstream/3.0.9_rc1+ds'
   new  5185a65   New upstream release candidate.
   new  69f493c   Set distribution to experimental.

The 4 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:
 .travis.yml|   8 +-
 debian/changelog   |   7 +
 demo/python/rundemo.py |   9 +-
 demo/simple-renderer/render.py |   4 +-
 include/mapnik/json/error_handler.hpp  |  36 ++-
 .../json/extract_bounding_box_grammar_impl.hpp |  32 +--
 include/mapnik/json/feature_collection_grammar.hpp |  16 +-
 .../json/feature_collection_grammar_impl.hpp   |  53 +
 include/mapnik/json/geometry_grammar.hpp   |   2 +-
 include/mapnik/json/geometry_grammar_impl.hpp  |  23 +-
 include/mapnik/util/variant.hpp|  65 +-
 include/mapnik/value.hpp   | 121 +++---
 plugins/input/csv/csv_datasource.cpp   |   1 -
 plugins/input/geojson/geojson_datasource.cpp   |  10 +-
 plugins/input/geojson/geojson_index_featureset.cpp |   6 +-
 .../geojson/geojson_memory_index_featureset.cpp|   7 +-
 src/image.cpp  |   5 +-
 test/unit/core/box2d_test.cpp  |   1 -
 test/unit/core/comparison_test.cpp |  69 +-
 test/unit/core/conversions_test.cpp|   2 -
 test/unit/core/copy_move_test.cpp  |   3 -
 test/unit/core/params_test.cpp |   2 -
 test/unit/datasource/csv.cpp   | 245 ++---
 test/unit/datasource/ds_test_util.hpp  | 172 +++
 test/unit/datasource/geojson.cpp   |  21 +-
 test/unit/datasource/ogr.cpp   |   1 -
 test/unit/datasource/postgis.cpp   |  94 
 test/unit/datasource/spatial_index.cpp |   3 -
 test/unit/font/fontset_runtime_test.cpp|  10 -
 test/unit/geometry/geometry.cpp|   1 -
 test/unit/geometry/geometry_converters_test.cpp| 192 
 test/unit/geometry/geometry_envelope_test.cpp  |   2 -
 test/unit/geometry/geometry_is_simple.cpp  |   1 -
 test/unit/geometry/geometry_is_valid.cpp   |   1 -
 test/unit/geometry/geometry_reprojection.cpp   |   4 -
 test/unit/geometry/label_algo_test.cpp |  64 ++
 test/unit/imaging/image.cpp|  26 +--
 test/unit/imaging/image_io_test.cpp|   2 -
 test/unit/imaging/image_set_pixel.cpp  |   4 +-
 test/unit/imaging/image_view.cpp   |   2 +-
 test/unit/imaging/tiff_io.cpp  |   2 -
 test/unit/imaging/webp_io.cpp  |   3 +-
 test/unit/pixel/agg_blend_src_over_test.cpp|   3 -
 test/unit/serialization/wkb_formats_test.cpp   |   3 -
 test/unit/serialization/xml_parser_trim.cpp|   4 +-
 test/unit/svg/svg_parser_test.cpp  |   4 +-
 test/unit/symbolizer/symbolizer_test.cpp   |   2 -
 test/unit/vertex_adapter/clipping_test.cpp |   2 -
 test/unit/vertex_adapter/line_offset_test.cpp  |   6 +-
 test/unit/vertex_adapter/offset_converter.cpp  |   5 -
 .../vertex_adapter/simplify_converters_test.cpp|  14 +-
 utils/mapnik-index/process_geojson_file.cpp|  11 +-
 52 files changed, 720 insertions(+), 666 deletions(-)
 create mode 100644 test/unit/datasource/ds_test_util.hpp
 create mode 100644 test/unit/datasource/postgis.cpp
 delete mode 100644 test/unit/geometry/geometry_converters_test.cpp

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/mapnik.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] 02/04: Merge tag 'upstream/3.0.9_rc1+ds'

2015-11-03 Thread Sebastiaan Couwenberg

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mapnik.

commit 5397d5d089248004130618cdcb0210efe3839553
Merge: 6e773ef 9872e31
Author: Bas Couwenberg 
Date:   Tue Nov 3 23:24:39 2015 +0100

Merge tag 'upstream/3.0.9_rc1+ds'

Upstream version 3.0.9~rc1+ds

 .travis.yml|   8 +-
 demo/python/rundemo.py |   9 +-
 demo/simple-renderer/render.py |   4 +-
 include/mapnik/json/error_handler.hpp  |  36 ++-
 .../json/extract_bounding_box_grammar_impl.hpp |  32 +--
 include/mapnik/json/feature_collection_grammar.hpp |  16 +-
 .../json/feature_collection_grammar_impl.hpp   |  53 +
 include/mapnik/json/geometry_grammar.hpp   |   2 +-
 include/mapnik/json/geometry_grammar_impl.hpp  |  23 +-
 include/mapnik/util/variant.hpp|  65 +-
 include/mapnik/value.hpp   | 121 +++---
 plugins/input/csv/csv_datasource.cpp   |   1 -
 plugins/input/geojson/geojson_datasource.cpp   |  10 +-
 plugins/input/geojson/geojson_index_featureset.cpp |   6 +-
 .../geojson/geojson_memory_index_featureset.cpp|   7 +-
 src/image.cpp  |   5 +-
 test/unit/core/box2d_test.cpp  |   1 -
 test/unit/core/comparison_test.cpp |  69 +-
 test/unit/core/conversions_test.cpp|   2 -
 test/unit/core/copy_move_test.cpp  |   3 -
 test/unit/core/params_test.cpp |   2 -
 test/unit/datasource/csv.cpp   | 245 ++---
 test/unit/datasource/ds_test_util.hpp  | 172 +++
 test/unit/datasource/geojson.cpp   |  21 +-
 test/unit/datasource/ogr.cpp   |   1 -
 test/unit/datasource/postgis.cpp   |  94 
 test/unit/datasource/spatial_index.cpp |   3 -
 test/unit/font/fontset_runtime_test.cpp|  10 -
 test/unit/geometry/geometry.cpp|   1 -
 test/unit/geometry/geometry_converters_test.cpp| 192 
 test/unit/geometry/geometry_envelope_test.cpp  |   2 -
 test/unit/geometry/geometry_is_simple.cpp  |   1 -
 test/unit/geometry/geometry_is_valid.cpp   |   1 -
 test/unit/geometry/geometry_reprojection.cpp   |   4 -
 test/unit/geometry/label_algo_test.cpp |  64 ++
 test/unit/imaging/image.cpp|  26 +--
 test/unit/imaging/image_io_test.cpp|   2 -
 test/unit/imaging/image_set_pixel.cpp  |   4 +-
 test/unit/imaging/image_view.cpp   |   2 +-
 test/unit/imaging/tiff_io.cpp  |   2 -
 test/unit/imaging/webp_io.cpp  |   3 +-
 test/unit/pixel/agg_blend_src_over_test.cpp|   3 -
 test/unit/serialization/wkb_formats_test.cpp   |   3 -
 test/unit/serialization/xml_parser_trim.cpp|   4 +-
 test/unit/svg/svg_parser_test.cpp  |   4 +-
 test/unit/symbolizer/symbolizer_test.cpp   |   2 -
 test/unit/vertex_adapter/clipping_test.cpp |   2 -
 test/unit/vertex_adapter/line_offset_test.cpp  |   6 +-
 test/unit/vertex_adapter/offset_converter.cpp  |   5 -
 .../vertex_adapter/simplify_converters_test.cpp|  14 +-
 utils/mapnik-index/process_geojson_file.cpp|  11 +-
 51 files changed, 713 insertions(+), 666 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/mapnik.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] 04/04: Set distribution to experimental.

2015-11-03 Thread Sebastiaan Couwenberg

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mapnik.

commit 69f493cf2b593d59c8791407e2954182bdcc2b8c
Author: Bas Couwenberg 
Date:   Tue Nov 3 23:31:35 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 8e554ea..f8a199f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-mapnik (3.0.9~rc1+ds-1) UNRELEASED; urgency=medium
+mapnik (3.0.9~rc1+ds-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.
+(closes: #803985)
 
- -- Bas Couwenberg   Tue, 03 Nov 2015 23:24:44 +0100
+ -- Bas Couwenberg   Tue, 03 Nov 2015 23:30:15 +0100
 
 mapnik (3.0.8+ds-1) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/mapnik.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] 01/01: pristine-tar data for mapnik_3.0.9~rc1+ds.orig.tar.gz

2015-11-03 Thread Sebastiaan Couwenberg

This is an automated email from the git hooks/post-receive script.

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

commit e262050dc754440ec1c9e7aa7a2f4439d3ca59fb
Author: Bas Couwenberg 
Date:   Tue Nov 3 23:24:38 2015 +0100

pristine-tar data for mapnik_3.0.9~rc1+ds.orig.tar.gz
---
 mapnik_3.0.9~rc1+ds.orig.tar.gz.delta | Bin 0 -> 3581112 bytes
 mapnik_3.0.9~rc1+ds.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/mapnik_3.0.9~rc1+ds.orig.tar.gz.delta 
b/mapnik_3.0.9~rc1+ds.orig.tar.gz.delta
new file mode 100644
index 000..102a892
Binary files /dev/null and b/mapnik_3.0.9~rc1+ds.orig.tar.gz.delta differ
diff --git a/mapnik_3.0.9~rc1+ds.orig.tar.gz.id 
b/mapnik_3.0.9~rc1+ds.orig.tar.gz.id
new file mode 100644
index 000..e5b92e1
--- /dev/null
+++ b/mapnik_3.0.9~rc1+ds.orig.tar.gz.id
@@ -0,0 +1 @@
+e64d25f9854837bc7f11f3613e8b5f4a4788f5a5

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/mapnik.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

[osm-tile-server] 17/70: Move installation of style.xml to debian/install

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 2bc57632b0fe2ad5d2ec6fea6312ef192993b54f
Author: Christopher Baines 
Date:   Fri Apr 17 15:48:24 2015 +0100

Move installation of style.xml to debian/install

Previously this was done in debian/rules.
---
 debian/install | 1 +
 debian/rules   | 4 
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/install b/debian/install
index 3c2f38c..952114f 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1,3 @@
 get-shapefiles.sh /usr/share/openstreetmap-carto/
 symbols /usr/share/openstreetmap-carto
+style.xml /usr/share/openstreetmap-carto/
diff --git a/debian/rules b/debian/rules
index 6b90827..20e53f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,10 +10,6 @@
 override_dh_auto_build:
carto project.mml > style.xml
 
-override_dh_auto_install:
-   mkdir -p debian/openstreetmap-carto/usr/share/openstreetmap-carto/
-   mv style.xml debian/openstreetmap-carto/usr/share/openstreetmap-carto/
-
 override_dh_auto_clean:
dh_auto_clean
debconf-updatepo

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 15/70: Remove debian/README.source

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit eb10dca371924df99e6f4f89ce3402f24b175cb9
Author: Christopher Baines 
Date:   Fri Apr 17 15:35:43 2015 +0100

Remove debian/README.source

Currently it does not contain any information.
---
 debian/README.source | 10 --
 1 file changed, 10 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index c8f1176..000
--- a/debian/README.source
+++ /dev/null
@@ -1,10 +0,0 @@
-openstreetmap-carto for Debian
---
-
-
-
-
-
- -- Christopher Baines   Sun, 13 Apr 2014 17:06:44 +0100
-

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 25/70: Fix YAML document syntax for upstream metadata.

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 8b9bce4e7381da5bf2e6be3ff3e0518a3efeaf1b
Author: Bas Couwenberg 
Date:   Fri Apr 17 20:37:26 2015 +0200

Fix YAML document syntax for upstream metadata.
---
 debian/upstream/metadata | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index 4fc692b..c69f1ca 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,3 +1,4 @@
+---
 Bug-Database: https://github.com/gravitystorm/openstreetmap-carto/issues
 Bug-Submit: https://github.com/gravitystorm/openstreetmap-carto/issues/new
 Name: OpenStreetMap Carto

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 30/70: Imported Upstream version 2.33.0

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 88de0f2fa8bb5458de40d6dfebe59967bec80461
Author: Bas Couwenberg 
Date:   Sun Aug 30 16:57:02 2015 +0200

Imported Upstream version 2.33.0
---
 amenity-points.mss|  49 --
 get-shapefiles.sh |  12 ++--
 landcover.mss |  88 -
 preview.png   | Bin 80167 -> 79761 bytes
 project.mml   |  26 
 project.yaml  |  66 +--
 roads.mss | 131 --
 symbols/forest.png| Bin 190 -> 17339 bytes
 symbols/musical_instrument-14.svg |  24 +++
 water.mss |  33 --
 10 files changed, 215 insertions(+), 214 deletions(-)

diff --git a/amenity-points.mss b/amenity-points.mss
index 6acb333..07e4e11 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -751,6 +751,13 @@
 marker-fill: @shop-icon;
   }
 
+  [feature = 'shop_musical_instrument'][zoom >= 17] {
+marker-file: url('symbols/musical_instrument-14.svg');
+marker-placement: interior;
+marker-clip: false;
+marker-fill: @shop-icon;
+  }
+
   [feature = 'shop_kiosk'],
   [feature = 'shop_newsagent'] {
 [zoom >= 17] {
@@ -1145,24 +1152,6 @@
 text-placement: interior;
   }
 
-  [feature = 'natural_wood'][is_building = 'no'] {
-[zoom >= 8][way_pixels > 3000],
-[zoom >= 17] {
-  text-name: "[name]";
-  text-size: @landcover-font-size;
-  [way_pixels > 12000] { text-size: @landcover-font-size-big; }
-  [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
-  text-fill: darken(@wood, 40%);
-  text-face-name: @landcover-face-name;
-  text-halo-radius: 1;
-  text-halo-fill: rgba(255,255,255,0.6);
-  text-wrap-width: @landcover-wrap-width-size;
-  [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
-  [way_pixels > 48000] {text-wrap-width: 
@landcover-wrap-width-size-bigger; }
-  text-placement: interior;
-}
-  }
-
   [feature = 'natural_peak'][zoom >= 13],
   [feature = 'natural_volcano'][zoom >= 13],
   [feature = 'natural_saddle'][zoom >= 15],
@@ -1492,6 +1481,7 @@
   }
 
   [feature = 'landuse_meadow'][is_building = 'no'],
+  [feature = 'natural_grassland'][is_building = 'no'],
   [feature = 'landuse_grass'][is_building = 'no'] {
 [zoom >= 10][way_pixels > 3000],
 [zoom >= 17] {
@@ -1528,6 +1518,7 @@
 }
   }
 
+  [feature = 'natural_wood'][is_building = 'no'],
   [feature = 'landuse_forest'][is_building = 'no'] {
 [zoom >= 8][way_pixels > 3000],
 [zoom >= 17] {
@@ -1535,7 +1526,7 @@
   text-size: @landcover-font-size;
   [way_pixels > 12000] { text-size: @landcover-font-size-big; }
   [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
-  text-fill: darken(@forest, 30%);
+  text-fill: @forest-text;
   text-face-name: @landcover-face-name;
   text-halo-radius: 1;
   text-halo-fill: rgba(255,255,255,0.6);
@@ -1966,6 +1957,7 @@
   [feature = 'shop_kiosk'],
   [feature = 'shop_mobile_phone'],
   [feature = 'shop_motorcycle'],
+  [feature = 'shop_musical_instrument'],
   [feature = 'shop_newsagent'],
   [feature = 'shop_jewelry'],
   [feature = 'shop_jewellery'],
@@ -2130,25 +2122,6 @@
 }
   }
 
-
-  [feature = 'natural_grassland'][is_building = 'no'] {
-[zoom >= 10][way_pixels > 3000],
-[zoom >= 17] {
-  text-name: "[name]";
-  text-size: @landcover-font-size;
-  [way_pixels > 12000] { text-size: @landcover-font-size-big; }
-  [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
-  text-fill: darken(@grass, 50%);
-  text-face-name: @landcover-face-name;
-  text-halo-radius: 1;
-  text-halo-fill: rgba(255,255,255,0.6);
-  text-wrap-width: @landcover-wrap-width-size;
-  [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
-  [way_pixels > 48000] {text-wrap-width: 
@landcover-wrap-width-size-bigger; }
-  text-placement: interior;
-}
-  }
-
   [feature = 'natural_scrub'][is_building = 'no'] {
 [zoom >= 10][way_pixels > 3000],
 [zoom >= 17] {
diff --git a/get-shapefiles.sh b/get-shapefiles.sh
index 9e9b7ca..152eea5 100755
--- a/get-shapefiles.sh
+++ b/get-shapefiles.sh
@@ -13,7 +13,7 @@ mkdir -p data/ne_10m_populated_places
 mkdir -p data/land-polygons-split-3857
 
 # world_boundaries
-echo "dowloading world_boundaries..."
+echo "downloading world_boundaries..."
 curl -z "data/world_boundaries-spherical.tgz" -L -o 
"data/world_boundaries-spherical.tgz" 
"http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz;
 echo "expanding world_boundaries..."
 tar -xzf data/world_boundaries-spherical.tgz -C data/
@@ -31,7 +31,7 @@ unzip

[osm-tile-server] 16/70: Include full CC0 license in debian/copyright

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 2804389208480653cdba97b03ead96932bfbbd41
Author: Christopher Baines 
Date:   Fri Apr 17 15:43:57 2015 +0100

Include full CC0 license in debian/copyright
---
 debian/copyright | 141 ---
 1 file changed, 123 insertions(+), 18 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index b9d4e84..0894f79 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,23 +2,6 @@ Format: 
http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: openstreetmap-carto
 Source: 
 
-License: CC0
- OpenStreetMap Carto: A global map style for OpenStreetMap maps.
- .
- Created by Andy Allan  and contributors.
- Based on original cartography by Steve Chilton and others.
- .
- This software and associated documentation files (the "Software") is
- released under the CC0 Public Domain Dedication, version 1.0, as
- published by Creative Commons. To the extent possible under law, the
- author(s) have dedicated all copyright and related and neighboring
- rights to the Software to the public domain worldwide. The Software is
- distributed WITHOUT ANY WARRANTY.
- .
- If you did not receive a copy of the CC0 Public Domain Dedication
- along with the Software, see
- 
-
 Files: *
 Copyright: 2012-2015 Andy Allan 
 License: CC0
@@ -28,5 +11,127 @@ Copyright: 2014 Paul Norman
 License: CC0
 
 Files: debian/*
-Copyright: 2014 Christopher Baines 
+Copyright: 2014-2015 Christopher Baines 
+License: CC0
+
 License: CC0
+ Creative Commons CC0 1.0 Universal
+ .
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+ SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN ATTORNEY-CLIENT
+ RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+ CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE OF THIS DOCUMENT OR THE
+ INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES
+ RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+ HEREUNDER.
+ .
+ Statement of Purpose
+ .
+ The laws of most jurisdictions throughout the world automatically confer
+ exclusive Copyright and Related Rights (defined below) upon the creator and
+ subsequent owner(s) (each and all, an "owner") of an original work of
+ authorship and/or a database (each, a "Work").
+ .
+ Certain owners wish to permanently relinquish those rights to a Work for the
+ purpose of contributing to a commons of creative, cultural and scientific 
works
+ ("Commons") that the public can reliably and without fear of later claims of
+ infringement build upon, modify, incorporate in other works, reuse and
+ redistribute as freely as possible in any form whatsoever and for any 
purposes,
+ including without limitation commercial purposes. These owners may contribute
+ to the Commons to promote the ideal of a free culture and the further
+ production of creative, cultural and scientific works, or to gain reputation 
or
+ greater distribution for their Work in part through the use and efforts of
+ others.
+ .
+ For these and/or other purposes and motivations, and without any expectation 
of
+ additional consideration or compensation, the person associating CC0 with a
+ Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
+ and Related Rights in the Work, voluntarily elects to apply CC0 to the Work 
and
+ publicly distribute the Work under its terms, with knowledge of his or her
+ Copyright and Related Rights in the Work and the meaning and intended legal
+ effect of CC0 on those rights.
+ .
+ 1. Copyright and Related Rights. A Work made available under CC0 may be
+ protected by copyright and related or neighboring rights ("Copyright and
+ Related Rights"). Copyright and Related Rights include, but are not limited 
to,
+ the following:
+ .
+ i. the right to reproduce, adapt, distribute, perform, display, communicate,
+ and translate a Work;
+ .
+ ii. moral rights retained by the original author(s) and/or performer(s);
+ .
+ iii. publicity and privacy rights pertaining to a person's image or likeness
+ depicted in a Work;
+ .
+ iv. rights protecting against unfair competition in regards to a Work, subject
+ to the limitations in paragraph 4(a), below;
+ .
+ v. rights protecting the extraction, dissemination, use and reuse of data in a
+ Work;
+ .
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+ European Parliament and of the Council of 11 March 1996 on the legal 
protection
+ of databases, and under any national implementation thereof, including any
+ amended or successor version of such directive); and
+ .
+

[osm-tile-server] 14/70: Run cme on debian/control

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 3177be889a0c1fb5a72c73cd0ea94403cdd82c19
Author: Christopher Baines 
Date:   Fri Apr 17 15:33:03 2015 +0100

Run cme on debian/control

Use Config::Model to unify the formatting, and change the VCS urls.
---
 debian/control | 23 ---
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 483c67b..18fd8c6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,27 @@
 Source: openstreetmap-carto
-Section: graphics
-Priority: optional
 Maintainer: Debian GIS Project 
 Uploaders: Christopher Baines 
-Build-Depends: debhelper (>= 9.0.0), node-carto, po-debconf
+Section: graphics
+Priority: optional
+Build-Depends: debhelper (>= 9.0.0),
+   node-carto,
+   po-debconf
 Standards-Version: 3.9.6
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/openstreetmap-carto.git
+Vcs-Git: git://anonscm.debian.org/pkg-grass/openstreetmap-carto.git
 Homepage: https://github.com/gravitystorm/openstreetmap-carto
-Vcs-Git: git://git.debian.org/pkg-grass/openstreetmap-carto.git
-Vcs-Browser: 
http://git.debian.org/?p=pkg-grass/openstreetmap-carto.git;a=summary
 
 Package: openstreetmap-carto
 Architecture: all
-Depends: ${misc:Depends}, ttf-dejavu, curl, unzip, gdal-bin, mapnik-utils
-Recommends: fonts-sipa-arundina, fonts-sil-padauk, fonts-khmeros
+Depends: ${misc:Depends},
+ ttf-dejavu,
+ curl,
+ unzip,
+ gdal-bin,
+ mapnik-utils
+Recommends: fonts-sipa-arundina,
+fonts-sil-padauk,
+fonts-khmeros
 Description: standard OpenStreetMap Mapnik stylesheet
  This package provides the standard OpenStreetMap stylesheet for Mapnik, built
  from the CartoCSS source. It also provides the necessary icons, and the script

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 34/70: Align paths in install file.

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 43153f234f923fbf8b2a10bfd59469bf146e22c3
Author: Bas Couwenberg 
Date:   Sun Aug 30 17:05:10 2015 +0200

Align paths in install file.
---
 debian/install | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/install b/debian/install
index 952114f..091e4bf 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,3 @@
-get-shapefiles.sh /usr/share/openstreetmap-carto/
-symbols /usr/share/openstreetmap-carto
-style.xml /usr/share/openstreetmap-carto/
+get-shapefiles.sh usr/share/openstreetmap-carto/
+symbols   usr/share/openstreetmap-carto
+style.xml usr/share/openstreetmap-carto/

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 32/70: Merge tag 'upstream/2.34.0'

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit eb799fece176be04570ba2e7cea9e26f3419ba2a
Merge: c281a14 f360d66
Author: Bas Couwenberg 
Date:   Sun Aug 30 16:57:17 2015 +0200

Merge tag 'upstream/2.34.0'

Upstream version 2.34.0

 .gitattributes  |   1 +
 .gitignore  |   1 +
 .travis.yml |  10 +-
 INSTALL.md  |   7 +-
 README.md   |   2 +-
 admin.mss   |   6 +-
 aerialways.mss  |  39 +-
 amenity-points.mss  | 812 
 buildings.mss   |  10 +-
 citywalls.mss   |  11 -
 get-shapefiles.sh   |  31 +-
 landcover.mss   | 270 +
 preview.png | Bin 219577 -> 79418 bytes
 project.mml | 242 +
 project.yaml| 710 
 roads.mss   | 441 +--
 shapefiles.mss  |  22 +-
 stations.mss|   6 +-
 symbols/amenity_court.p.20.png  | Bin 802 -> 0 bytes
 symbols/archaeological_site.16.svg  |  14 +
 symbols/beauty-14.svg   |  40 ++
 symbols/bench.16.svg|  40 ++
 symbols/beverages-14.svg|  47 ++
 symbols/bicycle_parking.16.svg  |  40 ++
 symbols/bus_stop.12.svg |  14 +
 symbols/bus_stop.p.12.png   | Bin 353 -> 0 bytes
 symbols/cable_car.png   | Bin 229 -> 0 bytes
 symbols/car_parts-14.svg|  40 ++
 symbols/caravan_park.16.svg |  14 +
 symbols/caravan_park.p.24.png   | Bin 486 -> 0 bytes
 symbols/chair_lift.png  | Bin 230 -> 0 bytes
 symbols/chemist-14.svg  |  40 ++
 symbols/community_centre-14.svg |  38 ++
 symbols/computer-14.svg |  30 +
 symbols/confectionery-14.svg|  33 ++
 symbols/courthouse-16.svg   |  40 ++
 symbols/elevator-12.svg |  38 ++
 symbols/emergency_phone.16.svg  |  14 +
 symbols/entrance.10.svg |  40 ++
 symbols/forest.png  | Bin 190 -> 17339 bytes
 symbols/garden_centre-14.svg|  40 ++
 symbols/greengrocer-14.svg  |  40 ++
 symbols/hifi-14.svg |  38 ++
 symbols/hostel.16.svg   |  40 ++
 symbols/hostel.p.20.png | Bin 597 -> 0 bytes
 symbols/hotel.16.svg|  40 ++
 symbols/hotel2.p.20.png | Bin 368 -> 0 bytes
 symbols/hunting-stand.16.svg|  40 ++
 symbols/ice-cream-14.svg|  40 ++
 symbols/laundry-14.svg  |  45 ++
 symbols/lighthouse.16.svg   |  40 ++
 symbols/lighthouse.p.20.png | Bin 487 -> 0 bytes
 symbols/monument.16.svg |  14 +
 symbols/motel.16.svg|  40 ++
 symbols/motel.p.20.png  | Bin 657 -> 0 bytes
 symbols/motorcycle-14.svg   |  36 ++
 symbols/motorcycle_parking.16.svg   |  38 ++
 symbols/musical_instrument-14.svg   |  24 +
 symbols/newsagent-14.svg|  46 ++
 symbols/orchard.png | Bin 134 -> 94 bytes
 symbols/perfumery-14.svg|  31 ++
 symbols/photo-14.svg|  31 ++
 symbols/post_box-12.svg |  37 ++
 symbols/post_box.p.16.png   | Bin 367 -> 0 bytes
 symbols/post_office-14.svg  |  40 ++
 symbols/post_office.p.16.png| Bin 494 -> 0 bytes
 symbols/power_wind-16.svg   |  40 ++
 symbols/power_wind.png  | Bin 638 -> 0 bytes
 symbols/quarry.png  | Bin 189 -> 9863 bytes
 symbols/seafood-14.svg  |  24 +
 symbols/shop_alcohol.16.svg |  14 +
 symbols/shop_bicycle.16.svg |  40 ++
 symbols/shop_clothes.16.svg |  14 +
 symbols/shop_clothes.svg|   4 -
 symbols/shop_diy.16.svg |  40 ++
 symbols/shop_diy.p.16.png   | Bin 383 -> 0 bytes
 symbols/shop_electronics.16.svg |  14 +
 symbols/shop_furniture.16.svg   |  14 +
 symbols/shop_gift.16.svg|  14 +
 symbols/shop_jewelry.16.svg |  14 +
 symbols/shop_mobile_phone.16.svg

[osm-tile-server] 33/70: New upstream release.

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit cae4918db88aba9112d0f3ae3a023f2eb302f97e
Author: Bas Couwenberg 
Date:   Sun Aug 30 17:01:37 2015 +0200

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

diff --git a/debian/changelog b/debian/changelog
index aab998c..5f835ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-openstreetmap-carto (2.29.1-2) UNRELEASED; urgency=medium
+openstreetmap-carto (2.34.0-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release.
   * Update watch file, changes:
 - Add common version mangling
 - Improve filename mangling
 - Support other tar extensions
 
- -- Bas Couwenberg   Sat, 01 Aug 2015 13:04:21 +0200
+ -- Bas Couwenberg   Sun, 30 Aug 2015 17:01:36 +0200
 
 openstreetmap-carto (2.29.1-1) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 19/70: Improve debian/watch

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 0d08ab3bf5457454916b8fb7bbfed818a2230dec
Author: Christopher Baines 
Date:   Fri Apr 17 15:59:14 2015 +0100

Improve debian/watch

I am unsure the regex will still work if upstream release 3.1.0, or 
something
similar with only one digit in the second position...
---
 debian/watch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/watch b/debian/watch
index 7c36051..cfebd9d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-https://github.com/gravitystorm/openstreetmap-carto/releases 
/gravitystorm/openstreetmap-carto/archive/v(.*).tar.gz
+opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/openstreetmap-carto-$1\.tar\.gz/ \
+  https://github.com/gravitystorm/openstreetmap-carto/tags 
.*/?(\d\.\d{2}.\d)\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 31/70: Imported Upstream version 2.34.0

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit f360d667736f30853232ddfa6d898d4314e9a02a
Author: Bas Couwenberg 
Date:   Sun Aug 30 16:57:16 2015 +0200

Imported Upstream version 2.34.0
---
 INSTALL.md  |   5 +-
 README.md   |   2 +-
 amenity-points.mss  |  26 +--
 buildings.mss   |   6 ++
 landcover.mss   |  42 +++---
 preview.png | Bin 79761 -> 79418 bytes
 project.mml |  78 +++
 project.yaml|  95 ++-
 roads.mss   | 166 
 shapefiles.mss  |   2 +-
 symbols/community_centre-14.svg |  38 +
 symbols/quarry.png  | Bin 189 -> 9863 bytes
 symbols/veterinary-14.svg   |  40 ++
 13 files changed, 411 insertions(+), 89 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index 3633e6d..5a65290 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -37,7 +37,8 @@ Put these shapefiles at `path/to/openstreetmap-carto/data`.
 ### Populated places shapefile
 
 The Natural Earth 2.0 populated places shapefile contains data that triggers a 
bug in mapnik. As
-a workaround we run the shapefile through ogr2ogr to clean up the data.
+a workaround we run the shapefile through ogr2ogr to clean up the data. This 
is not required for
+Mapnik 2.2 or later, where the shapefile can just be renamed.
 
 ```
 ogr2ogr ne_10m_populated_places_fixed.shp ne_10m_populated_places.shp
@@ -82,7 +83,7 @@ In Ubuntu 13.10 (Saucy) and lower, replace fonts-taml-tscu 
with ttf-tamil-fonts.
 If you aren't using TileMill, you can compile the CartoCSS stylesheets into 
Mapnik XML using the command-line `carto` command.
 
 * [carto](https://github.com/mapbox/carto) >= 0.9.5 (we're using instances 
with cascading rules and min/max zoom properties)
-* [mapnik](https://github.com/mapnik/mapnik/wiki/Mapnik-Installation) >= 
2.1.0. Mapnik 3.0.0 support is not yet complete.
+* [mapnik](https://github.com/mapnik/mapnik/wiki/Mapnik-Installation) >= 
2.1.0. Mapnik 3.0 is supported, but not required.
 
 ---
 
diff --git a/README.md b/README.md
index d51126b..67c2bd8 100644
--- a/README.md
+++ b/README.md
@@ -81,4 +81,4 @@ maps using mapnik, many based on this project. Some 
alternatives are:
 * Andy Allan [@gravitystorm](https://github.com/gravitystorm/)
 * Matthijs Melissen [@math1985](https://github.com/math1985/)
 * Paul Norman [@pnorman](https://github.com/pnorman/)
-* Mateusz Konieczny [@matkoniecz](https://github.com/mkoniecz/)
+* Mateusz Konieczny [@matkoniecz](https://github.com/matkoniecz/)
diff --git a/amenity-points.mss b/amenity-points.mss
index 07e4e11..cad3ae8 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -126,12 +126,12 @@
 marker-fill: @transportation-icon;
   }
 
-  [feature = 'amenity_car_sharing'][zoom >= 16] {
+  [feature = 'amenity_car_sharing'][zoom >= 18] {
 point-file: url('symbols/car_share.p.16.png');
 point-placement: interior;
   }
 
-  [feature = 'amenity_car_rental'][zoom >= 16] {
+  [feature = 'amenity_car_rental'][zoom >= 17] {
 marker-file: url('symbols/rental_car.16.svg');
 marker-fill: @transportation-icon;
 marker-placement: interior;
@@ -235,6 +235,13 @@
 marker-clip: false;
   }
 
+  [feature = 'amenity_community_centre'][zoom >= 17] {
+marker-file: url('symbols/community_centre-14.svg');
+marker-fill: @amenity-brown;
+marker-placement: interior;
+marker-clip: false;
+  }
+
   [feature = 'amenity_townhall'][zoom >= 16] {
 marker-file: url('symbols/town_hall.16.svg');
 marker-fill: @amenity-brown;
@@ -298,6 +305,13 @@
 marker-clip: false;
   }
 
+  [feature = 'amenity_veterinary'][zoom >= 17] {
+marker-file: url('symbols/veterinary-14.svg');
+marker-fill: @health-color;
+marker-placement: interior;
+marker-clip: false;
+  }
+
   [feature = 'amenity_place_of_worship'][zoom >= 16] {
 marker-file: url('symbols/place_of_worship.16.svg');
 marker-fill: #00;
@@ -1077,7 +1091,7 @@
   }
 
   [feature = 'amenity_car_rental'][zoom >= 17],
-  [feature = 'amenity_car_sharing'][zoom >= 17],
+  [feature = 'amenity_car_sharing'][zoom >= 18],
   [feature = 'amenity_bicycle_rental'][zoom >= 17],
   [feature = 'leisure_slipway'][zoom >= 17] {
 text-name: "[name]";
@@ -1120,6 +1134,7 @@
 
 
   [feature = 'amenity_police'][zoom >= 17],
+  [feature = 'amenity_community_centre'][zoom >= 17],
   [feature = 'amenity_fire_station'][zoom >= 17],
   [feature = 'amenity_drinking_water'][zoom >= 17],
   [feature = 'amenity_recyling'][zoom >= 17],
@@ -1903,7 +1918,8 @@
   [feature = 'amenity_clinic'],
   [feature = 'amenity_pharmacy'],
   [feature = 'amenity_doctors'],
-  [feature = 'amenity_dentist'] {
+  [feature = 'amenity_dentist'],
+  [feature =

[osm-tile-server] 39/70: Close bug in changelog.

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 8ca10c317082b026c85dd05a6cac9376b0e2
Author: Bas Couwenberg 
Date:   Fri Sep 18 01:04:49 2015 +0200

Close bug in changelog.
---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index 13e05fd..18fe765 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openstreetmap-carto (2.35.0-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release.
+- Mapnik 3 supported since 2.34.0. (closes: #797975)
   * Update watch file, changes:
 - Add common version mangling
 - Improve filename mangling

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 46/70: Include debconf translation updates

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 97bbf88dca26a88738e110deb87ba3c8caae103c
Author: Ruben Undheim 
Date:   Sun Oct 11 13:34:19 2015 +0200

Include debconf translation updates
---
 debian/changelog| 14 +-
 debian/openstreetmap-carto-common.templates | 20 ++---
 debian/openstreetmap-carto.templates| 17 +--
 debian/po/POTFILES.in   |  2 +-
 debian/po/cs.po | 67 +++
 debian/po/da.po | 66 +++
 debian/po/de.po | 70 +
 debian/po/fr.po | 69 
 debian/po/it.po | 68 
 debian/po/nl.po | 70 +
 debian/po/pt.po | 69 
 debian/po/pt_BR.po  | 68 
 debian/po/ru.po | 69 
 debian/po/templates.pot | 45 ---
 14 files changed, 688 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e06b53..48d78b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,19 @@
 openstreetmap-carto (2.35.0-2) UNRELEASED; urgency=low
 
   * Team upload
-  * New binary: openstreetmap-carto-common
+  * Split in two binaries: openstreetmap-carto-common and openstreetmap-carto
+  * Debconf templates and debian/control reviewed by the debian-l10n-
+english team as part of the Smith review project. Closes: #793938
+  * [Debconf translation updates]
+  * Portuguese (Américo Monteiro).  Closes: #798894
+  * Czech (Michal Simunek).  Closes: #799051
+  * German (Chris Leick).  Closes: #799066
+  * Russian (Yuri Kozlov).  Closes: #799187
+  * Brazilian Portuguese (Adriano Rafael Gomes).  Closes: #799411
+  * Dutch; (Frans Spiesschaert).  Closes: #799461
+  * Italian (Beatrice Torracca).  Closes: #799751
+  * French (Jean-Pierre Giraud).  Closes: #799874
+  * Danish (Joe Hansen).  Closes: #799878
 
  -- Ruben Undheim   Sat, 19 Sep 2015 19:12:15 +0200
 
diff --git a/debian/openstreetmap-carto-common.templates 
b/debian/openstreetmap-carto-common.templates
index 969e943..9939692 100644
--- a/debian/openstreetmap-carto-common.templates
+++ b/debian/openstreetmap-carto-common.templates
@@ -1,8 +1,18 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-engl...@lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
 Template: openstreetmap-carto/fetch-data
 Type: boolean
-_Description: Fetch data files from the web?
- The openstreetmap-carto stylesheet uses several datafiles, this package
- includes a script to fetch these from the web. This can be done manually later
- by running the get-shapefiles.sh script in the /usr/share/openstreetmap-carto
+_Description: Download OpenStreetMap data files from the Internet?
+ The openstreetmap-carto stylesheet uses several data files that must
+ be downloaded from the Internet. 
+ .
+ If you choose not to do this now, it can be done manually later
+ by running the "get-shapefiles.sh" script in the 
/usr/share/openstreetmap-carto-common
  directory.
-
diff --git a/debian/openstreetmap-carto.templates 
b/debian/openstreetmap-carto.templates
index e05b2c7..966ba82 100644
--- a/debian/openstreetmap-carto.templates
+++ b/debian/openstreetmap-carto.templates
@@ -1,6 +1,17 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-engl...@lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
 Template: openstreetmap-carto/database-name
 Type: string
 Default: gis
-_Description: Name of the postgresql database:
- The stylesheet describes how to render OpenStreetMap data contained within a
- postgresql database. The name of the database is by default debian-osm-carto.
+_Description: PostgreSQL database name:
+ The openstreetmap-carto stylesheet uses a PostgreSQL database to
+ store OpenStreetMap data.
+ .
+ Please choose the name for this database.
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index e580142..8455e40 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1,2 +1,2 @@
-[type: gettext/rfc822deb] openstreetmap-carto.templates
 [type: gettext/rfc822deb]

[osm-tile-server] 35/70: Enable parallel builds.

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit a54f0612324ca54a70dd85f2012e36a270443965
Author: Bas Couwenberg 
Date:   Sun Aug 30 17:06:45 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 5f835ce..f90c8a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ openstreetmap-carto (2.34.0-1) UNRELEASED; urgency=medium
 - Add common version mangling
 - Improve filename mangling
 - Support other tar extensions
+  * Enable parallel builds.
 
  -- Bas Couwenberg   Sun, 30 Aug 2015 17:01:36 +0200
 
diff --git a/debian/rules b/debian/rules
index 20e53f3..aecb240 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 %:
-   dh $@ 
+   dh $@ --parallel
 
 override_dh_auto_build:
carto project.mml > style.xml

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 44/70: Delete style.xml in prerm instead.

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 611e3cf68dd230b43f8b9411cf73bd184deb817a
Author: Ruben Undheim 
Date:   Sat Sep 19 19:49:07 2015 +0200

Delete style.xml in prerm instead.
---
 debian/openstreetmap-carto.postinst |  4 +---
 debian/openstreetmap-carto.postrm   | 38 
 debian/openstreetmap-carto.prerm| 39 +
 3 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/debian/openstreetmap-carto.postinst 
b/debian/openstreetmap-carto.postinst
index 16244fe..d8ac8fb 100755
--- a/debian/openstreetmap-carto.postinst
+++ b/debian/openstreetmap-carto.postinst
@@ -9,10 +9,8 @@ set -e
 case "$1" in
   configure|triggered)
 
-db_get openstreetmap-carto/database-name
-if [ "$RET" != "gis" ]; then
+db_get openstreetmap-carto/database-name
 sed -e"s/\[gis\]/\[$RET\]/" 
/usr/share/openstreetmap-carto-common/style.xml > 
/usr/share/openstreetmap-carto/style.xml
-fi
 
   ;;
 
diff --git a/debian/openstreetmap-carto.postrm 
b/debian/openstreetmap-carto.postrm
deleted file mode 100644
index 9c5bb71..000
--- a/debian/openstreetmap-carto.postrm
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# postrm script for test
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#*  `remove'
-#*  `purge'
-#*  `upgrade' 
-#*  `failed-upgrade' 
-#*  `abort-install'
-#*  `abort-install' 
-#*  `abort-upgrade' 
-#*  `disappear' 
-#  
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-   rm -f /usr/share/openstreetmap-carto/style.xml
-;;
-
-*)
-echo "postrm called with unknown argument \`$1'" >&2
-exit 1
-;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/openstreetmap-carto.prerm b/debian/openstreetmap-carto.prerm
new file mode 100644
index 000..3f1af85
--- /dev/null
+++ b/debian/openstreetmap-carto.prerm
@@ -0,0 +1,39 @@
+#!/bin/sh
+# prerm script for tull
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#*  `remove'
+#*  `upgrade' 
+#*  `failed-upgrade' 
+#*  `remove' `in-favour'  
+#*  `deconfigure' `in-favour'
+#`removing'
+#   
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+remove|upgrade|deconfigure)
+   rm -f /usr/share/openstreetmap-carto/style.xml
+;;
+
+failed-upgrade)
+;;
+
+*)
+echo "prerm called with unknown argument \`$1'" >&2
+exit 1
+;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 47/70: Added lintian-override for broken symlink with explanation

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 85c403ac60f058249b890ecf4c971eaf8b3ea569
Author: Ruben Undheim 
Date:   Sun Oct 11 13:36:55 2015 +0200

Added lintian-override for broken symlink with explanation
---
 debian/openstreetmap-carto.lintian-overrides | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/openstreetmap-carto.lintian-overrides 
b/debian/openstreetmap-carto.lintian-overrides
new file mode 100644
index 000..ffbdbf8
--- /dev/null
+++ b/debian/openstreetmap-carto.lintian-overrides
@@ -0,0 +1,3 @@
+# This symlink is not broken after the configure step of 
openstreetmap-carto-common has 
+# completed
+openstreetmap-carto binary: package-contains-broken-symlink 
usr/share/openstreetmap-carto/data ../openstreetmap-carto-common/data

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 43/70: Delete style.xml when removing package

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 9211287d0afd6487efaec4636981aee7c98e24c5
Author: Ruben Undheim 
Date:   Sat Sep 19 19:49:07 2015 +0200

Delete style.xml when removing package
---
 debian/openstreetmap-carto.postrm | 38 ++
 1 file changed, 38 insertions(+)

diff --git a/debian/openstreetmap-carto.postrm 
b/debian/openstreetmap-carto.postrm
new file mode 100644
index 000..9c5bb71
--- /dev/null
+++ b/debian/openstreetmap-carto.postrm
@@ -0,0 +1,38 @@
+#!/bin/sh
+# postrm script for test
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#*  `remove'
+#*  `purge'
+#*  `upgrade' 
+#*  `failed-upgrade' 
+#*  `abort-install'
+#*  `abort-install' 
+#*  `abort-upgrade' 
+#*  `disappear' 
+#  
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+   rm -f /usr/share/openstreetmap-carto/style.xml
+;;
+
+*)
+echo "postrm called with unknown argument \`$1'" >&2
+exit 1
+;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 36/70: Imported Upstream version 2.35.0

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit a5f120c84806aaed123a95f00df76d1c2fd14783
Author: Bas Couwenberg 
Date:   Fri Sep 18 00:57:45 2015 +0200

Imported Upstream version 2.35.0
---
 amenity-points.mss |  30 +++--
 landcover.mss  |   3 +-
 power.mss  |  14 --
 project.mml|  10 ++---
 project.yaml   |  18 
 scripts/shop_values.rb |   3 +-
 symbols/ford.16.svg|  14 ++
 symbols/generating_patterns/bare_ground.md |   8 
 symbols/generating_patterns/bog.svg|   9 
 symbols/generating_patterns/forest.md  |  11 +
 symbols/generating_patterns/forest.svg |  11 +
 symbols/generating_patterns/mangrove.svg   |   9 
 symbols/generating_patterns/marsh.svg  |   9 
 symbols/generating_patterns/reed.svg   |   9 
 symbols/generating_patterns/rock.svg   |   9 
 symbols/generating_patterns/rock_over...@2x.png| Bin 0 -> 366422 bytes
 symbols/generating_patterns/scree.svg  |   9 
 symbols/generating_patterns/scree_over...@2x.png   | Bin 0 -> 193106 bytes
 symbols/generating_patterns/swamp.svg  |   9 
 symbols/generating_patterns/wetland.md |  16 +++
 symbols/generating_patterns/wetland.svg|   9 
 symbols/generating_patterns/wetland_...@2x.png | Bin 0 -> 62283 bytes
 symbols/generating_patterns/wetland_gene...@2x.png | Bin 0 -> 2775 bytes
 .../generating_patterns/wetland_mangr...@2x.png| Bin 0 -> 87241 bytes
 symbols/generating_patterns/wetland_ma...@2x.png   | Bin 0 -> 87828 bytes
 symbols/generating_patterns/wetland_r...@2x.png| Bin 0 -> 111331 bytes
 symbols/generating_patterns/wetland_sw...@2x.png   | Bin 0 -> 75742 bytes
 symbols/nightclub.14.svg   |  40 ++
 symbols/nightclub.18.svg   |  47 -
 symbols/rock_overlay.png   | Bin 98024 -> 97723 bytes
 symbols/scree_overlay.png  | Bin 44048 -> 34358 bytes
 symbols/transport_ford.p.16.png| Bin 490 -> 0 bytes
 32 files changed, 217 insertions(+), 80 deletions(-)

diff --git a/amenity-points.mss b/amenity-points.mss
index cad3ae8..8fa0a4d 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -1,6 +1,7 @@
 @marina-text: #576ddf; // also swimming_pool
 @wetland-text: darken(#4aa5fa, 25%); /* Also for marsh and mud */
 @shop-icon: #ac39ac;
+@shop-text: #939;
 @transportation-icon: #0092da;
 @transportation-text: #0066ff;
 @airtransport: #8461C4;
@@ -115,8 +116,10 @@
   }
 
   [feature = 'highway_ford'][zoom >= 16] {
-point-file: url('symbols/transport_ford.p.16.png');
-point-placement: interior;
+marker-file: url('symbols/ford.16.svg');
+marker-fill: @transportation-icon;
+marker-placement: interior;
+marker-clip: false;
   }
 
   [feature = 'tourism_caravan_site'][zoom >= 16] {
@@ -151,7 +154,7 @@
   }
 
   [feature = 'amenity_nightclub'][zoom >= 17] {
-marker-file: url('symbols/nightclub.18.svg');
+marker-file: url('symbols/nightclub.14.svg');
 marker-fill: @amenity-brown;
 marker-placement: interior;
 marker-clip: false;
@@ -1010,13 +1013,13 @@
 
   [amenity = 'bench'][zoom >= 19]::amenity {
 marker-file: url('symbols/bench.16.svg');
-marker-fill: #744a08;
+marker-fill: @amenity-brown;
 marker-placement: interior;
   }
 
   [amenity = 'waste_basket'][zoom >= 19]::amenity {
 marker-file: url('symbols/waste_basket.10.svg');
-marker-fill: #744a08;
+marker-fill: @amenity-brown;
 marker-placement: interior;
   }
 }
@@ -1062,6 +1065,9 @@
   [feature = 'amenity_bar']{
 text-dy: 13;
   }
+  [feature = 'amenity_nightclub']{
+text-dy: 12;
+  }
 }
   }
 
@@ -1137,7 +1143,6 @@
   [feature = 'amenity_community_centre'][zoom >= 17],
   [feature = 'amenity_fire_station'][zoom >= 17],
   [feature = 'amenity_drinking_water'][zoom >= 17],
-  [feature = 'amenity_recyling'][zoom >= 17],
   [feature = 'tourism_picnic_site'][zoom >= 17],
   [feature = 'leisure_picnic_table'][zoom >= 17],
   [feature = 'amenity_post_office'][zoom >= 17] {
@@ -1363,7 +1368,6 @@
   [feature = 'leisure_park'][is_building = 'no'],
   [feature = 'leisure_recreation_ground'][is_building = 'no'],
   [feature = 'landuse_recreation_ground'][is_building = 'no'],
-  [feature = 'landuse_conservation'][is_building = 'no'],
   [feature = 'landuse_village_green'][is_building = 'no'],
   [feature = 'leisure_common'][is_building = 'no'],
   [feature =

[osm-tile-server] 45/70: Added preinst for moving old data directory out of the way.

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 85ad389154813a930a22ea62fbbb94ee4d49e625
Author: Ruben Undheim 
Date:   Sun Oct 11 13:02:44 2015 +0200

Added preinst for moving old data directory out of the way.
---
 debian/openstreetmap-carto.preinst | 38 ++
 1 file changed, 38 insertions(+)

diff --git a/debian/openstreetmap-carto.preinst 
b/debian/openstreetmap-carto.preinst
new file mode 100644
index 000..45219d8
--- /dev/null
+++ b/debian/openstreetmap-carto.preinst
@@ -0,0 +1,38 @@
+#!/bin/sh
+# preinst script for magic
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#*  `install'
+#*  `install' 
+#*  `upgrade' 
+#*  `abort-upgrade' 
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+install|upgrade)
+if [ -d /usr/share/openstreetmap-carto/data ] ; then
+mv /usr/share/openstreetmap-carto/data 
/usr/share/openstreetmap-carto/data.old
+fi
+;;
+
+abort-upgrade)
+;;
+
+*)
+echo "preinst called with unknown argument \`$1'" >&2
+exit 1
+;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 37/70: Merge tag 'upstream/2.35.0'

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit aabbb6653958c97018c95c29e949b2b5b6a3548d
Merge: a54f061 a5f120c
Author: Bas Couwenberg 
Date:   Fri Sep 18 00:57:48 2015 +0200

Merge tag 'upstream/2.35.0'

Upstream version 2.35.0

 amenity-points.mss |  30 +++--
 landcover.mss  |   3 +-
 power.mss  |  14 --
 project.mml|  10 ++---
 project.yaml   |  18 
 scripts/shop_values.rb |   3 +-
 symbols/ford.16.svg|  14 ++
 symbols/generating_patterns/bare_ground.md |   8 
 symbols/generating_patterns/bog.svg|   9 
 symbols/generating_patterns/forest.md  |  11 +
 symbols/generating_patterns/forest.svg |  11 +
 symbols/generating_patterns/mangrove.svg   |   9 
 symbols/generating_patterns/marsh.svg  |   9 
 symbols/generating_patterns/reed.svg   |   9 
 symbols/generating_patterns/rock.svg   |   9 
 symbols/generating_patterns/rock_over...@2x.png| Bin 0 -> 366422 bytes
 symbols/generating_patterns/scree.svg  |   9 
 symbols/generating_patterns/scree_over...@2x.png   | Bin 0 -> 193106 bytes
 symbols/generating_patterns/swamp.svg  |   9 
 symbols/generating_patterns/wetland.md |  16 +++
 symbols/generating_patterns/wetland.svg|   9 
 symbols/generating_patterns/wetland_...@2x.png | Bin 0 -> 62283 bytes
 symbols/generating_patterns/wetland_gene...@2x.png | Bin 0 -> 2775 bytes
 .../generating_patterns/wetland_mangr...@2x.png| Bin 0 -> 87241 bytes
 symbols/generating_patterns/wetland_ma...@2x.png   | Bin 0 -> 87828 bytes
 symbols/generating_patterns/wetland_r...@2x.png| Bin 0 -> 111331 bytes
 symbols/generating_patterns/wetland_sw...@2x.png   | Bin 0 -> 75742 bytes
 symbols/nightclub.14.svg   |  40 ++
 symbols/nightclub.18.svg   |  47 -
 symbols/rock_overlay.png   | Bin 98024 -> 97723 bytes
 symbols/scree_overlay.png  | Bin 44048 -> 34358 bytes
 symbols/transport_ford.p.16.png| Bin 490 -> 0 bytes
 32 files changed, 217 insertions(+), 80 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 41/70: Split in two binary packages

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 9c3f389d6bb9ae2a19b245aa7890ef0a0cfc549c
Author: Ruben Undheim 
Date:   Sat Sep 19 17:16:33 2015 +0200

Split in two binary packages
---
 debian/control | 12 +-
 debian/install |  3 --
 .../{config => openstreetmap-carto-common.config}  |  3 --
 debian/{docs => openstreetmap-carto-common.docs}   |  0
 debian/openstreetmap-carto-common.install  |  3 ++
 debian/openstreetmap-carto-common.postinst | 13 +++
 ...plates => openstreetmap-carto-common.templates} |  6 ---
 debian/{config => openstreetmap-carto.config}  |  3 --
 debian/openstreetmap-carto.dirs|  1 +
 debian/openstreetmap-carto.links   |  2 +
 debian/openstreetmap-carto.postinst| 32 
 debian/openstreetmap-carto.templates   |  6 +++
 debian/openstreetmap-carto.triggers|  1 +
 debian/po/POTFILES.in  |  3 +-
 debian/po/templates.pot| 43 +++---
 debian/postinst| 18 -
 16 files changed, 92 insertions(+), 57 deletions(-)

diff --git a/debian/control b/debian/control
index 18fd8c6..1125c7e 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: 
https://anonscm.debian.org/cgit/pkg-grass/openstreetmap-carto.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/openstreetmap-carto.git
 Homepage: https://github.com/gravitystorm/openstreetmap-carto
 
-Package: openstreetmap-carto
+Package: openstreetmap-carto-common
 Architecture: all
 Depends: ${misc:Depends},
  ttf-dejavu,
@@ -28,3 +28,13 @@ Description: standard OpenStreetMap Mapnik stylesheet
  to download the necessary shapefiles.
  .
  This package does not provide a tileserver, or perform tile rendering.
+
+Package: openstreetmap-carto
+Architecture: all
+Depends: ${misc:Depends},
+ openstreetmap-carto-common
+Description: Setup for standard OpenStreetMap Mapnik stylesheet
+ This package provides configuration of the database info for
+ openstreetmap-carto.
+ .
+ This package does not provide a tileserver, or perform tile rendering.
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 091e4bf..000
--- a/debian/install
+++ /dev/null
@@ -1,3 +0,0 @@
-get-shapefiles.sh usr/share/openstreetmap-carto/
-symbols   usr/share/openstreetmap-carto
-style.xml usr/share/openstreetmap-carto/
diff --git a/debian/config b/debian/openstreetmap-carto-common.config
similarity index 68%
copy from debian/config
copy to debian/openstreetmap-carto-common.config
index a9f7b3d..b513cb7 100755
--- a/debian/config
+++ b/debian/openstreetmap-carto-common.config
@@ -7,6 +7,3 @@ set -e
 
 db_input high openstreetmap-carto/fetch-data || true
 db_go
-
-db_input high openstreetmap-carto/database-name || true
-db_go
diff --git a/debian/docs b/debian/openstreetmap-carto-common.docs
similarity index 100%
rename from debian/docs
rename to debian/openstreetmap-carto-common.docs
diff --git a/debian/openstreetmap-carto-common.install 
b/debian/openstreetmap-carto-common.install
new file mode 100644
index 000..23384f5
--- /dev/null
+++ b/debian/openstreetmap-carto-common.install
@@ -0,0 +1,3 @@
+get-shapefiles.sh usr/share/openstreetmap-carto-common/
+symbols   usr/share/openstreetmap-carto-common
+style.xml usr/share/openstreetmap-carto-common/
diff --git a/debian/openstreetmap-carto-common.postinst 
b/debian/openstreetmap-carto-common.postinst
new file mode 100755
index 000..06bf8ce
--- /dev/null
+++ b/debian/openstreetmap-carto-common.postinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+db_get openstreetmap-carto/fetch-data
+if [ "$RET" = "true" ]; then
+cd /usr/share/openstreetmap-carto-common/ && ./get-shapefiles.sh
+fi
+
+#DEBHELPER#
diff --git a/debian/templates b/debian/openstreetmap-carto-common.templates
similarity index 55%
rename from debian/templates
rename to debian/openstreetmap-carto-common.templates
index 83040fc..969e943 100644
--- a/debian/templates
+++ b/debian/openstreetmap-carto-common.templates
@@ -6,9 +6,3 @@ _Description: Fetch data files from the web?
  by running the get-shapefiles.sh script in the /usr/share/openstreetmap-carto
  directory.
 
-Template: openstreetmap-carto/database-name
-Type: string
-Default: gis
-_Description: Name of the postgresql database:
- The stylesheet describes how to render OpenStreetMap data contained within a
- postgresql database. The name of the database is by default debian-osm-carto.
diff --git a/debian/config b/debian/openstreetmap-carto.config
similarity index 70%
rename from debian/config
rename to debian/openstreetmap-carto.config

[osm-tile-server] 42/70: New changelog entry

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 7e7af5a509da9783757f43f186776169749a5306
Author: Ruben Undheim 
Date:   Sat Sep 19 19:12:55 2015 +0200

New changelog entry
---
 debian/changelog | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e4fa3e5..0e06b53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openstreetmap-carto (2.35.0-2) UNRELEASED; urgency=low
+
+  * Team upload
+  * New binary: openstreetmap-carto-common
+
+ -- Ruben Undheim   Sat, 19 Sep 2015 19:12:15 +0200
+
 openstreetmap-carto (2.35.0-1) unstable; urgency=medium
 
   * Team upload.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 38/70: New upstream release.

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit f8cd0f4bccb3201361882dd82193f82e3ec8b56d
Author: Bas Couwenberg 
Date:   Fri Sep 18 00:58:01 2015 +0200

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

diff --git a/debian/changelog b/debian/changelog
index f90c8a7..13e05fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openstreetmap-carto (2.34.0-1) UNRELEASED; urgency=medium
+openstreetmap-carto (2.35.0-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release.
@@ -8,7 +8,7 @@ openstreetmap-carto (2.34.0-1) UNRELEASED; urgency=medium
 - Support other tar extensions
   * Enable parallel builds.
 
- -- Bas Couwenberg   Sun, 30 Aug 2015 17:01:36 +0200
+ -- Bas Couwenberg   Fri, 18 Sep 2015 00:57:52 +0200
 
 openstreetmap-carto (2.29.1-1) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 40/70: Set distribution to unstable.

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 3cee663bedec6fd56b9a31f435dbf2ffa1c8156b
Author: Bas Couwenberg 
Date:   Fri Sep 18 01:07:43 2015 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 18fe765..e4fa3e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openstreetmap-carto (2.35.0-1) UNRELEASED; urgency=medium
+openstreetmap-carto (2.35.0-1) unstable; urgency=medium
 
   * Team upload.
   * New upstream release.
@@ -9,7 +9,7 @@ openstreetmap-carto (2.35.0-1) UNRELEASED; urgency=medium
 - Support other tar extensions
   * Enable parallel builds.
 
- -- Bas Couwenberg   Fri, 18 Sep 2015 00:57:52 +0200
+ -- Bas Couwenberg   Fri, 18 Sep 2015 01:07:29 +0200
 
 openstreetmap-carto (2.29.1-1) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 59/70: Prepare for new upload

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 45d675cda7491e33e6d3de7806d244bdd362fcc8
Author: Ruben Undheim 
Date:   Tue Oct 13 17:18:33 2015 +0200

Prepare for new upload

UNRELEASED -> unstable
Added myself to debian/copyright
---
 debian/changelog | 6 --
 debian/copyright | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3cbde27..50ba163 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openstreetmap-carto (2.35.0-3) UNRELEASED; urgency=medium
+openstreetmap-carto (2.35.0-3) unstable; urgency=medium
 
   * Team upload
   * debian/po/*.po:
@@ -18,8 +18,10 @@ openstreetmap-carto (2.35.0-3) UNRELEASED; urgency=medium
   * debian/openstreetmap-carto.prerm:
 - Do not delete style.xml during upgrade, but only when removing the
   package.
+  * debian/copyright:
+- Added myself to the list of copyright holders for debian/*
 
- -- Ruben Undheim   Mon, 12 Oct 2015 21:53:10 +0200
+ -- Ruben Undheim   Tue, 13 Oct 2015 17:16:41 +0200
 
 openstreetmap-carto (2.35.0-2) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index e20f4ed..c90723f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,6 +12,7 @@ License: CC0
 
 Files: debian/*
 Copyright: 2014-2015 Christopher Baines 
+   2015  Ruben Undheim 
 License: CC0
 
 License: CC0

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 57/70: Make sure /usr/share/openstreetmap-carto/symbols is removed if it is a directory.

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 5d98b8ecf36f3150f02b5cee25ed9230fa549409
Author: Ruben Undheim 
Date:   Mon Oct 12 23:05:50 2015 +0200

Make sure /usr/share/openstreetmap-carto/symbols is removed if it is a 
directory.
---
 debian/changelog| 7 +--
 debian/openstreetmap-carto.postinst | 9 +
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bf41e1b..8b2d1a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,11 +4,14 @@ openstreetmap-carto (2.35.0-3) UNRELEASED; urgency=medium
   * debian/po/*.po:
 - Fixed path to get-shapefiles.sh in translations
   * Robustified transition from one binary to two binaries:
+- debian/openstreetmap-carto.postinst:
+  - Make sure /usr/share/openstreetmap-carto/symbols is removed if it
+is a directory and replaced by symbolic link
 - debian/openstreetmap-carto.preinst:
-Check that data dir is not a symbolic link before moving
+  - Check that data dir is not a symbolic link before moving
 to data.old
 - debian/openstreetmap-carto-common.postinst:
-Move data.old from /usr/share/openstreetmap-carto to
+  - Move data.old from /usr/share/openstreetmap-carto to
 /usr/share/openstreetmap-carto-common to make it
 unnecessary to download data files again if they
 have already been downloaded before the upgrade.
diff --git a/debian/openstreetmap-carto.postinst 
b/debian/openstreetmap-carto.postinst
index d8ac8fb..ff3335c 100755
--- a/debian/openstreetmap-carto.postinst
+++ b/debian/openstreetmap-carto.postinst
@@ -9,9 +9,18 @@ set -e
 case "$1" in
   configure|triggered)
 
+# Generate style.xml from "template" in openstreetmap-carto-common
 db_get openstreetmap-carto/database-name
 sed -e"s/\[gis\]/\[$RET\]/" 
/usr/share/openstreetmap-carto-common/style.xml > 
/usr/share/openstreetmap-carto/style.xml
 
+
+# This is necessary to change the dir to a symbolic link since a dir will 
never be
+# replaced by a symbolic link during upgrade if not done in maintainer 
scripts.
+if [ -d /usr/share/openstreetmap-carto/symbols ] && [ ! -L 
/usr/share/openstreetmap-carto/symbols ] ; then
+rmdir /usr/share/openstreetmap-carto/symbols
+ln -sf ../openstreetmap-carto-common/symbols 
/usr/share/openstreetmap-carto/symbols
+fi
+
   ;;
 
   abort-upgrade|abort-remove|abort-deconfigure)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 55/70: Fixed path in translations of debconf message

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit d1dd0dcc908d1b188c433b83c384c52a6104f748
Author: Ruben Undheim 
Date:   Mon Oct 12 17:46:07 2015 +0200

Fixed path in translations of debconf message
---
 debian/po/cs.po| 2 +-
 debian/po/da.po| 3 ++-
 debian/po/de.po| 2 +-
 debian/po/fr.po| 2 +-
 debian/po/it.po| 2 +-
 debian/po/nl.po| 2 +-
 debian/po/pt.po| 2 +-
 debian/po/pt_BR.po | 2 +-
 debian/po/ru.po| 2 +-
 9 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/po/cs.po b/debian/po/cs.po
index f912a1c..395cd2f 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -42,7 +42,7 @@ msgid ""
 msgstr ""
 "Pokud tyto datové soubory nyní nestáhnete, můžete je později stáhnout ručně "
 "spuštěním skriptu \"get-shapefiles.sh\" v adresáři /usr/share/openstreetmap-"
-"carto."
+"carto-common."
 
 #. Type: string
 #. Description
diff --git a/debian/po/da.po b/debian/po/da.po
index 85d9ed9..6e1343a 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -41,7 +41,8 @@ msgid ""
 "directory."
 msgstr ""
 "Hvis du vælger ikke at gøre dette, så kan det gøres manuelt senere ved at "
-"køre skriptet »get-shapefiles.sh« i mappen /usr/share/openstreetmap-carto."
+"køre skriptet »get-shapefiles.sh« i mappen /usr/share/openstreetmap-carto-"
+"common."
 
 #. Type: string
 #. Description
diff --git a/debian/po/de.po b/debian/po/de.po
index 43c0363..c9dea3d 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 "Falls Sie das nun nicht möchten, können Sie dies später nachholen, indem Sie "
 "das Skript »get-shapefiles.sh« im Verzeichnis »/usr/share/openstreetmap-"
-"carto« ausführen."
+"carto-common« ausführen."
 
 #. Type: string
 #. Description
diff --git a/debian/po/fr.po b/debian/po/fr.po
index efde08b..0055c78 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 "Si vous choisissez de ne pas le faire maintenant, vous pouvez le faire vous-"
 "même plus tard en exécutant le script « get-shapefiles.sh » dans le "
-"répertoire /usr/share/openstreetmap-carto."
+"répertoire /usr/share/openstreetmap-carto-common."
 
 #. Type: string
 #. Description
diff --git a/debian/po/it.po b/debian/po/it.po
index abfa18d..cb54d87 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 "Se si sceglie di non farlo ora, può essere fatto manualmente in seguito "
 "eseguendo lo script «get-shapefiles.sh» nella directory /usr/share/"
-"openstreetmap-carto."
+"openstreetmap-carto-common."
 
 #. Type: string
 #. Description
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 42a809a..88ba2f3 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 "Indien u er voor kiest om dit nu niet te doen, dan kunt u dit later "
 "handmatig doen door het script \"get-shapefiles.sh\" uit de map /usr/share/"
-"openstreetmap-carto uit te voeren."
+"openstreetmap-carto-common uit te voeren."
 
 #. Type: string
 #. Description
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 38ecd9e..233d5f3 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 "Se escolher não fazer isto agora, pode ser feito manualmente mais tarde ao "
 "correr o script \"get-shapefiles.sh\" no directório /usr/share/openstreetmap-"
-"carto."
+"carto-common."
 
 #. Type: string
 #. Description
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 8b117ee..820c62b 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 "Se você escolher não fazer isso agora, poderá fazer manualmente mais tarde "
 "executando o script \"get-shapefiles.sh\" no diretório /usr/share/"
-"openstreetmap-carto."
+"openstreetmap-carto-common."
 
 #. Type: string
 #. Description
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 634e414..ecc41cc 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 "Если ответить отрицательно, то это действие можно выполнить позднее с "
 "помощью сценария «get-shapefiles.sh» из каталога /usr/share/openstreetmap-"
-"carto."
+"carto-common."
 
 #. Type: string
 #. Description

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 50/70: Remove data directory on purge

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 921d2e1e225c9e7301fed461867b6d787858a470
Author: Ruben Undheim 
Date:   Sun Oct 11 14:29:26 2015 +0200

Remove data directory on purge
---
 debian/changelog |  2 ++
 debian/openstreetmap-carto-common.postrm | 41 
 2 files changed, 43 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 49d93f9..de57770 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ openstreetmap-carto (2.35.0-2) UNRELEASED; urgency=low
 - Create /usr/share/openstreetmap-carto/style.xml
   * Added debian/openstreetmap-carto.prerm:
 - Remove /usr/share/openstreetmap-carto/style.xml
+  * Added debian/openstreetmap-carto-common.postrm:
+- Clean up completely on purge
 
   * Debconf templates and debian/control reviewed by the debian-l10n-
 english team as part of the Smith review project. Closes: #793938
diff --git a/debian/openstreetmap-carto-common.postrm 
b/debian/openstreetmap-carto-common.postrm
new file mode 100644
index 000..377a7a6
--- /dev/null
+++ b/debian/openstreetmap-carto-common.postrm
@@ -0,0 +1,41 @@
+#!/bin/sh
+# postrm script for magic
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#*  `remove'
+#*  `purge'
+#*  `upgrade' 
+#*  `failed-upgrade' 
+#*  `abort-install'
+#*  `abort-install' 
+#*  `abort-upgrade' 
+#*  `disappear' 
+#  
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+;;
+
+purge)
+rm -rf /usr/share/openstreetmap-carto-common/data/ 
+;;
+
+*)
+echo "postrm called with unknown argument \`$1'" >&2
+exit 1
+;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 56/70: New changelog entry

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit a757c3d0389a1458c50079889cf69972ad628179
Author: Ruben Undheim 
Date:   Mon Oct 12 21:59:39 2015 +0200

New changelog entry
---
 debian/changelog | 17 +
 1 file changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9a9e6ba..bf41e1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+openstreetmap-carto (2.35.0-3) UNRELEASED; urgency=medium
+
+  * Team upload
+  * debian/po/*.po:
+- Fixed path to get-shapefiles.sh in translations
+  * Robustified transition from one binary to two binaries:
+- debian/openstreetmap-carto.preinst:
+Check that data dir is not a symbolic link before moving
+to data.old
+- debian/openstreetmap-carto-common.postinst:
+Move data.old from /usr/share/openstreetmap-carto to
+/usr/share/openstreetmap-carto-common to make it
+unnecessary to download data files again if they
+have already been downloaded before the upgrade.
+
+ -- Ruben Undheim   Mon, 12 Oct 2015 21:53:10 +0200
+
 openstreetmap-carto (2.35.0-2) unstable; urgency=low
 
   * Team upload

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 58/70: Do not delete style.xml during upgrade, but only when removing the package.

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 4bae5d680495fdbd57cf1085e473976f7210f2af
Author: Ruben Undheim 
Date:   Mon Oct 12 23:39:32 2015 +0200

Do not delete style.xml during upgrade, but only when removing the package.
---
 debian/changelog | 3 +++
 debian/openstreetmap-carto.prerm | 5 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8b2d1a0..3cbde27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ openstreetmap-carto (2.35.0-3) UNRELEASED; urgency=medium
 /usr/share/openstreetmap-carto-common to make it
 unnecessary to download data files again if they
 have already been downloaded before the upgrade.
+  * debian/openstreetmap-carto.prerm:
+- Do not delete style.xml during upgrade, but only when removing the
+  package.
 
  -- Ruben Undheim   Mon, 12 Oct 2015 21:53:10 +0200
 
diff --git a/debian/openstreetmap-carto.prerm b/debian/openstreetmap-carto.prerm
index 3f1af85..c7ecbac 100644
--- a/debian/openstreetmap-carto.prerm
+++ b/debian/openstreetmap-carto.prerm
@@ -18,10 +18,13 @@ set -e
 
 
 case "$1" in
-remove|upgrade|deconfigure)
+remove|deconfigure)
rm -f /usr/share/openstreetmap-carto/style.xml
 ;;
 
+upgrade)
+;;
+
 failed-upgrade)
 ;;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 51/70: UNRELEASED -> unstable

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 12816615321db69021b08595a6ad3ffe3918e61f
Author: Ruben Undheim 
Date:   Sun Oct 11 19:55:52 2015 +0200

UNRELEASED -> unstable
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de57770..9a9e6ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openstreetmap-carto (2.35.0-2) UNRELEASED; urgency=low
+openstreetmap-carto (2.35.0-2) unstable; urgency=low
 
   * Team upload
 
@@ -30,7 +30,7 @@ openstreetmap-carto (2.35.0-2) UNRELEASED; urgency=low
   * French (Jean-Pierre Giraud).  Closes: #799874
   * Danish (Joe Hansen).  Closes: #799878
 
- -- Ruben Undheim   Sun, 11 Oct 2015 14:17:18 +0200
+ -- Ruben Undheim   Sun, 11 Oct 2015 19:54:46 +0200
 
 openstreetmap-carto (2.35.0-1) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 53/70: Use POSIX compatible if expression

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit a4ea7e2baeb9b3d503540fc3f2e1997dfee76add
Author: Ruben Undheim 
Date:   Sun Oct 11 21:39:07 2015 +0200

Use POSIX compatible if expression
---
 debian/openstreetmap-carto.preinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/openstreetmap-carto.preinst 
b/debian/openstreetmap-carto.preinst
index 0753ded..85fd5b3 100644
--- a/debian/openstreetmap-carto.preinst
+++ b/debian/openstreetmap-carto.preinst
@@ -16,7 +16,7 @@ set -e
 
 case "$1" in
 install|upgrade)
-if [ -d /usr/share/openstreetmap-carto/data -a ! -L 
/usr/share/openstreetmap-carto/data ] ; then
+if [ -d /usr/share/openstreetmap-carto/data ] && [ ! -L 
/usr/share/openstreetmap-carto/data ] ; then
 mv /usr/share/openstreetmap-carto/data 
/usr/share/openstreetmap-carto/data.old
 fi
 ;;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 52/70: Check that dir is not a symlink before moving dir.

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 55b1cd3a8b7a3f0bd9cbdefbc1e5da61887250c9
Author: Ruben Undheim 
Date:   Sun Oct 11 21:26:05 2015 +0200

Check that dir is not a symlink before moving dir.
---
 debian/openstreetmap-carto.preinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/openstreetmap-carto.preinst 
b/debian/openstreetmap-carto.preinst
index 45219d8..0753ded 100644
--- a/debian/openstreetmap-carto.preinst
+++ b/debian/openstreetmap-carto.preinst
@@ -16,7 +16,7 @@ set -e
 
 case "$1" in
 install|upgrade)
-if [ -d /usr/share/openstreetmap-carto/data ] ; then
+if [ -d /usr/share/openstreetmap-carto/data -a ! -L 
/usr/share/openstreetmap-carto/data ] ; then
 mv /usr/share/openstreetmap-carto/data 
/usr/share/openstreetmap-carto/data.old
 fi
 ;;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 60/70: Improved comment

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 8212642bda1cff47de708feae876f204494fca7d
Author: Ruben Undheim 
Date:   Tue Oct 13 17:36:49 2015 +0200

Improved comment
---
 debian/openstreetmap-carto.postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/openstreetmap-carto.postinst 
b/debian/openstreetmap-carto.postinst
index ff3335c..2f15f8d 100755
--- a/debian/openstreetmap-carto.postinst
+++ b/debian/openstreetmap-carto.postinst
@@ -14,7 +14,7 @@ case "$1" in
 sed -e"s/\[gis\]/\[$RET\]/" 
/usr/share/openstreetmap-carto-common/style.xml > 
/usr/share/openstreetmap-carto/style.xml
 
 
-# This is necessary to change the dir to a symbolic link since a dir will 
never be
+# This is necessary in order to replace the dir with a symbolic link since 
a dir will never be
 # replaced by a symbolic link during upgrade if not done in maintainer 
scripts.
 if [ -d /usr/share/openstreetmap-carto/symbols ] && [ ! -L 
/usr/share/openstreetmap-carto/symbols ] ; then
 rmdir /usr/share/openstreetmap-carto/symbols

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 62/70: Clean up install directory if previous upgrade has left some strange files there

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit a6e9a9ac2e779baa4f12d9d6b683346549fc1cef
Author: Ruben Undheim 
Date:   Wed Oct 14 09:04:22 2015 +0200

Clean up install directory if previous upgrade has left some strange files 
there
---
 debian/openstreetmap-carto.preinst | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/debian/openstreetmap-carto.preinst 
b/debian/openstreetmap-carto.preinst
index 93e2dc3..3747931 100644
--- a/debian/openstreetmap-carto.preinst
+++ b/debian/openstreetmap-carto.preinst
@@ -19,6 +19,17 @@ case "$1" in
 if [ -d /usr/share/openstreetmap-carto/data ] && [ ! -L 
/usr/share/openstreetmap-carto/data ] ; then
 mv /usr/share/openstreetmap-carto/data 
/usr/share/openstreetmap-carto/data.old
 fi
+
+# Clean up if previous upgrade has left strange files:
+if [ -L /usr/share/openstreetmap-carto/data.old/data ] ; then
+rm -f /usr/share/openstreetmap-carto/data.old/data
+fi
+if [ -L /usr/share/openstreetmap-carto/data.old ] ; then
+rm -f /usr/share/openstreetmap-carto/data.old
+fi
+if [ -L /usr/share/openstreetmap-carto/symbols/symbols ] ; then
+rm -f /usr/share/openstreetmap-carto/symbols/symbols
+fi
 ;;
 
 abort-upgrade)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 54/70: Move data.old to /usr/share/openstreetmap-carto-common/data if it exists

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 9145d00d6bcefa883e709de87ff06bc94bf3f295
Author: Ruben Undheim 
Date:   Sun Oct 11 22:13:06 2015 +0200

Move data.old to /usr/share/openstreetmap-carto-common/data if it exists
---
 debian/openstreetmap-carto-common.postinst | 4 
 1 file changed, 4 insertions(+)

diff --git a/debian/openstreetmap-carto-common.postinst 
b/debian/openstreetmap-carto-common.postinst
index 884ac15..f138a1e 100755
--- a/debian/openstreetmap-carto-common.postinst
+++ b/debian/openstreetmap-carto-common.postinst
@@ -9,6 +9,10 @@ db_get openstreetmap-carto/fetch-data
 if [ "$RET" = "true" ]; then
 cd /usr/share/openstreetmap-carto-common/ && ./get-shapefiles.sh
 db_set openstreetmap-carto/fetch-data false
+elif [ -d /usr/share/openstreetmap-carto/data.old ] &&
+ [ ! -L /usr/share/openstreetmap-carto/data.old ] &&
+ [ ! -e /usr/share/openstreetmap-carto-common/data ] ; then
+mv /usr/share/openstreetmap-carto/data.old 
/usr/share/openstreetmap-carto-common/data
 fi
 
 #DEBHELPER#

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 49/70: More in changelog

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit f2e1e88ccf90d08c8bee78cdea9dc5ab6a7bde41
Author: Ruben Undheim 
Date:   Sun Oct 11 14:17:31 2015 +0200

More in changelog
---
 debian/changelog | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 48d78b7..49d93f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,20 @@
 openstreetmap-carto (2.35.0-2) UNRELEASED; urgency=low
 
   * Team upload
+
   * Split in two binaries: openstreetmap-carto-common and openstreetmap-carto
+  * Added debian/openstreetmap-carto.triggers:
+- openstreetmap-carto postinst script is triggered when
+  style.xml in openstreetmap-carto-common is updated.
+  * Added debian/openstreetmap-carto.preinst:
+- move already existing /usr/share/openstreetmap-carto/data directory out
+  of way to make place for symlink to
+  /usr/share/openstreetmap-carto-common/data
+  * Added debian/openstreetmap-carto.postinst:
+- Create /usr/share/openstreetmap-carto/style.xml
+  * Added debian/openstreetmap-carto.prerm:
+- Remove /usr/share/openstreetmap-carto/style.xml
+
   * Debconf templates and debian/control reviewed by the debian-l10n-
 english team as part of the Smith review project. Closes: #793938
   * [Debconf translation updates]
@@ -15,7 +28,7 @@ openstreetmap-carto (2.35.0-2) UNRELEASED; urgency=low
   * French (Jean-Pierre Giraud).  Closes: #799874
   * Danish (Joe Hansen).  Closes: #799878
 
- -- Ruben Undheim   Sat, 19 Sep 2015 19:12:15 +0200
+ -- Ruben Undheim   Sun, 11 Oct 2015 14:17:18 +0200
 
 openstreetmap-carto (2.35.0-1) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 48/70: Set openstreetmap-carto/fetch-data to false after completing download of shapefiles

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 3349f1749129667949a466a075bd54d9a39df78e
Author: Ruben Undheim 
Date:   Sun Oct 11 13:53:43 2015 +0200

Set openstreetmap-carto/fetch-data to false after completing download of 
shapefiles

If this is not done, new shapefiles will be downloaded every update of the 
package.
This often requires quite some time. It is better to let the user decide 
when to
update the shapefiles by either running the get-shapefiles.sh script 
directly,
or by running "dpkg-reconfigure openstreetmap-carto-common" and select that
shapefiles should be downloaded.
---
 debian/openstreetmap-carto-common.postinst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/openstreetmap-carto-common.postinst 
b/debian/openstreetmap-carto-common.postinst
index 06bf8ce..884ac15 100755
--- a/debian/openstreetmap-carto-common.postinst
+++ b/debian/openstreetmap-carto-common.postinst
@@ -8,6 +8,7 @@ set -e
 db_get openstreetmap-carto/fetch-data
 if [ "$RET" = "true" ]; then
 cd /usr/share/openstreetmap-carto-common/ && ./get-shapefiles.sh
+db_set openstreetmap-carto/fetch-data false
 fi
 
 #DEBHELPER#

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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#803985: mapnik: Often get free(): invalid pointer

2015-11-03 Thread Ruben Undheim

Source: mapnik
Severity: important
Tags: upstream patch
Version: 3.0.8+ds-1

Dear Maintainer,


Quite often mapnik crashes. As for example described here:
 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=799473

The upstream issue is here:
 https://github.com/mapnik/mapnik/issues/3090

and it has already been fixed upstream:
 
https://github.com/mapnik/mapnik/commit/b99a20378dfcf8b94cbe228ef8a3775516dbb065


I've confirmed that after this has been fixed, it's once again possible to 
render
tiles with tools such as tilelite and the openstreetmap-carto style sheet.


A patch is below:

--- mapnik-3.0.8+ds.orig/include/mapnik/util/variant.hpp
+++ mapnik-3.0.8+ds/include/mapnik/util/variant.hpp
@@ -240,6 +240,19 @@ struct variant_helper
 variant_helper::copy(old_id, old_value, new_value);
 }
 }
+VARIANT_INLINE static void direct_swap(const std::size_t id, void * lhs, 
void * rhs)
+{
+using std::swap; //enable ADL
+if (id == sizeof...(Types))
+{
+// both lhs and rhs hold T
+swap(*reinterpret_cast(lhs), *reinterpret_cast(rhs));
+}
+else
+{
+variant_helper::direct_swap(id, lhs, rhs);
+}
+}
 };
 
 template<> struct variant_helper<>
@@ -247,6 +260,7 @@ template<> struct variant_helper<>
 VARIANT_INLINE static void destroy(const std::size_t, void *) {}
 VARIANT_INLINE static void move(const std::size_t, void *, void *) {}
 VARIANT_INLINE static void copy(const std::size_t, const void *, void *) {}
+VARIANT_INLINE static void direct_swap(const std::size_t, void *, void *) 
{}
 };
 
 namespace detail {
@@ -274,7 +288,7 @@ struct unwrapper
 {
 return obj.get();
 }
-
+
 auto operator() (recursive_wrapper & obj) const
 -> typename recursive_wrapper::type &
 {
@@ -595,16 +609,24 @@ public:
 helper_type::move(old.type_index, , );
 }
 
-friend void swap(variant & first, variant & second)
+void assign(variant & rhs)
 {
-using std::swap; //enable ADL
-swap(first.type_index, second.type_index);
-swap(first.data, second.data);
+if (type_index == rhs.type_index)
+{
+helper_type::direct_swap(rhs.type_index, , );
+}
+else
+{
+helper_type::destroy(type_index, );
+type_index = detail::invalid_value;
+helper_type::copy(rhs.type_index, , );
+type_index = rhs.type_index;
+}
 }
 
 VARIANT_INLINE variant& operator=(variant other)
 {
-swap(*this, other);
+assign(other);
 return *this;
 }
 
@@ -614,7 +636,7 @@ public:
 VARIANT_INLINE variant& operator=(T && rhs) noexcept
 {
 variant temp(std::forward(rhs));
-swap(*this, temp);
+assign(temp);
 return *this;
 }
 
@@ -623,7 +645,7 @@ public:
 VARIANT_INLINE variant& operator=(T const& rhs)
 {
 variant temp(rhs);
-swap(*this, temp);
+assign(temp);
 return *this;
 }
 

Best regards,
Ruben
 

-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armel

Kernel: Linux 4.2.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)


signature.asc
Description: PGP signature
___
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#799473: Lowering severity of bug

2015-11-03 Thread Ruben Undheim

I'm lowering the severity of this bug from important to minor since the real
issue is actually an issue in Mapnik reported here:
  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803985

Ruben


signature.asc
Description: PGP signature
___
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 mapnik_3.0.9~rc1+ds-1~exp1_amd64.changes

2015-11-03 Thread Debian FTP Masters

mapnik_3.0.9~rc1+ds-1~exp1_amd64.changes uploaded successfully to localhost
along with the files:
  mapnik_3.0.9~rc1+ds-1~exp1.dsc
  mapnik_3.0.9~rc1+ds.orig.tar.gz
  mapnik_3.0.9~rc1+ds-1~exp1.debian.tar.xz
  libmapnik-dev_3.0.9~rc1+ds-1~exp1_amd64.deb
  libmapnik3.0_3.0.9~rc1+ds-1~exp1_amd64.deb
  mapnik-doc_3.0.9~rc1+ds-1~exp1_all.deb
  mapnik-utils_3.0.9~rc1+ds-1~exp1_amd64.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

[osm-tile-server] 03/70: Update watch file

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 4802338cd120b0da49ba1f736fdbb68dac98849c
Author: Christopher Baines 
Date:   Sun Apr 12 14:49:02 2015 +0100

Update watch file

No longer use http://githubredir.debian.net/
---
 debian/watch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/watch b/debian/watch
index 158b795..7c36051 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://githubredir.debian.net/github/gravitystorm/openstreetmap-carto 
/github/gravitystorm/openstreetmap-carto/v(.*).tar.gz
+https://github.com/gravitystorm/openstreetmap-carto/releases 
/gravitystorm/openstreetmap-carto/archive/v(.*).tar.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 02/70: Imported Debian patch 2.13.0-1

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 30f791628692be54a7222ce46f0a2d0b163fa378
Author: Christopher Baines 
Date:   Sun Apr 13 17:06:44 2014 +0100

Imported Debian patch 2.13.0-1
---
 debian/README.Debian|  7 +++
 debian/README.source| 10 ++
 debian/changelog|  5 +
 debian/compat   |  1 +
 debian/config   | 12 
 debian/control  | 21 +
 debian/copyright| 28 
 debian/docs |  3 +++
 debian/install  |  2 ++
 debian/po/POTFILES.in   |  1 +
 debian/po/templates.pot | 48 
 debian/postinst | 18 ++
 debian/rules| 19 +++
 debian/source/format|  1 +
 debian/templates| 14 ++
 debian/watch|  2 ++
 16 files changed, 192 insertions(+)

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 000..9767d4a
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,7 @@
+openstreetmap-carto for Debian
+--
+
+This package is intended to be used by a tile renderer (e.g. mod_tile) with
+Mapnik to render OpenStreetMap tiles.
+
+ -- Christopher Baines   Sun, 13 Apr 2014 17:06:44 +0100
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000..c8f1176
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,10 @@
+openstreetmap-carto for Debian
+--
+
+
+
+
+
+ -- Christopher Baines   Sun, 13 Apr 2014 17:06:44 +0100
+
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..0ae7302
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+openstreetmap-carto (2.13.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #744842)
+
+ -- Christopher Baines   Sun, 13 Apr 2014 17:06:44 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/config b/debian/config
new file mode 100755
index 000..a9f7b3d
--- /dev/null
+++ b/debian/config
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+db_input high openstreetmap-carto/fetch-data || true
+db_go
+
+db_input high openstreetmap-carto/database-name || true
+db_go
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..d7c7266
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,21 @@
+Source: openstreetmap-carto
+Section: graphics
+Priority: optional
+Maintainer: Debian OpenStreetMap Team 
+Uploaders: Christopher Baines 
+Build-Depends: debhelper (>= 9.0.0), node-carto, po-debconf
+Standards-Version: 3.9.5
+Homepage: https://github.com/gravitystorm/openstreetmap-carto
+#Vcs-Git: git://git.debian.org/collab-maint/openstreetmap-carto.git
+#Vcs-Browser: 
http://git.debian.org/?p=collab-maint/openstreetmap-carto.git;a=summary
+
+Package: openstreetmap-carto
+Architecture: all
+Depends: ${misc:Depends}, ttf-dejavu, curl, unzip, gdal-bin, mapnik-utils
+Recommends: fonts-sipa-arundina, fonts-sil-padauk, fonts-khmeros
+Description: standard OpenStreetMap Mapnik stylesheet
+ This package provides the standard OpenStreetMap stylesheet for Mapnik, built
+ from the CartoCSS source. It also provides the necessary icons, and the script
+ to download the necessary shapefiles.
+ .
+ This package does not provide a tileserver, or perform tile rendering.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..e2b40e1
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,28 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: openstreetmap-carto
+Source: 
+
+License: CC0
+ OpenStreetMap Carto: A global map style for OpenStreetMap maps.
+ .
+ Created by Andy Allan  and contributors.
+ Based on original cartography by Steve Chilton and others.
+ .
+ This software and associated documentation files (the "Software") is
+ released under the CC0 Public Domain Dedication, version 1.0, as
+ published by Creative Commons. To the extent possible under law, the
+ author(s) have dedicated all copyright and related and neighboring
+ rights to the Software to the public domain worldwide. The Software is
+ distributed WITHOUT ANY WARRANTY.
+ .
+ If you did not receive a copy of the CC0 Public Domain Dedication
+ along with the Software, see
+ 
+
+Files: *
+Copyright: 2012-2014 Andy Allan 
+License: CC0
+
+Files: debian/*
+Copyright: 2014 Christopher Baines

[osm-tile-server] 64/70: If data dir already in /usr/share/openstreetmap-carto-common, delete data.old

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit db9506b909e68c535977af9c7692011278b2c0c0
Author: Ruben Undheim 
Date:   Wed Oct 14 13:24:05 2015 +0200

If data dir already in /usr/share/openstreetmap-carto-common, delete 
data.old
---
 debian/changelog   |  4 +++-
 debian/openstreetmap-carto.preinst | 11 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3a8df84..c1b9678 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ openstreetmap-carto (2.35.0-3) unstable; urgency=medium
   - Use "dpkg-maintscript-helper dir_to_symlink"
   - Remove files that have accidentally been left there due
 to a previous not perfectly done package upgrade.
+  - If data dir already in /usr/share/openstreetmap-carto-common,
+delete data.old
 - debian/openstreetmap-carto.prerm:
   - Use "dpkg-maintscript-helper dir_to_symlink"
 - debian/openstreetmap-carto-common.postinst:
@@ -30,7 +32,7 @@ openstreetmap-carto (2.35.0-3) unstable; urgency=medium
   * debian/copyright:
 - Added myself to the list of copyright holders for debian/*
 
- -- Ruben Undheim   Tue, 13 Oct 2015 17:16:41 +0200
+ -- Ruben Undheim   Wed, 14 Oct 2015 13:24:54 +0200
 
 openstreetmap-carto (2.35.0-2) unstable; urgency=low
 
diff --git a/debian/openstreetmap-carto.preinst 
b/debian/openstreetmap-carto.preinst
index 3747931..3040963 100644
--- a/debian/openstreetmap-carto.preinst
+++ b/debian/openstreetmap-carto.preinst
@@ -30,6 +30,17 @@ case "$1" in
 if [ -L /usr/share/openstreetmap-carto/symbols/symbols ] ; then
 rm -f /usr/share/openstreetmap-carto/symbols/symbols
 fi
+
+# If data directory exists in openstreetmap-carto-common, it
+# is safe to delete data.old in openstreetmap-carto:
+if [ -d /usr/share/openstreetmap-carto/data.old ] && \
+   [ ! -L /usr/share/openstreetmap-carto/data.old ] && \
+   [ -d /usr/share/openstreetmap-carto-common/data ] && \
+   [ ! -L /usr/share/openstreetmap-carto-common/data ]
+then
+rm -rf /usr/share/openstreetmap-carto/data.old
+fi
+
 ;;
 
 abort-upgrade)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 67/70: Merge tag 'upstream/2.36.0'

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 3fdc9e06dd7a1e24df54a79cb2c3388bcb75c8f0
Merge: b49b5ef ad5e8a9
Author: Bas Couwenberg 
Date:   Sun Nov 1 14:37:59 2015 +0100

Merge tag 'upstream/2.36.0'

Upstream version 2.36.0

 CONTRIBUTING.md|   72 +-
 INSTALL.md |   30 +-
 README.md  |   35 +-
 amenity-points.mss | 1041 +-
 get-shapefiles.sh  |   27 +-
 landcover.mss  |2 +-
 placenames.mss |   66 +-
 preview.png|  Bin 79418 -> 83754 bytes
 project.mml|  116 +--
 project.yaml   |  450 +++---
 roads.mss  | 1266 +-
 scripts/create_shield  |   34 -
 scripts/create_standard_shields|   49 -
 scripts/generate_road_colours.py   |  122 +++
 scripts/generate_shields.py|  132 +++
 scripts/shop_values.rb |8 +
 scripts/travis_check_project_files |2 +-
 scripts/yaml2mml.py|   31 +-
 shapefiles.mss |   27 +-
 stations.mss   |   67 +-
 symbols/bag-14.svg |   40 +
 symbols/car_share.p.16.png |  Bin 489 -> 0 bytes
 symbols/car_wash-14.svg|   31 +
 symbols/christian.9.svg|   13 +
 symbols/fountain-14.svg|   38 +
 symbols/generating_patterns/quarry.md  |   19 +
 symbols/generating_patterns/quarry.svg | 1523 
 symbols/glacier.png|  Bin 179 -> 0 bytes
 symbols/oneway-reverse.svg |   32 +
 symbols/oneway.svg |   32 +
 symbols/outdoor-14.svg |   38 +
 symbols/shields/motorway_10x1.svg  |7 +-
 symbols/shields/motorway_10x1_z16.svg  |4 +
 symbols/shields/motorway_10x1_z18.svg  |4 +
 symbols/shields/motorway_10x2.svg  |7 +-
 symbols/shields/motorway_10x2_z16.svg  |4 +
 symbols/shields/motorway_10x2_z18.svg  |4 +
 symbols/shields/motorway_10x3.svg  |7 +-
 symbols/shields/motorway_10x3_z16.svg  |4 +
 symbols/shields/motorway_10x3_z18.svg  |4 +
 symbols/shields/motorway_10x4.svg  |7 +-
 symbols/shields/motorway_10x4_z16.svg  |4 +
 symbols/shields/motorway_10x4_z18.svg  |4 +
 symbols/shields/motorway_11x1.svg  |7 +-
 symbols/shields/motorway_11x1_z16.svg  |4 +
 symbols/shields/motorway_11x1_z18.svg  |4 +
 symbols/shields/motorway_11x2.svg  |7 +-
 symbols/shields/motorway_11x2_z16.svg  |4 +
 symbols/shields/motorway_11x2_z18.svg  |4 +
 symbols/shields/motorway_11x3.svg  |7 +-
 symbols/shields/motorway_11x3_z16.svg  |4 +
 symbols/shields/motorway_11x3_z18.svg  |4 +
 symbols/shields/motorway_11x4.svg  |7 +-
 symbols/shields/motorway_11x4_z16.svg  |4 +
 symbols/shields/motorway_11x4_z18.svg  |4 +
 symbols/shields/motorway_1x1.svg   |7 +-
 symbols/shields/motorway_1x1_z16.svg   |4 +
 symbols/shields/motorway_1x1_z18.svg   |4 +
 symbols/shields/motorway_1x2.svg   |7 +-
 symbols/shields/motorway_1x2_z16.svg   |4 +
 symbols/shields/motorway_1x2_z18.svg   |4 +
 symbols/shields/motorway_1x3.svg   |7 +-
 symbols/shields/motorway_1x3_z16.svg   |4 +
 symbols/shields/motorway_1x3_z18.svg   |4 +
 symbols/shields/motorway_1x4.svg   |7 +-
 symbols/shields/motorway_1x4_z16.svg   |4 +
 symbols/shields/motorway_1x4_z18.svg   |4 +
 symbols/shields/motorway_2x1.svg   |7 +-
 symbols/shields/motorway_2x1_z16.svg   |4 +
 symbols/shields/motorway_2x1_z18.svg   |4 +
 symbols/shields/motorway_2x2.svg   |7 +-
 symbols/shields/motorway_2x2_z16.svg   |4 +
 symbols/shields/motorway_2x2_z18.svg   |4 +
 symbols/shields/motorway_2x3.svg   |7 +-
 symbols/shields/motorway_2x3_z16.svg   |4 +
 symbols/shields/motorway_2x3_z18.svg   |4 +
 symbols/shields/motorway_2x4.svg   |7 +-
 symbols/shields/motorway_2x4_z16.svg   |4 +
 symbols/shields/motorway_2x4_z18.svg   |4 +
 symbols/shields/motorway_3x1.svg   |7 +-
 symbols/shields/motorway_3x1_z16.svg   |4 +
 symbols/shields/motorway_3x1_z18.svg   |4 +
 symbols/shields/motorway_3x2.svg   |7 +-
 symbols/shields/motorway_3x2_z16.svg   |4 +
 symbols/shields/motorway_3x2_z18.svg   |4 +
 symbols/shields/motorway_3x3.svg   |7 +-
 symbols/shields/motorway_3x3_z16.svg   |4 +
 symbols/shields/motorway_3x3_z18.svg   |4 +
 symbols/shields/motorway_3x4.svg   |7 +-
 symbols/shields/motorway_3x4_z16.svg   |4 +
 symbols/shields/motorway_3x4_z18.svg   |4 +

[osm-tile-server] 68/70: New upstream release.

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 7d10cd4318e276c9ffdce30022d70326d794f6f1
Author: Bas Couwenberg 
Date:   Sun Nov 1 14:38:30 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index c1b9678..1568591 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openstreetmap-carto (2.36.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Bas Couwenberg   Sun, 01 Nov 2015 14:38:05 +0100
+
 openstreetmap-carto (2.35.0-3) unstable; urgency=medium
 
   * Team upload

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 63/70: Changelog updates

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit ddc2bc466051c5634ef7cd3e85aba55063bfa646
Author: Ruben Undheim 
Date:   Wed Oct 14 09:11:28 2015 +0200

Changelog updates
---
 debian/changelog | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50ba163..3a8df84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,12 +4,21 @@ openstreetmap-carto (2.35.0-3) unstable; urgency=medium
   * debian/po/*.po:
 - Fixed path to get-shapefiles.sh in translations
   * Robustified transition from one binary to two binaries:
+- debian/control:
+  - Pre-depend on dpkg (>= 1.17.14)
+- Added debian/openstreetmap-carto.postrm:
+  - Use "dpkg-maintscript-helper dir_to_symlink" (to change
+/usr/share/openstreetmap-carto/symbols to symlink)
 - debian/openstreetmap-carto.postinst:
-  - Make sure /usr/share/openstreetmap-carto/symbols is removed if it
-is a directory and replaced by symbolic link
+  - Use "dpkg-maintscript-helper dir_to_symlink"
 - debian/openstreetmap-carto.preinst:
   - Check that data dir is not a symbolic link before moving
 to data.old
+  - Use "dpkg-maintscript-helper dir_to_symlink"
+  - Remove files that have accidentally been left there due
+to a previous not perfectly done package upgrade.
+- debian/openstreetmap-carto.prerm:
+  - Use "dpkg-maintscript-helper dir_to_symlink"
 - debian/openstreetmap-carto-common.postinst:
   - Move data.old from /usr/share/openstreetmap-carto to
 /usr/share/openstreetmap-carto-common to make it

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 69/70: Update copyright file for removed scripts.

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 5668fc64446109d123e23a82de122b758002ed7f
Author: Bas Couwenberg 
Date:   Sun Nov 1 14:48:46 2015 +0100

Update copyright file for removed scripts.
---
 debian/changelog | 1 +
 debian/copyright | 4 
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1568591..5b2f6fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 openstreetmap-carto (2.36.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Update copyright file for removed scripts.
 
  -- Bas Couwenberg   Sun, 01 Nov 2015 14:38:05 +0100
 
diff --git a/debian/copyright b/debian/copyright
index c90723f..4aa8653 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,10 +6,6 @@ Files: *
 Copyright: 2012-2015 Andy Allan 
 License: CC0
 
-Files: scripts/create_shield scripts/create_standard_shields
-Copyright: 2014 Paul Norman
-License: CC0
-
 Files: debian/*
 Copyright: 2014-2015 Christopher Baines 
2015  Ruben Undheim 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 70/70: Set distribution to unstable.

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 008fc5db543a9de26162d9ac88b92c9a45c16f48
Author: Bas Couwenberg 
Date:   Sun Nov 1 14:44:18 2015 +0100

Set distribution to unstable.
---
 debian/changelog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b2f6fd..9af9308 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-openstreetmap-carto (2.36.0-1) UNRELEASED; urgency=medium
+openstreetmap-carto (2.36.0-1) unstable; urgency=medium
 
+  * Team upload.
   * New upstream release.
   * Update copyright file for removed scripts.
 
- -- Bas Couwenberg   Sun, 01 Nov 2015 14:38:05 +0100
+ -- Bas Couwenberg   Sun, 01 Nov 2015 14:43:29 +0100
 
 openstreetmap-carto (2.35.0-3) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 04/117: Fixing output

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 9b9b699abfb9847ef05bddc52b05ce9ce1fb29a8
Author: Ruben Undheim 
Date:   Wed Sep 2 21:44:38 2015 +

Fixing output
---
 debian/osm-tile-server-config.postinst | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/osm-tile-server-config.postinst 
b/debian/osm-tile-server-config.postinst
index daccb1c..abf1968 100644
--- a/debian/osm-tile-server-config.postinst
+++ b/debian/osm-tile-server-config.postinst
@@ -41,18 +41,20 @@ case "$1" in
 fi
 
 
-echo "Checking user:"
+echo -n "Checking if user osm already exists... "
 set +e
 su postgres -c "cd /var/lib/postgresql ; psql postgres -tAc \"SELECT 1 
FROM pg_roles WHERE rolname='osm'\"" | grep -q 1
 USEREXISTS=$?
 set -e
 if [ "$USEREXISTS" = "0" ] ; then
-echo "User already exists"
+echo "YES"
 else
+echo "NO. Creating user, database and setting it up..."
 su postgres -c "cd /var/lib/postgresql ; createuser osm"
 su postgres -c "cd /var/lib/postgresql ; createdb -E UTF8 -O osm 
osmdb"
 su postgres -c "cd /var/lib/postgresql ; psql -c \"CREATE 
EXTENSION hstore;\" -d osmdb"
 su postgres -c "cd /var/lib/postgresql ; psql -c \"CREATE 
EXTENSION postgis;\" -d osmdb"
+echo "DONE"
 fi

 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 10/117: Ask before importing

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 437cdacc4ca9e84610bd2f7edbeb45962e6c4cc5
Author: Ruben Undheim 
Date:   Thu Sep 3 00:19:47 2015 +0200

Ask before importing
---
 debian/control  | 7 ---
 debian/osm-tile-server-base.postinst| 6 --
 debian/osm-tile-server-config.config| 1 +
 debian/osm-tile-server-config.postinst  | 5 +
 debian/osm-tile-server-config.templates | 7 +++
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 665f43d..526b133 100644
--- a/debian/control
+++ b/debian/control
@@ -14,17 +14,18 @@ Description: Meta package for installing OSM tile server
 Package: osm-tile-server-base
 Architecture: all
 Depends: ${misc:Depends},
-osm-tile-server-config, openstreetmap-carto, node-carto, osm2pgsql
+openstreetmap-carto, node-carto, osm2pgsql,
+postgis, postgresql-contrib
 Description: Common files for OSM tile server
 
 Package: osm-tile-server-config
 Architecture: all
 Depends: ${misc:Depends},
-postgis, postgresql-contrib
+osm-tile-server-base
 Description: This package contains the main configuration of the OSM tile 
server
 
 Package: osm-tile-server-tilelite
 Architecture: all
 Depends: ${misc:Depends},
- osm-tile-server-base, tilelite
+ osm-tile-server-config, tilelite
 Description: This sets up a full OSM tile server using tilelite
diff --git a/debian/osm-tile-server-base.postinst 
b/debian/osm-tile-server-base.postinst
index ecea881..f1d459b 100644
--- a/debian/osm-tile-server-base.postinst
+++ b/debian/osm-tile-server-base.postinst
@@ -22,12 +22,6 @@ set -e
 
 case "$1" in
 configure)
-db_get osm-tile-server/db-user
-DBUSER=$RET
-db_get osm-tile-server/db-name
-DBNAME=$RET
-
-su $DBUSER -c "osm2pgsql --slim -d $DBNAME -C 1600 --hstore -S 
/usr/share/osm2pgsql/default.style 
/usr/share/osm-tile-server-base/samples/liechtenstein-latest.osm.pbf"
 
 ;;
 
diff --git a/debian/osm-tile-server-config.config 
b/debian/osm-tile-server-config.config
index 2ed1fc1..c059a67 100644
--- a/debian/osm-tile-server-config.config
+++ b/debian/osm-tile-server-config.config
@@ -6,6 +6,7 @@ set -e
 
 db_input high osm-tile-server/db-user || true
 db_input high osm-tile-server/db-name || true
+db_input high osm-tile-server/import-sample || true
 db_go
 
 exit 0
diff --git a/debian/osm-tile-server-config.postinst 
b/debian/osm-tile-server-config.postinst
index 42e4053..72ecea5 100644
--- a/debian/osm-tile-server-config.postinst
+++ b/debian/osm-tile-server-config.postinst
@@ -26,6 +26,8 @@ case "$1" in
 DBUSER=$RET
 db_get osm-tile-server/db-name
 DBNAME=$RET
+db_get osm-tile-server/import-sample
+IMPORTSAMPLE=$RET
 
 if ! getent group $DBUSER >/dev/null; then
 addgroup --system $DBUSER >/dev/null
@@ -59,6 +61,9 @@ case "$1" in
 echo "DONE"
 fi

+if [ "$IMPORTSAMPLE" = "true" ] ; then
+su $DBUSER -c "osm2pgsql --slim -d $DBNAME -C 1600 --hstore -S 
/usr/share/osm2pgsql/default.style 
/usr/share/osm-tile-server-base/samples/liechtenstein-latest.osm.pbf"
+fi
 
 ;;
 
diff --git a/debian/osm-tile-server-config.templates 
b/debian/osm-tile-server-config.templates
index 518e4df..78c3995 100644
--- a/debian/osm-tile-server-config.templates
+++ b/debian/osm-tile-server-config.templates
@@ -9,3 +9,10 @@ Type: string
 Default: osm
 _Description: Enter name of the postgresql user:
 
+Template: osm-tile-server/import-sample
+Type: boolean
+Default: False
+_Description: Should a test OSM file be imported into the database?
+ If YES, a map of Liechtenstein will be imported so that it will be
+ available to test.
+

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 02/117: More binary packages

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 81860faec318ec8ae433b993086c473187fa0801
Author: Ruben Undheim 
Date:   Wed Sep 2 20:56:55 2015 +

More binary packages
---
 debian/control | 24 ++
 debian/dirs|  0
 debian/docs|  0
 debian/install |  0
 debian/links   |  0
 debian/{config => osm-tile-server-config.config}   |  0
 .../{postinst => osm-tile-server-config.postinst}  |  0
 debian/{prerm => osm-tile-server-config.prerm} |  0
 ...{templates => osm-tile-server-config.templates} |  0
 debian/osm-tile-server.cron.daily  | 12 ---
 10 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/debian/control b/debian/control
index 0b65612..08b1cdd 100644
--- a/debian/control
+++ b/debian/control
@@ -5,12 +5,20 @@ Maintainer: Ruben Undheim 
 Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.6
 
-Package: osm-tile-server
+Package: osm-tile-server-base
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, php5-gd, php5-mysql, apache2,
- gir1.2-gexiv2-0.10, python-mysql.connector,
- mysql-server, mysql-client, php5-common, libapache2-mod-php5,
- imagemagick, python, python3, anacron,
- python-django, libapache2-mod-wsgi
-Description: Naturfakta web service
- This is the Debian package of the Naturfakta web site.
+Depends: ${shlibs:Depends}, ${misc:Depends},
+osm-tile-server-config
+Description: Common files for OSM tile server
+
+Package: osm-tile-server-config
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends},
+postgis, postgresql-contrib 
+Description: This package contains the main configuration of the OSM tile 
server
+
+Package: osm-tile-server-tilelite
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ osm-tile-server-base, tilelite
+Description: This sets up a full OSM tile server using tilelite
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index e69de29..000
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e69de29..000
diff --git a/debian/install b/debian/install
deleted file mode 100644
index e69de29..000
diff --git a/debian/links b/debian/links
deleted file mode 100644
index e69de29..000
diff --git a/debian/config b/debian/osm-tile-server-config.config
similarity index 100%
rename from debian/config
rename to debian/osm-tile-server-config.config
diff --git a/debian/postinst b/debian/osm-tile-server-config.postinst
similarity index 100%
rename from debian/postinst
rename to debian/osm-tile-server-config.postinst
diff --git a/debian/prerm b/debian/osm-tile-server-config.prerm
similarity index 100%
rename from debian/prerm
rename to debian/osm-tile-server-config.prerm
diff --git a/debian/templates b/debian/osm-tile-server-config.templates
similarity index 100%
rename from debian/templates
rename to debian/osm-tile-server-config.templates
diff --git a/debian/osm-tile-server.cron.daily 
b/debian/osm-tile-server.cron.daily
deleted file mode 100644
index 3cba296..000
--- a/debian/osm-tile-server.cron.daily
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-
-if [ -e /var/lib/naturfakta-web/images ] ; then
-  chgrp www-data `readlink -f /var/lib/naturfakta-web/images`
-  chmod g+w `readlink -f /var/lib/naturfakta-web/images`
-  mkdir -p /var/lib/naturfakta-web/images/orig
-  chgrp www-data `readlink -f /var/lib/naturfakta-web/images/orig`
-  chmod g+w `readlink -f /var/lib/naturfakta-web/images/orig`
-  cp /usr/share/naturfakta-web/keys/check.php 
/usr/share/naturfakta-web/keys/.htaccess /var/lib/naturfakta-web/keys/
-  ln -sf /usr/share/websites/naturfakta/www/versions/bimage.php 
/var/lib/naturfakta-web/images/bimage.php
-fi

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 03/117: Creating db

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit ed808d94138814d926e26f7eb27533f308c9ca62
Author: Ruben Undheim 
Date:   Wed Sep 2 21:41:58 2015 +

Creating db
---
 debian/control |  4 +-
 debian/osm-tile-server-config.postinst | 76 ++
 2 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/debian/control b/debian/control
index 08b1cdd..3e9d9f8 100644
--- a/debian/control
+++ b/debian/control
@@ -8,13 +8,13 @@ Standards-Version: 3.9.6
 Package: osm-tile-server-base
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends},
-osm-tile-server-config
+osm-tile-server-config, openstreetmap-carto, node-carto, osm2pgsql
 Description: Common files for OSM tile server
 
 Package: osm-tile-server-config
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends},
-postgis, postgresql-contrib 
+postgis, postgresql-contrib
 Description: This package contains the main configuration of the OSM tile 
server
 
 Package: osm-tile-server-tilelite
diff --git a/debian/osm-tile-server-config.postinst 
b/debian/osm-tile-server-config.postinst
index e7b314f..daccb1c 100644
--- a/debian/osm-tile-server-config.postinst
+++ b/debian/osm-tile-server-config.postinst
@@ -24,50 +24,38 @@ case "$1" in
 configure)
 #db_get osm-tile-server/db-name
 #DBNAME=$RET
-#db_get osm-tile-server/db-password
-#PASSWORD=$RET
-#db_get osm-tile-server/db-user
-#DBUSER=$RET
-#db_get osm-tile-server/root-password
-#ROOTPASSWORD=$RET
-#RES=$(echo "select schema_name from information_schema.schemata where 
schema_name = '$DBNAME';" | mysql -h localhost -u root -p$ROOTPASSWORD mysql)
-#if [ "$RES" = "" ] ; then
-#echo "Database does not exist. Creating..."
-#echo "create database $DBNAME;" | mysql -h localhost -u root 
-p$ROOTPASSWORD mysql
-#echo "grant all on ${DBNAME}.* to ${DBUSER} identified by 
'${PASSWORD}';" | mysql -h localhost -u root -p$ROOTPASSWORD mysql
-#else
-#echo "Database $DBNAME exists already. Skipping setup"
-#fi
-#sed -i 's/DBNAME=.*$/DBNAME='$DBNAME'/' /etc/osm-tile-server.conf
-#sed -i 's/DBUSER=.*$/DBUSER='$DBUSER'/' /etc/osm-tile-server.conf
-#sed -i 's/DBPASS=.*$/DBPASS='$PASSWORD'/' /etc/osm-tile-server.conf
-#sed -i 's/database =.*$/database = '$DBNAME'/' 
/etc/osm-tile-server.mysql.cnf
-#sed -i 's/user =.*$/user = '$DBUSER'/' /etc/osm-tile-server.mysql.cnf
-#sed -i 's/password =.*$/password = '$PASSWORD'/' 
/etc/osm-tile-server.mysql.cnf
-#sed -i "s/\$dbuser = .*$/\$dbuser = '"$DBUSER"';/" 
/usr/share/websites/naturfakta/www/versions/mysql.php
-#sed -i "s/\$dbpass = .*$/\$dbpass = '"$PASSWORD"';/" 
/usr/share/websites/naturfakta/www/versions/mysql.php
-#sed -i "s/\$dbname = .*$/\$dbname = '"$DBNAME"';/" 
/usr/share/websites/naturfakta/www/versions/mysql.php
-#sed -i "s/\$dbuser = .*$/\$dbuser = '"$DBUSER"';/" 
/usr/share/websites/naturfakta/www/edit/mysql.php
-#sed -i "s/\$dbpass = .*$/\$dbpass = '"$PASSWORD"';/" 
/usr/share/websites/naturfakta/www/edit/mysql.php
-#sed -i "s/\$dbname = .*$/\$dbname = '"$DBNAME"';/" 
/usr/share/websites/naturfakta/www/edit/mysql.php
-#sed -i "s/sqldbname = .*$/sqldbname = '"$DBNAME"';/" 
/usr/lib/osm-tile-server/python/mypasswords.py
-#sed -i "s/sqlpass = .*$/sqlpass = '"$PASSWORD"';/" 
/usr/lib/osm-tile-server/python/mypasswords.py
-#sed -i "s/sqldbuser = .*$/sqldbuser = '"$DBUSER"';/" 
/usr/lib/osm-tile-server/python/mypasswords.py
-#db_get osm-tile-server/enable
-#ENABLENOW=$RET
-#if [ "$ENABLENOW" = "true" ] ; then
-#echo "Enabling site now"
-#a2ensite naturfakta.conf
-#a2enmod rewrite
-#a2enmod ssl
-#a2enmod wsgi
-#fi
-##db_get osm-tile-server/path
-##PICTUREPATH=$RET
-##ln -sf $PICTUREPATH /var/www/packages/bilder/www/bilder
-#chown -R www-data:www-data /var/cache/naturfakta
-#cp /usr/share/osm-tile-server/keys/check.php 
/usr/share/osm-tile-server/keys/.htaccess /var/lib/osm-tile-server/keys/
-#ln -sf /usr/share/websites/naturfakta/www/versions/bimage.php 
/var/lib/osm-tile-server/images/bimage.php
+
+if ! getent group osm >/dev/null; then
+addgroup --system osm >/dev/null
+fi
+
+if ! getent passwd osm >/dev/null; then
+adduser \
+--system \
+--disabled-login \
+--ingroup osm \
+--home /var/lib/osm-tile-server-user \
+--gecos "osm tile server user" \
+--shell /bin/bash \
+osm >/dev/null

[osm-tile-server] 69/117: Use the settings

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 95f5ca074d4a876bc9179ac34ef7781b6468b35f
Author: Ruben Undheim 
Date:   Sun Sep 6 17:35:38 2015 +0200

Use the settings
---
 src/osm-tile-server-import.c |  8 +++-
 src/parse-settings.c | 37 ++---
 src/parse-settings.h |  5 -
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/src/osm-tile-server-import.c b/src/osm-tile-server-import.c
index 3d82282..d25b129 100644
--- a/src/osm-tile-server-import.c
+++ b/src/osm-tile-server-import.c
@@ -17,7 +17,13 @@ int main(int argc, char **argv)
 
parse_settings();
 
-   snprintf(command,255,"osm2pgsql --slim -d %s --cache-strategy sparse -C 
100 --hstore -S /usr/share/osm2pgsql/default.style %s",dbname,pbffile);
+   if(strcmp(cfg_slim,"true") == 0) {
+   snprintf(cfg_slim,10,"--slim");
+   }
+   else {
+   snprintf(cfg_slim,10,"");
+   }
+   snprintf(command,255,"osm2pgsql %s -d %s --cache-strategy %s -C %s 
--hstore -S /usr/share/osm2pgsql/default.style 
%s",cfg_slim,cfg_dbname,cfg_cache_strategy,cfg_memory,pbffile);
printf("Importing to database with this command:\n\n");
printf(" %s\n\n",command);
system(command);
diff --git a/src/parse-settings.c b/src/parse-settings.c
index 8ca9c3f..99e1870 100644
--- a/src/parse-settings.c
+++ b/src/parse-settings.c
@@ -2,7 +2,29 @@
 #include 
 #include 
 
-char dbname[64];
+char cfg_dbname[64];
+char cfg_slim[64];
+char cfg_cache_strategy[64];
+char cfg_memory[64];
+
+int parse_one(const char *l, const char *cmp, char *var){
+   int len;
+   len = strlen(cmp);
+   if(strncmp(cmp,l,strlen(cmp)) == 0) {
+   if(l[7] == '\"'){
+   char *substr = strstr(l+len+1,"\"");
+   *substr = 0;
+   strncpy(var,l+len+1,63);
+   }
+   else {
+   char *substr = strstr(l+len+1,"\n");
+   *substr = 0;
+   strncpy(var,l+len,63);
+   }
+   return 0;
+   }
+   else return -1;
+}
 
 void parse_settings()
 {
@@ -15,12 +37,13 @@ void parse_settings()
if (infile == NULL) exit(-1);
while((read = getline(, , infile)) != -1 ) {
const char *l = linebuf;
-   if(strncmp("DBNAME=\"",l,8) == 0) {
-   char *substr = strstr(l+8,"\"");
-   *substr = 0;
-   //printf("Read line: %s\n",linebuf+8);
-   strncpy(dbname,linebuf+8,63);
-   //printf("%s\n",dbname);
+   if(parse_one(l,"DBNAME=",cfg_dbname) == 0){
+   }
+   else if(parse_one(l,"SLIM=",cfg_slim) == 0){
+   }
+   else if(parse_one(l,"CACHE_STRATEGY=",cfg_cache_strategy) == 0){
+   }
+   else if(parse_one(l,"MEMORY=",cfg_memory) == 0){
}
}
fclose(infile);
diff --git a/src/parse-settings.h b/src/parse-settings.h
index 94c053b..90f609c 100644
--- a/src/parse-settings.h
+++ b/src/parse-settings.h
@@ -1,7 +1,10 @@
 #ifndef INC_PARSE_SETTINGS_H
 #define INC_PARSE_SETTINGS_H
 
-extern char dbname[64];
+extern char cfg_dbname[64];
+extern char cfg_cache_strategy[64];
+extern char cfg_memory[64];
+extern char cfg_slim[64];
 
 void parse_settings();
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 70/117: Changed to alpha release

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 213986acd985fff324677152f403791a258f88c5
Author: Ruben Undheim 
Date:   Sun Sep 6 17:40:30 2015 +0200

Changed to alpha release
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 15de596..34e2f72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-osm-tile-server (1.0) unstable; urgency=low
+osm-tile-server (1.0~a1) unstable; urgency=low
 
   * Initial Release.
 
- -- Ruben Undheim   Wed, 02 Sep 2015 22:38:06 +0200
+ -- Ruben Undheim   Sun, 06 Sep 2015 17:40:21 +0200

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 56/117: Using normal scripts where possible

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 9a3149372754c1d3580a720afa6a274c17838076
Author: Ruben Undheim 
Date:   Fri Sep 4 18:58:18 2015 +0200

Using normal scripts where possible
---
 Makefile |  0
 debian/osm-tile-server-base.dirs |  1 +
 debian/osm-tile-server-base.install  |  1 +
 debian/osm-tile-server-base.postinst | 17 ++---
 scripts/Makefile |  3 +++
 scripts/osm-tile-server-download | 11 +
 scripts/osm-tile-server-import   |  3 +++
 scripts/osm-tile-server-process  |  4 ++-
 scripts/osm-tile-server-status   | 10 
 src/Makefile | 15 +++-
 src/osm-tile-server-download.c   | 31 
 src/osm-tile-server-status.c | 47 
 12 files changed, 44 insertions(+), 99 deletions(-)

diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
diff --git a/debian/osm-tile-server-base.dirs b/debian/osm-tile-server-base.dirs
index 6b67c29..5dbaef0 100644
--- a/debian/osm-tile-server-base.dirs
+++ b/debian/osm-tile-server-base.dirs
@@ -1 +1,2 @@
 /var/cache/osm-tile-server-base
+/var/lib/osm-tile-server-base
diff --git a/debian/osm-tile-server-base.install 
b/debian/osm-tile-server-base.install
index 186c185..d929822 100644
--- a/debian/osm-tile-server-base.install
+++ b/debian/osm-tile-server-base.install
@@ -1,3 +1,4 @@
 usr/bin/*
+usr/lib/osm-tile-server-base/*
 samples usr/share/osm-tile-server-base/
 etc/osm-tile-server.conf /etc/
diff --git a/debian/osm-tile-server-base.postinst 
b/debian/osm-tile-server-base.postinst
index ae08f88..e3a4275 100644
--- a/debian/osm-tile-server-base.postinst
+++ b/debian/osm-tile-server-base.postinst
@@ -86,14 +86,13 @@ case "$1" in
 
 sed -i 's/^DBNAME=""/DBNAME="'${DBNAME}'"/' /etc/osm-tile-server.conf
 
-chown $DBUSER:$DBUSER /usr/bin/osm-tile-server-import
-chmod 4554 /usr/bin/osm-tile-server-import
-chown $DBUSER:$DBUSER /usr/bin/osm-tile-server-download
-chmod 4554 /usr/bin/osm-tile-server-download
-chown $DBUSER:$DBUSER /usr/bin/osm-tile-server-status
-chmod 4554 /usr/bin/osm-tile-server-status
+chown $DBUSER:$DBUSER 
/usr/lib/osm-tile-server-base/bin/osm-tile-server-import
+chmod 4554 /usr/lib/osm-tile-server-base/bin/osm-tile-server-import
 
 chown $DBUSER:$DBUSER /var/cache/osm-tile-server-base
+chown $DBUSER:$DBUSER /var/lib/osm-tile-server-base
+chmod 2775 /var/cache/osm-tile-server-base
+chmod 2775 /var/lib/osm-tile-server-base
 
 
 if [ "$IMPORTSAMPLE" = "true" ] ; then
@@ -101,13 +100,13 @@ case "$1" in
 fi
 
 if [ "$ACTIONNOW" = "true" ] ; then
-su $DBUSER -c "echo \"TODO\" > 
/var/cache/osm-tile-server-base/status.txt"
+su $DBUSER -c "echo \"TODO\" > 
/var/lib/osm-tile-server-base/status.txt"
 if [ "$PROCESSNOW" = "Now; will take some time" ] ; then
 osm-tile-server-process
-su $DBUSER -c "echo \"DONE\" > 
/var/cache/osm-tile-server-base/status.txt"
+su $DBUSER -c "echo \"DONE\" > 
/var/lib/osm-tile-server-base/status.txt"
 fi
 else
-su $DBUSER -c "echo \"\" > 
/var/cache/osm-tile-server-base/status.txt"
+su $DBUSER -c "echo \"\" > 
/var/lib/osm-tile-server-base/status.txt"
 fi
 
 ;;
diff --git a/scripts/Makefile b/scripts/Makefile
index 15c3248..8b52d71 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -3,3 +3,6 @@ default:
 install:
mkdir -p ${DESTDIR}/usr/bin
install osm-tile-server-process ${DESTDIR}/usr/bin/
+   install osm-tile-server-status ${DESTDIR}/usr/bin/
+   install osm-tile-server-download ${DESTDIR}/usr/bin/
+   install osm-tile-server-import ${DESTDIR}/usr/bin/
diff --git a/scripts/osm-tile-server-download b/scripts/osm-tile-server-download
new file mode 100755
index 000..79e64eb
--- /dev/null
+++ b/scripts/osm-tile-server-download
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+FILENAME="downloaded.osm.pbf"
+URL="http://download.geofabrik.de/europe/norway-latest.osm.pbf;
+COMMAND="wget -O /var/cache/osm-tile-server-base/${FILENAME} ${URL}"
+echo "The following command will be run to download:\n\n"
+echo " ${COMMAND}\n\n"
+
+$COMMAND
+
+
diff --git a/scripts/osm-tile-server-import b/scripts/osm-tile-server-import
new file mode 100755
index 000..ad0541b
--- /dev/null
+++ b/scripts/osm-tile-server-import
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/usr/lib/osm-tile-server-base/bin/osm-tile-server-import $*
diff --git a/scripts/osm-tile-server-process b/scripts/osm-tile-server-process
index 1b5bd55..87451cf 100755
--- a/scripts/osm-tile-server-process
+++ b/scripts/osm-tile-server-process
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+umask 002
+

[osm-tile-server] 73/117: Fixed typo

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 8ced8bd964113a24e19fce717d924256cefe581b
Author: Ruben Undheim 
Date:   Sun Sep 6 17:58:09 2015 +0200

Fixed typo
---
 scripts/osm-tile-server-download | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/osm-tile-server-download b/scripts/osm-tile-server-download
index a263546..564052b 100755
--- a/scripts/osm-tile-server-download
+++ b/scripts/osm-tile-server-download
@@ -2,7 +2,7 @@
 
 umask 002
 
-source /etc/osm-tile-server-base.conf
+source /etc/osm-tile-server.conf
 
 REGION=`cat /var/lib/osm-tile-server-base/selected_region.txt`
 FILENAME="downloaded.osm.pbf"

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

[osm-tile-server] 72/117: Also include URL in etc file

2015-11-03 Thread Ruben Undheim

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit d00b520839df0df0c6f22d80c355dd7875e9033d
Author: Ruben Undheim 
Date:   Sun Sep 6 17:56:02 2015 +0200

Also include URL in etc file
---
 etc/osm-tile-server.conf | 7 ---
 scripts/osm-tile-server-download | 4 +++-
 src/parse-settings.c | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/etc/osm-tile-server.conf b/etc/osm-tile-server.conf
index c904919..a94c817 100644
--- a/etc/osm-tile-server.conf
+++ b/etc/osm-tile-server.conf
@@ -1,5 +1,6 @@
 
 DBNAME=""
-SLIM=true
-CACHE_STRATEGY=sparse
-MEMORY=100
+IMPORT_SLIM=true
+IMPORT_CACHE_STRATEGY=sparse
+IMPORT_MEMORY=100
+SRC_URL="http://download.geofabrik.de;
diff --git a/scripts/osm-tile-server-download b/scripts/osm-tile-server-download
index 5bc4e31..a263546 100755
--- a/scripts/osm-tile-server-download
+++ b/scripts/osm-tile-server-download
@@ -2,9 +2,11 @@
 
 umask 002
 
+source /etc/osm-tile-server-base.conf
+
 REGION=`cat /var/lib/osm-tile-server-base/selected_region.txt`
 FILENAME="downloaded.osm.pbf"
-URL="http://download.geofabrik.de/${REGION}-latest.osm.pbf;
+URL="${SRC_URL}/${REGION}-latest.osm.pbf"
 COMMAND="wget -O /var/cache/osm-tile-server-base/${FILENAME} ${URL}"
 echo "The following command will be run to download:\n\n"
 echo " ${COMMAND}\n\n"
diff --git a/src/parse-settings.c b/src/parse-settings.c
index 99e1870..de67fb1 100644
--- a/src/parse-settings.c
+++ b/src/parse-settings.c
@@ -39,11 +39,11 @@ void parse_settings()
const char *l = linebuf;
if(parse_one(l,"DBNAME=",cfg_dbname) == 0){
}
-   else if(parse_one(l,"SLIM=",cfg_slim) == 0){
+   else if(parse_one(l,"IMPORT_SLIM=",cfg_slim) == 0){
}
-   else if(parse_one(l,"CACHE_STRATEGY=",cfg_cache_strategy) == 0){
+   else 
if(parse_one(l,"IMPORT_CACHE_STRATEGY=",cfg_cache_strategy) == 0){
}
-   else if(parse_one(l,"MEMORY=",cfg_memory) == 0){
+   else if(parse_one(l,"IMPORT_MEMORY=",cfg_memory) == 0){
}
}
fclose(infile);

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm-tile-server.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

1 2 3 >

1 - 100 of 228 matches

Mail list logo