[sfcgal] 01/01: change dist back from UNRELEASED to unstable
This is an automated email from the git hooks/post-receive script. giggls-guest pushed a commit to branch master in repository sfcgal. commit 6dc073e7f8fb011a87620fcd0c2f1a283e0f74f2 Author: Sven Geggus sven-...@geggus.net Date: Sun Aug 30 13:26:42 2015 +0200 change dist back from UNRELEASED to unstable --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index db8be59..4150e3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sfcgal (1.1.0-4) UNRELEASED; urgency=medium +sfcgal (1.1.0-4) unstable; urgency=medium * re-enable tests which work fine without CMAKE_SKIP_RPATH * remove rpath during install using chrpath instead -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sfcgal.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
[sfcgal] branch master updated (2d598f8 - 6dc073e)
This is an automated email from the git hooks/post-receive script. giggls-guest pushed a change to branch master in repository sfcgal. from 2d598f8 Remove Multi-Arch option on libsfcgal-dev and sfcgal-bin new 6dc073e change dist back from UNRELEASED to unstable 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: debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sfcgal.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#797397: RFS: sfcgal/1.1.0
Package: sponsorship-requests Severity: normal Hello, I have just uploaded a new Version of sfcgal to mentors.debian.net. In addition to the changes stated in debian/changelog this package has now been linked against libcgal11v5. * Package name: sfcgal Version : 1.1.0-4 Upstream Author : Mickael Borne (IGN), Hugo Mercier (Oslandia), Vincent Mora (Oslandia), Olivier Courtin (Oslandia) * URL : http://www.sfcgal.org/ * License : LGPL-2+ Section : science Sources have already been uploaded to alioth and are availabe via the following URL: git+ssh://git.debian.org/git/pkg-grass/sfcgal.git Regards Sven signature.asc Description: Digital 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
[libterralib] branch master updated (2918b77 - c390cf8)
This is an automated email from the git hooks/post-receive script. mckinstry pushed a change to branch master in repository libterralib. from 2918b77 Add libpq-dev, libmysqlcient-dev as B-D. new c390cf8 Remove libspl, te_spl plugin as broken on Hurd, KFreeBSD. 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: debian/changelog | 6 ++ debian/libterralib-dev.install.in | 2 -- debian/libterralib-dev.links.in | 2 -- debian/libterralib3.install.in| 2 -- debian/rules | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.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
[libterralib] tag debian/4.3.0+dfsg.2-4 created (now c390cf8)
This is an automated email from the git hooks/post-receive script. mckinstry pushed a change to tag debian/4.3.0+dfsg.2-4 in repository libterralib. at c390cf8 (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/libterralib.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
[libterralib] 01/01: Remove libspl, te_spl plugin as broken on Hurd, KFreeBSD.
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository libterralib.
commit c390cf84c1b3f4ae7f0bdaa93f7840dd717e4ba6
Author: Alastair McKinstry mckins...@debian.org
Date: Sun Aug 30 01:09:32 2015 +0100
Remove libspl, te_spl plugin as broken on Hurd, KFreeBSD.
---
debian/changelog | 6 ++
debian/libterralib-dev.install.in | 2 --
debian/libterralib-dev.links.in | 2 --
debian/libterralib3.install.in| 2 --
debian/rules | 6 +++---
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 45930a8..4940cb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libterralib (4.3.0+dfsg.2-4) unstable; urgency=medium
+
+ * Remove libspl, te_spl plugin as broken on Hurd, KFreeBSD.
+
+ -- Alastair McKinstry mckins...@debian.org Fri, 07 Aug 2015 20:05:54 +0100
+
libterralib (4.3.0+dfsg.2-3) unstable; urgency=medium
* Add libpq-dev, libmysqlcient-dev as B-D.
diff --git a/debian/libterralib-dev.install.in
b/debian/libterralib-dev.install.in
index d09b84f..596ded1 100644
--- a/debian/libterralib-dev.install.in
+++ b/debian/libterralib-dev.install.in
@@ -6,8 +6,6 @@ Release/libshapelib.a usr/lib/@DEB_HOST_MULTIARCH@
Release/libte_shapelib.a usr/lib/@DEB_HOST_MULTIARCH@
Release/libte_mysql.a usr/lib/@DEB_HOST_MULTIARCH@
Release/libte_postgresql.a usr/lib/@DEB_HOST_MULTIARCH@
-Release/libspl.a usr/lib/@DEB_HOST_MULTIARCH@
-Release/libte_spl.a usr/lib/@DEB_HOST_MULTIARCH@
Release/libte_dxf.a usr/lib/@DEB_HOST_MULTIARCH@
Release/libstat.a usr/lib/@DEB_HOST_MULTIARCH@
src/terralib/dtm/*.h usr/include/terralib/dtm
diff --git a/debian/libterralib-dev.links.in b/debian/libterralib-dev.links.in
index 2225751..decd954 100644
--- a/debian/libterralib-dev.links.in
+++ b/debian/libterralib-dev.links.in
@@ -6,8 +6,6 @@
/usr/lib/@DEB_HOST_MULTIARCH@/libshapelib.so.3.6.1
usr/lib/@DEB_HOST_MULTIARCH@/libshapelib.so
/usr/lib/@DEB_HOST_MULTIARCH@/libte_mysql.so.3.6.1
usr/lib/@DEB_HOST_MULTIARCH@/libte_mysql.so
/usr/lib/@DEB_HOST_MULTIARCH@/libte_dxf.so.3.6.1
usr/lib/@DEB_HOST_MULTIARCH@/libte_dxf.so
-/usr/lib/@DEB_HOST_MULTIARCH@/libte_spl.so.3.6.1
usr/lib/@DEB_HOST_MULTIARCH@/libte_spl.so
-/usr/lib/@DEB_HOST_MULTIARCH@/libspl.so.3.6.1
usr/lib/@DEB_HOST_MULTIARCH@/libspl.so
/usr/lib/@DEB_HOST_MULTIARCH@/libte_postgresql.so.3.6.1
usr/lib/@DEB_HOST_MULTIARCH@/libte_postgresql.so
/usr/lib/@DEB_HOST_MULTIARCH@/libte_utils.so.3.6.1
usr/lib/@DEB_HOST_MULTIARCH@/libte_utils.so
/usr/lib/@DEB_HOST_MULTIARCH@/libstat.so.3.6.1
usr/lib/@DEB_HOST_MULTIARCH@/libstat.so
diff --git a/debian/libterralib3.install.in b/debian/libterralib3.install.in
index 5e648a6..def7d23 100644
--- a/debian/libterralib3.install.in
+++ b/debian/libterralib3.install.in
@@ -6,8 +6,6 @@ Release/linux-g++/libte_shapelib.so.*
usr/lib/@DEB_HOST_MULTIARCH@
Release/linux-g++/libshapelib.so.* usr/lib/@DEB_HOST_MULTIARCH@
Release/linux-g++/libte_mysql.so.* usr/lib/@DEB_HOST_MULTIARCH@
Release/linux-g++/libte_dxf.so.* usr/lib/@DEB_HOST_MULTIARCH@
-Release/linux-g++/libspl.so.* usr/lib/@DEB_HOST_MULTIARCH@
-Release/linux-g++/libte_spl.so.* usr/lib/@DEB_HOST_MULTIARCH@
Release/linux-g++/libte_postgresql.so.*
usr/lib/@DEB_HOST_MULTIARCH@
Release/linux-g++/libte_utils.so.* usr/lib/@DEB_HOST_MULTIARCH@
Release/linux-g++/libstat.so.* usr/lib/@DEB_HOST_MULTIARCH@
diff --git a/debian/rules b/debian/rules
index c2cc32d..15651f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,10 +25,10 @@ override_dh_auto_build:
for f in ${AUTOGENERATED} ; do \
sed -e 's%@DEB_HOST_MULTIARCH@%${DEB_HOST_MULTIARCH}%g'
debian/$$f.in debian/$$f ; \
done
- for d in terralib te_functions te_utils image_processing libspl
PostgreSQL MySQL shapelib stat te_dxf te_shapelib te_spl ; do \
+ for d in terralib te_functions te_utils image_processing PostgreSQL
MySQL shapelib stat te_dxf te_shapelib ; do \
( cd build/qt4/$$d qmake QMAKE_CXXFLAGS=$(CXXFLAGS) $$d.pro
$(MAKE) ) ; \
done
- for d in terralib te_functions te_utils terralibpdi shapelib
te_shapelib te_mysql te_spl spl te_postgresql te_dxf stat ; do \
+ for d in terralib te_functions te_utils terralibpdi shapelib
te_shapelib te_mysql te_postgresql te_dxf stat ; do \
ar rcs Release/lib$$d.a Release/linux-g++/obj/$$d/*.o ;\
done
@@ -37,6 +37,6 @@ override_dh_clean:
rm -rf Release
rm -f $(patsubst %, debian/%, ${AUTOGENERATED})
find . -name '.cvsignore' -delete
- for d in terralib te_functions te_utils
Processed: Re: Bug#794317: fixed in sfcgal 1.1.0-3
Processing control commands:
reopen -1
Bug #794317 {Done: Sven Geggus sven-deb...@geggus.net} [libsfcgal-dev]
libsfcgal-dev: arch-dependent file in Multi-Arch: same package
'reopen' may be inappropriate when a bug has been closed with a version;
all fixed versions will be cleared, and you may need to re-add them.
Bug reopened
No longer marked as fixed in versions sfcgal/1.1.0-3.
--
794317: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=794317
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
Bug#794317: fixed in sfcgal 1.1.0-3
Control: reopen -1 On Thu, Aug 27, 2015 at 16:16:42 +, Sven Geggus wrote: sfcgal (1.1.0-3) unstable; urgency=medium . * Make package build in unstable with boost 1.58 and gcc5 * Change from Multi-Arch: same to foreign (Closes: #794317) * Update symbols for other architectures. Making your -dev package Multi-Arch: foreign is even worse... Please either make common files the same on all architectures, or remove the Multi-Arch field entirely. Cheers, Julien signature.asc Description: Digital 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
[sfcgal] 01/01: Remove Multi-Arch option on libsfcgal-dev and sfcgal-bin
This is an automated email from the git hooks/post-receive script.
giggls-guest pushed a commit to branch master
in repository sfcgal.
commit 2d598f849fcbc7a48ddbcc9aa4b549b155971b19
Author: Sven Geggus sven-...@geggus.net
Date: Sun Aug 30 12:56:08 2015 +0200
Remove Multi-Arch option on libsfcgal-dev and sfcgal-bin
---
debian/changelog | 1 +
debian/control | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ce939c6..db8be59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ sfcgal (1.1.0-4) UNRELEASED; urgency=medium
* re-enable tests which work fine without CMAKE_SKIP_RPATH
* remove rpath during install using chrpath instead
* skip style-test using patch from upstream
+ * Remove Multi-Arch option on libsfcgal-dev and sfcgal-bin (Closes: #794317)
-- Sven Geggus sven-deb...@geggus.net Fri, 28 Aug 2015 16:37:16 +0200
diff --git a/debian/control b/debian/control
index 296225e..e79728e 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,6 @@ Description: Library for ISO 19107:2013 and OGC SFA 1.2 for
3D operations (runti
Package: libsfcgal-dev
Section: libdevel
Architecture: any
-Multi-Arch: foreign
Depends: libsfcgal1 (= ${binary:Version}), ${misc:Depends}
Description: Library for ISO 19107:2013 and OGC SFA 1.2 for 3D operations (dev
part)
SFCGAL is a C++ wrapper library around CGAL with the aim of
@@ -49,7 +48,6 @@ Description: Library for ISO 19107:2013 and OGC SFA 1.2 for
3D operations (dev p
Package: sfcgal-bin
Architecture: any
-Multi-Arch: foreign
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Simple viewer for SFCGAL library
viewer-SFCGAL is a basic 3D viewer based on OpenSceneGraph.
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/sfcgal.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
[sfcgal] branch master updated (f0e32bd - 2d598f8)
This is an automated email from the git hooks/post-receive script. giggls-guest pushed a change to branch master in repository sfcgal. from f0e32bd re-enable tests which work fine if not skipping rpath new 2d598f8 Remove Multi-Arch option on libsfcgal-dev and sfcgal-bin 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: debian/changelog | 1 + debian/control | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sfcgal.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#794317: marked as done (libsfcgal-dev: arch-dependent file in Multi-Arch: same package)
Your message dated Sun, 30 Aug 2015 13:20:06 +
with message-id e1zw2wk-0002ok...@franck.debian.org
and subject line Bug#794317: fixed in sfcgal 1.1.0-4
has caused the Debian Bug report #794317,
regarding libsfcgal-dev: arch-dependent file in Multi-Arch: same package
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
794317: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=794317
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
---BeginMessage---
Package: libsfcgal-dev
Version: 1.1.0-2
Severity: important
User: multiarch-de...@lists.alioth.debian.org
Usertags: multiarch
libsfcgal-dev is marked as Multi-Arch: same, but the following file is
architecture-dependent:
/usr/bin/sfcgal-config
An example diff between amd64 and armhf is attached.
--
Jakub Wilk
diff -ur libsfcgal-dev_1.1.0-2_amd64/usr/bin/sfcgal-config
libsfcgal-dev_1.1.0-2_armhf/usr/bin/sfcgal-config
--- libsfcgal-dev_1.1.0-2_amd64/usr/bin/sfcgal-config 2015-07-31
15:09:22.0 +0200
+++ libsfcgal-dev_1.1.0-2_armhf/usr/bin/sfcgal-config 2015-07-31
17:14:48.0 +0200
@@ -1,6 +1,6 @@
#!/bin/sh
prefix=/usr
-libdir=${prefix}/lib/x86_64-linux-gnu
+libdir=${prefix}/lib/arm-linux-gnueabihf
usage()
{
---End Message---
---BeginMessage---
Source: sfcgal
Source-Version: 1.1.0-4
We believe that the bug you reported is fixed in the latest version of
sfcgal, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 794...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Sven Geggus sven-deb...@geggus.net (supplier of updated sfcgal package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512
Format: 1.8
Date: Fri, 28 Aug 2015 16:37:16 +0200
Source: sfcgal
Binary: libsfcgal1 libsfcgal-dev sfcgal-bin
Architecture: source amd64
Version: 1.1.0-4
Distribution: unstable
Urgency: medium
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Changed-By: Sven Geggus sven-deb...@geggus.net
Description:
libsfcgal-dev - Library for ISO 19107:2013 and OGC SFA 1.2 for 3D operations
(dev
libsfcgal1 - Library for ISO 19107:2013 and OGC SFA 1.2 for 3D operations (run
sfcgal-bin - Simple viewer for SFCGAL library
Closes: 794317
Changes:
sfcgal (1.1.0-4) unstable; urgency=medium
.
* re-enable tests which work fine without CMAKE_SKIP_RPATH
* remove rpath during install using chrpath instead
* skip style-test using patch from upstream
* Remove Multi-Arch option on libsfcgal-dev and sfcgal-bin (Closes: #794317)
Checksums-Sha1:
1cb8340576bc0b0018345365d3b74cf21b77da09 2162 sfcgal_1.1.0-4.dsc
af43f7e38abeacef57ff23cca964b681c83afc82 132908 sfcgal_1.1.0-4.debian.tar.xz
cd1f8950e9d2471dcf02de65ccd1beaa5dfde288 61682 libsfcgal-dev_1.1.0-4_amd64.deb
8401d9ef5d533ea75cd6872575b0c526adc87b23 1936766 libsfcgal1_1.1.0-4_amd64.deb
04a7f379621ef5036a19f8fcc6aa757b15be17e7 91968 sfcgal-bin_1.1.0-4_amd64.deb
Checksums-Sha256:
d2e6ce5578ddb2d4759f33179b3ba712d4646cd9e361036f7a22fd5fede79816 2162
sfcgal_1.1.0-4.dsc
301435584ee7a0765245946be797b419e2c8cabd4001f7e424f3e0a2adee8b05 132908
sfcgal_1.1.0-4.debian.tar.xz
80a012396e28e17bf1b08e868b07e676e96de03084f695c032cb9a8f951682fd 61682
libsfcgal-dev_1.1.0-4_amd64.deb
bf6806d4970ff882e25b1a878db0538a3a75a65bc67a033409c1f3f48240149d 1936766
libsfcgal1_1.1.0-4_amd64.deb
f79f6ad590f23b9c82030abab438b3cee18fb80b6c77d3ccc627ff36ca5043aa 91968
sfcgal-bin_1.1.0-4_amd64.deb
Files:
c6223bfada9b542727e1e4a83c170430 2162 science optional sfcgal_1.1.0-4.dsc
a567415379b11879a4b1c44ca0a89535 132908 science optional
sfcgal_1.1.0-4.debian.tar.xz
d0fd8a6e9528892faa1e72ed20ef6444 61682 libdevel optional
libsfcgal-dev_1.1.0-4_amd64.deb
e87721f3ab96b077e24f5e7707513acf 1936766 libs optional
libsfcgal1_1.1.0-4_amd64.deb
b08eed7760821f1b75dcedec4d089d59 91968 science optional
sfcgal-bin_1.1.0-4_amd64.deb
-BEGIN PGP SIGNATURE-
Version: GnuPG v1
iQIcBAEBCgAGBQJV4wDUAAoJEGdQ8QrojUrxDLoP/joEEZlHb9groB5YfCTGosjC
HahrDhxW1Z6vWkjSbWfhB9xBHqJ7r/AxzhPV1nTFvrY5/Bl2rj4QTZ/3dpTQ7pbV
M1CZsWF83w0nWEUYr1eD4HLnDvCrhsy4InjsYewfZtQ45l5MdDnCss2lQosIlKzP
5h/Cl5yS9MOIZ4SI6yjcqP11HZsWL8ep17mP1NOO5aP/GiwmlNrdizJ0jxdeCpxj
Processing of osmcoastline_2.1.0-2_amd64.changes
osmcoastline_2.1.0-2_amd64.changes uploaded successfully to localhost along with the files: osmcoastline_2.1.0-2.dsc osmcoastline_2.1.0-2.debian.tar.xz osmcoastline_2.1.0-2_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
[mapnik] branch master updated (cf91821 - 21f06ce)
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch master
in repository mapnik.
from cf91821 Set distribution to unstable.
new 2108614 Imported Upstream version 3.0.4+ds
new a248d4f Merge tag 'upstream/3.0.4+ds'
new 3c656dc New upstream release.
new 7c0d1d2 Add lintian override for hardening-no-fortify-functions.
new 21f06ce Set distribution to unstable.
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:
.travis.yml| 12 +-
CHANGELOG.md | 54 +-
benchmark/test_polygon_clipping.cpp| 20 +-
debian/changelog |7 +
debian/libmapnik3.0.lintian-overrides |6 +
include/build.py |1 +
include/mapnik/csv/csv_grammar.hpp | 103 ++
include/mapnik/datasource_cache.hpp|6 +
include/mapnik/marker_helpers.hpp |1 -
include/mapnik/value.hpp |6 +
include/mapnik/version.hpp |2 +-
plugins/input/csv/build.py |2 +
plugins/input/csv/csv_datasource.cpp | 838 -
plugins/input/csv/csv_datasource.hpp | 43 +-
.../csv_featureset.cpp}| 62 +-
.../csv_featureset.hpp}| 40 +-
plugins/input/csv/csv_inline_featureset.cpp| 78 ++
.../csv_inline_featureset.hpp} | 41 +-
plugins/input/csv/csv_utils.hpp| 297 -
plugins/input/geojson/large_geojson_featureset.cpp |1 -
plugins/input/geojson/large_geojson_featureset.hpp |2 -
src/datasource_cache.cpp | 14 +-
src/image_util_jpeg.cpp|2 +-
test/standalone/csv_test.cpp | 1229 ++--
test/standalone/datasource_registration_test.cpp | 46 +
test/unit/svg/svg_parser_test.cpp |4 +-
test/visual/run.cpp|2 +
test/visual/runner.cpp | 52 +-
test/visual/runner.hpp | 11 +-
29 files changed, 1596 insertions(+), 1386 deletions(-)
create mode 100644 debian/libmapnik3.0.lintian-overrides
create mode 100644 include/mapnik/csv/csv_grammar.hpp
copy plugins/input/{geojson/large_geojson_featureset.cpp =
csv/csv_featureset.cpp} (58%)
copy plugins/input/{geojson/large_geojson_featureset.hpp =
csv/csv_featureset.hpp} (59%)
create mode 100644 plugins/input/csv/csv_inline_featureset.cpp
copy plugins/input/{geojson/large_geojson_featureset.hpp =
csv/csv_inline_featureset.hpp} (55%)
create mode 100644 test/standalone/datasource_registration_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
[python-mapnik] 01/01: Use upstream patch for boost library names fix.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository python-mapnik.
commit 10aab557e7b3cf1bfb09bba2b5b6472fa96ee246
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sun Aug 30 16:15:59 2015 +0200
Use upstream patch for boost library names fix.
---
debian/changelog | 6 +
debian/patches/link-boost.patch| 18 ---
debian/patches/series | 2 +-
.../patches/try-to-guess-boost-library-names.patch | 154 +
4 files changed, 161 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9f991b4..25b12a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-mapnik (1:0.0~20150817-da1d9dd-2) UNRELEASED; urgency=medium
+
+ * Use upstream patch for boost library names fix.
+
+ -- Bas Couwenberg sebas...@debian.org Sun, 30 Aug 2015 16:11:33 +0200
+
python-mapnik (1:0.0~20150817-da1d9dd-1) unstable; urgency=medium
* New upstream Git snapshot.
diff --git a/debian/patches/link-boost.patch b/debian/patches/link-boost.patch
deleted file mode 100644
index 7671c73..000
--- a/debian/patches/link-boost.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix boost library names.
-Author: Bas Couwenberg sebas...@debian.org
-
a/setup.py
-+++ b/setup.py
-@@ -48,9 +48,9 @@ else:
- mapnik_config = 'mapnik-config'
- mason_build = False
-
--boost_python_lib = os.environ.get(BOOST_PYTHON_LIB, 'boost_python-mt')
--boost_system_lib = os.environ.get(BOOST_SYSTEM_LIB, 'boost_system-mt')
--boost_thread_lib = os.environ.get(BOOST_THREAD_LIB, 'boost_thread-mt')
-+boost_python_lib = os.environ.get(BOOST_PYTHON_LIB, 'boost_python')
-+boost_system_lib = os.environ.get(BOOST_SYSTEM_LIB, 'boost_system')
-+boost_thread_lib = os.environ.get(BOOST_THREAD_LIB, 'boost_thread')
-
- try:
- linkflags = check_output([mapnik_config, '--libs']).split(' ')
diff --git a/debian/patches/series b/debian/patches/series
index 9df6f28..739e28c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-link-boost.patch
+try-to-guess-boost-library-names.patch
diff --git a/debian/patches/try-to-guess-boost-library-names.patch
b/debian/patches/try-to-guess-boost-library-names.patch
new file mode 100644
index 000..c66a3a5
--- /dev/null
+++ b/debian/patches/try-to-guess-boost-library-names.patch
@@ -0,0 +1,154 @@
+From 07c671f70e4fa16607e57510e38edc24559819f8 Mon Sep 17 00:00:00 2001
+From: Yohan Boniface y...@enix.org
+Date: Fri, 28 Aug 2015 13:10:51 +0200
+Subject: Try to guess boost library names (fix #12)
+Origin:
https://github.com/yohanboniface/python-mapnik/commit/07c671f70e4fa16607e57510e38edc24559819f8
+
+---
+ setup.py | 101 ++-
+ 1 file changed, 93 insertions(+), 8 deletions(-)
+
+--- a/setup.py
b/setup.py
+@@ -1,13 +1,15 @@
+ #! /usr/bin/env python
+
+ import os
++import os.path
++import platform
+ import re
+ import shutil
+ import subprocess
+ import sys
+ from distutils import sysconfig
+
+-from setuptools import Extension, setup
++from setuptools import Command, Extension, setup
+
+ PYTHON3 = sys.version_info[0] == 3
+
+@@ -21,6 +23,92 @@ def check_output(args):
+ return output.rstrip('\n')
+
+
++def clean_boost_name(name):
++name = name.split('.')[0]
++if name.startswith('lib'):
++name = name[3:]
++return name
++
++
++def find_boost_library(_dir, _id):
++if not os.path.exists(_dir):
++return
++for name in os.listdir(_dir):
++if _id in name:
++# Special case for boost_python, as it could contain python
version
++# number.
++if python in _id:
++if PYTHON3:
++if 3 not in name:
++continue
++else:
++if 3 in name:
++continue
++return clean_boost_name(name)
++
++
++def get_boost_library_names():
++# A few examples:
++# - Ubuntu 15.04 Multiarch or Debian sid:
++# /usr/lib/x86_64-linux-gnu/libboost_python.a - libboost_python-py27.a
++# /usr/lib/x86_64-linux-gnu/libboost_python-py27.a
++# /usr/lib/x86_64-linux-gnu/libboost_python-py34.a
++# /usr/lib/x86_64-linux-gnu/libboost_system.a
++# /usr/lib/x86_64-linux-gnu/libboost_thread.a
++# - Fedora 64 bits:
++# /usr/lib64/libboost_python.so
++# /usr/lib64/libboost_python3.so
++# /usr/lib64/libboost_system.so
++# /usr/lib64/libboost_thread.so
++# - OSX with homebrew
++# /usr/local/lib/libboost_thread-mt.a -
../Cellar/boost/1.57.0/lib/libboost_thread-mt.a # noqa
++# - Debian Wheezy
++# /usr/lib/libboost_python-py27.so
++# /usr/lib/libboost_python-mt-py27.so
++names = {
++boost_python: os.environ.get(BOOST_PYTHON_LIB),
++boost_system:
[python-mapnik] branch master updated (2ed0ec1 - 10aab55)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository python-mapnik. from 2ed0ec1 Set distribution to unstable. new 10aab55 Use upstream patch for boost library names fix. 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: debian/changelog | 6 + debian/patches/link-boost.patch| 18 --- debian/patches/series | 2 +- .../patches/try-to-guess-boost-library-names.patch | 154 + 4 files changed, 161 insertions(+), 19 deletions(-) delete mode 100644 debian/patches/link-boost.patch create mode 100644 debian/patches/try-to-guess-boost-library-names.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-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
tilecache 2.11+ds-1 MIGRATED to testing
FYI: The status of the tilecache source package in Debian's testing distribution has changed. Previous version: 2.11-2 Current version: 2.11+ds-1 -- This email is automatically generated once a day. As the installation of new packages into testing happens multiple times a day you will receive later changes on the next day. See https://release.debian.org/testing-watch/ for more information. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-mapnik] tag debian/0.0.20150817-da1d9dd-2 created (now f6a0867)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/0.0.20150817-da1d9dd-2 in repository python-mapnik. at f6a0867 (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/python-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
[python-mapnik] branch master updated (10aab55 - f6a0867)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository python-mapnik. from 10aab55 Use upstream patch for boost library names fix. new f6a0867 Set distribution to unstable. 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: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-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
[python-mapnik] 01/01: Set distribution to unstable.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-mapnik. commit f6a0867b1063dc4475e64051d129de600a2b827b Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Aug 30 18:36:58 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 25b12a3..4221423 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -python-mapnik (1:0.0~20150817-da1d9dd-2) UNRELEASED; urgency=medium +python-mapnik (1:0.0~20150817-da1d9dd-2) unstable; urgency=medium * Use upstream patch for boost library names fix. - -- Bas Couwenberg sebas...@debian.org Sun, 30 Aug 2015 16:11:33 +0200 + -- Bas Couwenberg sebas...@debian.org Sun, 30 Aug 2015 18:36:37 +0200 python-mapnik (1:0.0~20150817-da1d9dd-1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-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
sfcgal_1.1.0-4_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Fri, 28 Aug 2015 16:37:16 +0200 Source: sfcgal Binary: libsfcgal1 libsfcgal-dev sfcgal-bin Architecture: source amd64 Version: 1.1.0-4 Distribution: unstable Urgency: medium Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Changed-By: Sven Geggus sven-deb...@geggus.net Description: libsfcgal-dev - Library for ISO 19107:2013 and OGC SFA 1.2 for 3D operations (dev libsfcgal1 - Library for ISO 19107:2013 and OGC SFA 1.2 for 3D operations (run sfcgal-bin - Simple viewer for SFCGAL library Closes: 794317 Changes: sfcgal (1.1.0-4) unstable; urgency=medium . * re-enable tests which work fine without CMAKE_SKIP_RPATH * remove rpath during install using chrpath instead * skip style-test using patch from upstream * Remove Multi-Arch option on libsfcgal-dev and sfcgal-bin (Closes: #794317) Checksums-Sha1: 1cb8340576bc0b0018345365d3b74cf21b77da09 2162 sfcgal_1.1.0-4.dsc af43f7e38abeacef57ff23cca964b681c83afc82 132908 sfcgal_1.1.0-4.debian.tar.xz cd1f8950e9d2471dcf02de65ccd1beaa5dfde288 61682 libsfcgal-dev_1.1.0-4_amd64.deb 8401d9ef5d533ea75cd6872575b0c526adc87b23 1936766 libsfcgal1_1.1.0-4_amd64.deb 04a7f379621ef5036a19f8fcc6aa757b15be17e7 91968 sfcgal-bin_1.1.0-4_amd64.deb Checksums-Sha256: d2e6ce5578ddb2d4759f33179b3ba712d4646cd9e361036f7a22fd5fede79816 2162 sfcgal_1.1.0-4.dsc 301435584ee7a0765245946be797b419e2c8cabd4001f7e424f3e0a2adee8b05 132908 sfcgal_1.1.0-4.debian.tar.xz 80a012396e28e17bf1b08e868b07e676e96de03084f695c032cb9a8f951682fd 61682 libsfcgal-dev_1.1.0-4_amd64.deb bf6806d4970ff882e25b1a878db0538a3a75a65bc67a033409c1f3f48240149d 1936766 libsfcgal1_1.1.0-4_amd64.deb f79f6ad590f23b9c82030abab438b3cee18fb80b6c77d3ccc627ff36ca5043aa 91968 sfcgal-bin_1.1.0-4_amd64.deb Files: c6223bfada9b542727e1e4a83c170430 2162 science optional sfcgal_1.1.0-4.dsc a567415379b11879a4b1c44ca0a89535 132908 science optional sfcgal_1.1.0-4.debian.tar.xz d0fd8a6e9528892faa1e72ed20ef6444 61682 libdevel optional libsfcgal-dev_1.1.0-4_amd64.deb e87721f3ab96b077e24f5e7707513acf 1936766 libs optional libsfcgal1_1.1.0-4_amd64.deb b08eed7760821f1b75dcedec4d089d59 91968 science optional sfcgal-bin_1.1.0-4_amd64.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJV4wDUAAoJEGdQ8QrojUrxDLoP/joEEZlHb9groB5YfCTGosjC HahrDhxW1Z6vWkjSbWfhB9xBHqJ7r/AxzhPV1nTFvrY5/Bl2rj4QTZ/3dpTQ7pbV M1CZsWF83w0nWEUYr1eD4HLnDvCrhsy4InjsYewfZtQ45l5MdDnCss2lQosIlKzP 5h/Cl5yS9MOIZ4SI6yjcqP11HZsWL8ep17mP1NOO5aP/GiwmlNrdizJ0jxdeCpxj guXoajYP/XNakgH7+IlM3+9WPve6cf+LiulZx+ApPJ3nMNLT9BVRpcpL0xVTSKmX wb7eyEjpS++v/8ewU46k5Uil9Q4Wu975dTujO2h8h3zsdy6YHZtYElyXiyio8Gn9 uvfibxUMfi7YeHpA8r8crw8CHsZXEx4yD3M9FWd1y95e4iz9rjIirdwg9xN5gcbD t529Xd0fC5+6CfO3O1EE2R2eivt0RkscWQNAdHpdk+nEvF5693n+YTa+VJFfwQYM yEV2rjR7Oz+tW1eKRGa8zmYQuO/Vvp7G5FJ/1hadbQoCSC3KWOwJZ2nSUcqTOB8d T+F6gYPGk4jZF7p03pRPcdvvtkMDWOyHLCIpStkqZJj7OzPIvVJVA09lIcRUgftH 8epImQhh2BX94J8L5NW+uNwumsV6B4lybyzoXBD5KicDrM1aVF7cPfDxsV9X/WDN /XraVuPaA7da1/b1mvZP =ao13 -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
Processing of grass_7.0.1-2_mipsel.changes
grass_7.0.1-2_mipsel.changes uploaded successfully to localhost along with the files: grass-core_7.0.1-2_mipsel.deb grass-dev_7.0.1-2_mipsel.deb grass-gui_7.0.1-2_mipsel.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
[sfcgal] tag debian/1.1.0-4 created (now 6dc073e)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/1.1.0-4 in repository sfcgal. at 6dc073e (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/sfcgal.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-carto] 06/09: Merge tag 'upstream/2.34.0'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository openstreetmap-carto. commit eb799fece176be04570ba2e7cea9e26f3419ba2a Merge: c281a14 f360d66 Author: Bas Couwenberg sebas...@xs4all.nl 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| 14 +
[openstreetmap-carto] 08/09: Align paths in install file.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository openstreetmap-carto. commit 43153f234f923fbf8b2a10bfd59469bf146e22c3 Author: Bas Couwenberg sebas...@xs4all.nl 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/openstreetmap-carto.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-carto] 03/05: pristine-tar data for openstreetmap-carto_2.32.0.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository openstreetmap-carto. commit efa188cfc486edf8fee2135667886760caf3597f Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Aug 30 16:57:01 2015 +0200 pristine-tar data for openstreetmap-carto_2.32.0.orig.tar.gz --- openstreetmap-carto_2.32.0.orig.tar.gz.delta | Bin 0 - 10718 bytes openstreetmap-carto_2.32.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/openstreetmap-carto_2.32.0.orig.tar.gz.delta b/openstreetmap-carto_2.32.0.orig.tar.gz.delta new file mode 100644 index 000..a839246 Binary files /dev/null and b/openstreetmap-carto_2.32.0.orig.tar.gz.delta differ diff --git a/openstreetmap-carto_2.32.0.orig.tar.gz.id b/openstreetmap-carto_2.32.0.orig.tar.gz.id new file mode 100644 index 000..6256f10 --- /dev/null +++ b/openstreetmap-carto_2.32.0.orig.tar.gz.id @@ -0,0 +1 @@ +4d7481dedfa9de2047a3af13be661199a0fe495a -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-carto] 05/09: Imported Upstream version 2.34.0
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository openstreetmap-carto.
commit f360d667736f30853232ddfa6d898d4314e9a02a
Author: Bas Couwenberg sebas...@xs4all.nl
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 = 'amenity_veterinary'] {
[openstreetmap-carto] 09/09: Enable parallel builds.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository openstreetmap-carto. commit a54f0612324ca54a70dd85f2012e36a270443965 Author: Bas Couwenberg sebas...@xs4all.nl 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 sebas...@debian.org 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/openstreetmap-carto.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-carto] 01/09: Imported Upstream version 2.30.0
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository openstreetmap-carto. commit 4b82da9617fb9a00682613eceefd6f6fa5c1b4b5 Author: Bas Couwenberg sebas...@xs4all.nl 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: darken(#aea397, 20%);
[openstreetmap-carto] 04/05: pristine-tar data for openstreetmap-carto_2.33.0.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository openstreetmap-carto. commit c96360cd56d15b0d214ceb2879cff085d8db8592 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Aug 30 16:57:03 2015 +0200 pristine-tar data for openstreetmap-carto_2.33.0.orig.tar.gz --- openstreetmap-carto_2.33.0.orig.tar.gz.delta | Bin 0 - 10993 bytes openstreetmap-carto_2.33.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/openstreetmap-carto_2.33.0.orig.tar.gz.delta b/openstreetmap-carto_2.33.0.orig.tar.gz.delta new file mode 100644 index 000..0ce0a05 Binary files /dev/null and b/openstreetmap-carto_2.33.0.orig.tar.gz.delta differ diff --git a/openstreetmap-carto_2.33.0.orig.tar.gz.id b/openstreetmap-carto_2.33.0.orig.tar.gz.id new file mode 100644 index 000..fbd1a1d --- /dev/null +++ b/openstreetmap-carto_2.33.0.orig.tar.gz.id @@ -0,0 +1 @@ +460684c8d1bad728d9d7950678d04023f63d0cd9 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-carto] 04/09: Imported Upstream version 2.33.0
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository openstreetmap-carto.
commit 88de0f2fa8bb5458de40d6dfebe59967bec80461
Author: Bas Couwenberg sebas...@xs4all.nl
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 $UNZIP_OPTS
[openstreetmap-carto] 02/09: Imported Upstream version 2.31.0
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository openstreetmap-carto.
commit 18fcbfc24ae8945c893e6126132511c4a89c202b
Author: Bas Couwenberg sebas...@xs4all.nl
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: @amenity-brown;
[openstreetmap-carto] 01/05: pristine-tar data for openstreetmap-carto_2.30.0.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository openstreetmap-carto. commit c58813a0d039d17f2b08103ccfc5971a6ebe761a Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Aug 30 16:56:58 2015 +0200 pristine-tar data for openstreetmap-carto_2.30.0.orig.tar.gz --- openstreetmap-carto_2.30.0.orig.tar.gz.delta | Bin 0 - 10418 bytes openstreetmap-carto_2.30.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/openstreetmap-carto_2.30.0.orig.tar.gz.delta b/openstreetmap-carto_2.30.0.orig.tar.gz.delta new file mode 100644 index 000..7e6cf9f Binary files /dev/null and b/openstreetmap-carto_2.30.0.orig.tar.gz.delta differ diff --git a/openstreetmap-carto_2.30.0.orig.tar.gz.id b/openstreetmap-carto_2.30.0.orig.tar.gz.id new file mode 100644 index 000..dca959d --- /dev/null +++ b/openstreetmap-carto_2.30.0.orig.tar.gz.id @@ -0,0 +1 @@ +704977109bb7657f12659c9da7dd4236eeb62923 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-carto] branch master updated (c281a14 - a54f061)
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch master
in repository openstreetmap-carto.
from 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.
The 9 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:
.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 -
debian/changelog | 6 +-
debian/install | 6 +-
debian/rules | 2 +-
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/{florist.16.svg = bench.16.svg} | 4 +-
symbols/{florist.16.svg = beverages-14.svg} | 37 +-
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/{florist.16.svg = car_parts-14.svg} | 16 +-
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/{florist.16.svg = courthouse-16.svg}| 6 +-
symbols/{florist.16.svg = elevator-12.svg} | 20 +-
symbols/emergency_phone.16.svg | 14 +
symbols/{florist.16.svg = entrance.10.svg} | 12 +-
symbols/forest.png | Bin 190 - 17339 bytes
symbols/{florist.16.svg = garden_centre-14.svg} | 16 +-
symbols/{florist.16.svg = greengrocer-14.svg} | 12 +-
symbols/hifi-14.svg | 38 ++
symbols/{florist.16.svg = hostel.16.svg}| 4 +-
symbols/hostel.p.20.png | Bin 597 - 0 bytes
symbols/{florist.16.svg = hotel.16.svg} | 4 +-
symbols/hotel2.p.20.png | Bin 368 - 0 bytes
symbols/{florist.16.svg = hunting-stand.16.svg} | 6 +-
symbols/{florist.16.svg = ice-cream-14.svg} | 12 +-
symbols/{florist.16.svg = laundry-14.svg} | 21 +-
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/{florist.16.svg = newsagent-14.svg} | 20 +-
symbols/orchard.png | Bin 134 - 94 bytes
symbols/perfumery-14.svg | 31 +
symbols/photo-14.svg | 31 +
symbols/{florist.16.svg = post_box-12.svg} | 13 +-
symbols/post_box.p.16.png
[openstreetmap-carto] 03/09: Imported Upstream version 2.32.0
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository openstreetmap-carto.
commit c6ba36fc0e7dca77116ca0c6a2d74a5c7427267d
Author: Bas Couwenberg sebas...@xs4all.nl
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: round;
+
[openstreetmap-carto] annotated tag upstream/2.34.0 created (now 89e7553)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/2.34.0 in repository openstreetmap-carto. at 89e7553 (tag) tagging f360d667736f30853232ddfa6d898d4314e9a02a (commit) replaces upstream/2.33.0 tagged by Bas Couwenberg on Sun Aug 30 16:57:16 2015 +0200 - Log - Upstream version 2.34.0 Bas Couwenberg (1): Imported Upstream version 2.34.0 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-carto] annotated tag upstream/2.32.0 created (now 9df5fa2)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/2.32.0 in repository openstreetmap-carto. at 9df5fa2 (tag) tagging c6ba36fc0e7dca77116ca0c6a2d74a5c7427267d (commit) replaces upstream/2.31.0 tagged by Bas Couwenberg on Sun Aug 30 16:57:01 2015 +0200 - Log - Upstream version 2.32.0 Bas Couwenberg (1): Imported Upstream version 2.32.0 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-carto] annotated tag upstream/2.30.0 created (now facfe78)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/2.30.0 in repository openstreetmap-carto. at facfe78 (tag) tagging 4b82da9617fb9a00682613eceefd6f6fa5c1b4b5 (commit) replaces upstream/2.29.1 tagged by Bas Couwenberg on Sun Aug 30 16:56:58 2015 +0200 - Log - Upstream version 2.30.0 Bas Couwenberg (1): Imported Upstream version 2.30.0 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-carto] 05/05: pristine-tar data for openstreetmap-carto_2.34.0.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository openstreetmap-carto. commit 655bd12443844428d0243ae41cba86fba33785ca Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Aug 30 16:57:16 2015 +0200 pristine-tar data for openstreetmap-carto_2.34.0.orig.tar.gz --- openstreetmap-carto_2.34.0.orig.tar.gz.delta | Bin 0 - 10688 bytes openstreetmap-carto_2.34.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/openstreetmap-carto_2.34.0.orig.tar.gz.delta b/openstreetmap-carto_2.34.0.orig.tar.gz.delta new file mode 100644 index 000..82ec59a Binary files /dev/null and b/openstreetmap-carto_2.34.0.orig.tar.gz.delta differ diff --git a/openstreetmap-carto_2.34.0.orig.tar.gz.id b/openstreetmap-carto_2.34.0.orig.tar.gz.id new file mode 100644 index 000..1f46e1d --- /dev/null +++ b/openstreetmap-carto_2.34.0.orig.tar.gz.id @@ -0,0 +1 @@ +e073b3b11073fe699be4908bbee014dc0fb17148 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-carto] annotated tag upstream/2.33.0 created (now f45cf7f)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/2.33.0 in repository openstreetmap-carto. at f45cf7f (tag) tagging 88de0f2fa8bb5458de40d6dfebe59967bec80461 (commit) replaces upstream/2.32.0 tagged by Bas Couwenberg on Sun Aug 30 16:57:03 2015 +0200 - Log - Upstream version 2.33.0 Bas Couwenberg (1): Imported Upstream version 2.33.0 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-carto] 07/09: New upstream release.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository openstreetmap-carto. commit cae4918db88aba9112d0f3ae3a023f2eb302f97e Author: Bas Couwenberg sebas...@xs4all.nl 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 sebas...@debian.org Sat, 01 Aug 2015 13:04:21 +0200 + -- Bas Couwenberg sebas...@debian.org 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/openstreetmap-carto.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-carto] branch upstream updated (d0d3b71 - f360d66)
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch upstream
in repository openstreetmap-carto.
from d0d3b71 Imported Upstream version 2.29.1
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
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:
.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/{florist.16.svg = bench.16.svg} | 4 +-
symbols/{florist.16.svg = beverages-14.svg} | 37 +-
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/{florist.16.svg = car_parts-14.svg} | 16 +-
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/{florist.16.svg = courthouse-16.svg}| 6 +-
symbols/{florist.16.svg = elevator-12.svg} | 20 +-
symbols/emergency_phone.16.svg | 14 +
symbols/{florist.16.svg = entrance.10.svg} | 12 +-
symbols/forest.png | Bin 190 - 17339 bytes
symbols/{florist.16.svg = garden_centre-14.svg} | 16 +-
symbols/{florist.16.svg = greengrocer-14.svg} | 12 +-
symbols/hifi-14.svg | 38 ++
symbols/{florist.16.svg = hostel.16.svg}| 4 +-
symbols/hostel.p.20.png | Bin 597 - 0 bytes
symbols/{florist.16.svg = hotel.16.svg} | 4 +-
symbols/hotel2.p.20.png | Bin 368 - 0 bytes
symbols/{florist.16.svg = hunting-stand.16.svg} | 6 +-
symbols/{florist.16.svg = ice-cream-14.svg} | 12 +-
symbols/{florist.16.svg = laundry-14.svg} | 21 +-
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/{florist.16.svg = newsagent-14.svg} | 20 +-
symbols/orchard.png | Bin 134 - 94 bytes
symbols/perfumery-14.svg | 31 +
symbols/photo-14.svg | 31 +
symbols/{florist.16.svg = post_box-12.svg} | 13 +-
symbols/post_box.p.16.png| Bin 367 - 0 bytes
symbols/{florist.16.svg = post_office-14.svg} | 12 +-
symbols/post_office.p.16.png | Bin 494 - 0 bytes
symbols/{florist.16.svg = power_wind-16.svg}| 4 +-
symbols/power_wind.png | Bin 638 - 0 bytes
symbols/quarry.png |
[openstreetmap-carto] branch pristine-tar updated (e0fcefc - 655bd12)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository openstreetmap-carto. from e0fcefc pristine-tar data for openstreetmap-carto_2.29.1.orig.tar.gz new c58813a pristine-tar data for openstreetmap-carto_2.30.0.orig.tar.gz new 9da2f41 pristine-tar data for openstreetmap-carto_2.31.0.orig.tar.gz new efa188c pristine-tar data for openstreetmap-carto_2.32.0.orig.tar.gz new c96360c pristine-tar data for openstreetmap-carto_2.33.0.orig.tar.gz new 655bd12 pristine-tar data for openstreetmap-carto_2.34.0.orig.tar.gz 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: openstreetmap-carto_2.30.0.orig.tar.gz.delta | Bin 0 - 10418 bytes openstreetmap-carto_2.30.0.orig.tar.gz.id| 1 + openstreetmap-carto_2.31.0.orig.tar.gz.delta | Bin 0 - 10799 bytes openstreetmap-carto_2.31.0.orig.tar.gz.id| 1 + openstreetmap-carto_2.32.0.orig.tar.gz.delta | Bin 0 - 10718 bytes openstreetmap-carto_2.32.0.orig.tar.gz.id| 1 + openstreetmap-carto_2.33.0.orig.tar.gz.delta | Bin 0 - 10993 bytes openstreetmap-carto_2.33.0.orig.tar.gz.id| 1 + openstreetmap-carto_2.34.0.orig.tar.gz.delta | Bin 0 - 10688 bytes openstreetmap-carto_2.34.0.orig.tar.gz.id| 1 + 10 files changed, 5 insertions(+) create mode 100644 openstreetmap-carto_2.30.0.orig.tar.gz.delta create mode 100644 openstreetmap-carto_2.30.0.orig.tar.gz.id create mode 100644 openstreetmap-carto_2.31.0.orig.tar.gz.delta create mode 100644 openstreetmap-carto_2.31.0.orig.tar.gz.id create mode 100644 openstreetmap-carto_2.32.0.orig.tar.gz.delta create mode 100644 openstreetmap-carto_2.32.0.orig.tar.gz.id create mode 100644 openstreetmap-carto_2.33.0.orig.tar.gz.delta create mode 100644 openstreetmap-carto_2.33.0.orig.tar.gz.id create mode 100644 openstreetmap-carto_2.34.0.orig.tar.gz.delta create mode 100644 openstreetmap-carto_2.34.0.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-carto] 02/05: pristine-tar data for openstreetmap-carto_2.31.0.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository openstreetmap-carto. commit 9da2f4115898a64de2dd35a08df8994dc3886fd5 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Aug 30 16:57:00 2015 +0200 pristine-tar data for openstreetmap-carto_2.31.0.orig.tar.gz --- openstreetmap-carto_2.31.0.orig.tar.gz.delta | Bin 0 - 10799 bytes openstreetmap-carto_2.31.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/openstreetmap-carto_2.31.0.orig.tar.gz.delta b/openstreetmap-carto_2.31.0.orig.tar.gz.delta new file mode 100644 index 000..20df827 Binary files /dev/null and b/openstreetmap-carto_2.31.0.orig.tar.gz.delta differ diff --git a/openstreetmap-carto_2.31.0.orig.tar.gz.id b/openstreetmap-carto_2.31.0.orig.tar.gz.id new file mode 100644 index 000..9640aeb --- /dev/null +++ b/openstreetmap-carto_2.31.0.orig.tar.gz.id @@ -0,0 +1 @@ +7608628d2b7ad0f8e39ccc684bc5b7a0685ef3bf -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[openstreetmap-carto] annotated tag upstream/2.31.0 created (now 162f227)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/2.31.0 in repository openstreetmap-carto. at 162f227 (tag) tagging 18fcbfc24ae8945c893e6126132511c4a89c202b (commit) replaces upstream/2.30.0 tagged by Bas Couwenberg on Sun Aug 30 16:57:00 2015 +0200 - Log - Upstream version 2.31.0 Bas Couwenberg (1): Imported Upstream version 2.31.0 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.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#797401: RM: librasterlite -- ROM; Deprecated upstream, superseded by librasterlite2
Package: ftp.debian.org Severity: normal Please remove the librasterlite package from the archive, it has been deprecated upstream and is superseded by librasterlite2. librasterlite was primarily required for spatialite-gui which now uses librasterlite2 instead of librasterlite libgaiagraphics. mapnik also used librasterlite, but has removed the support in 3.0.1. Only the old mapnik packages on hurd-i386 still depend on librasterlite. Kind Regards, Bas ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[osmcoastline] tag debian/2.1.0-2 created (now 603dcca)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/2.1.0-2 in repository osmcoastline. at 603dcca (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/osmcoastline.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
[osmcoastline] 02/02: Set distribution to unstable.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmcoastline. commit 603dcca0de98f3d8f16245f6b30846a73448ea58 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Aug 30 16:00:39 2015 +0200 Set distribution to unstable. --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1c1f22f..9799b58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -osmcoastline (2.1.0-2) UNRELEASED; urgency=medium +osmcoastline (2.1.0-2) unstable; urgency=medium * Update Vcs-Browser URL to use HTTPS. + * Rebuild for geos transition. - -- Bas Couwenberg sebas...@debian.org Sun, 30 Aug 2015 15:58:11 +0200 + -- Bas Couwenberg sebas...@debian.org Sun, 30 Aug 2015 16:00:19 +0200 osmcoastline (2.1.0-1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmcoastline.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[gis] branch master updated (3f8a3b6 - 06195c8)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository gis. from 3f8a3b6 Update devel task, sort packages rename to match current sid. new 06195c8 Drop librasterlite-dev from devel task. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: tasks/devel | 1 - 1 file changed, 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/blends/projects/gis.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[gis] 01/01: Drop librasterlite-dev from devel task.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository gis. commit 06195c8266eaa626c7907f8bdd9d981aa0200aaa Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Aug 30 14:17:42 2015 +0200 Drop librasterlite-dev from devel task. --- tasks/devel | 1 - 1 file changed, 1 deletion(-) diff --git a/tasks/devel b/tasks/devel index cf77a84..77ea0e9 100644 --- a/tasks/devel +++ b/tasks/devel @@ -26,7 +26,6 @@ Depends: grass-dev, \ liblas-c-dev, \ liblaszip-dev, \ liblwgeom-dev, \ - librasterlite-dev, \ librasterlite2-dev, \ libterralib-dev, \ libmapnik-dev, \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/blends/projects/gis.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
osmcoastline_2.1.0-2_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Sun, 30 Aug 2015 16:00:19 +0200 Source: osmcoastline Binary: osmcoastline Architecture: source amd64 Version: 2.1.0-2 Distribution: unstable Urgency: medium Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Changed-By: Bas Couwenberg sebas...@debian.org Description: osmcoastline - Extract coastline data from OpenStreetMap planet file Changes: osmcoastline (2.1.0-2) unstable; urgency=medium . * Update Vcs-Browser URL to use HTTPS. * Rebuild for geos transition. Checksums-Sha1: ee0f8afa30790f3894e7a25cd3cc14baa3589743 2070 osmcoastline_2.1.0-2.dsc 4aa1a07704c87323bce41fb8fb5281c0027bfaf5 3048 osmcoastline_2.1.0-2.debian.tar.xz c0fb7d5b913fe7b38161566340b5d626de8f74bc 208320 osmcoastline_2.1.0-2_amd64.deb Checksums-Sha256: 742eb1be05e2dfcfae9d5000d075b8b77ed5430466a821b96b777145e457ce27 2070 osmcoastline_2.1.0-2.dsc 02bc67a8665becd00f288fa69eb480e9ea530d8eac84cd0383a2dd3991c77370 3048 osmcoastline_2.1.0-2.debian.tar.xz a0047e3cce772a1d3d9cf2844fa6c5c9be4d7fd4f966970949f2a72317773262 208320 osmcoastline_2.1.0-2_amd64.deb Files: 424fd4af1aa7927bd05f1679579297b3 2070 science optional osmcoastline_2.1.0-2.dsc 769fba2dc29bffcec473c37d6c06a1b7 3048 science optional osmcoastline_2.1.0-2.debian.tar.xz 9022e69c9eb21a3ffeeda2724b043d65 208320 utils optional osmcoastline_2.1.0-2_amd64.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJV4w4dAAoJEGdQ8QrojUrxVfUQAKAySdouMD+6rZTon5FRnAYf GN4GNWWTEksG8IYZ8Sus4N4Sc/3qI2cquQjpzqfk0tJrHr+N1C2iywLs6U2/a0hI 9bLOEQPel84PsHAd6CmCdnErEDKXJk9FMZWFtPGT8ag584gdk8oyjleoVcerBxnv o5B2ryxLGT7sV7CwJhoUJct7g8fIgAjOrRNYya5GadNBimMMiunZ6ymL0EPV8K/x diHA7KHAdN5B/d9ClxoXRvVFFKbt6oeFrFaNIN6Cm0PydkHc4gmRvs0ysqiUQ8yZ AvCXooSlEJNNaPeJU8Dv/slho0Lg115LKVPG+m85piY5hR+90C5gmRp1yIArsXU3 hdGT5uYLO1+J0lBc3Hbr3Ju7URrPtHPSi/OpWowO4eaiQ+JsotIh/AA4CGDjLUqU 5P4erhxINphhX7WD7oqdZiBb6lX6aegsTqFzUJCgJuUGb518Y5LJgUQcdDgbsoNo BFwFkZZDP3DYn1/oUzgTIgKpw54VOWaF3hLXF9KvPOrMtNwhooRgFsJmRmvsqClN MRwU5smvHEHQaEZZKUfUgFmPLj4ZHvRXIvU0/WLdSin6ZN4JQfHVI5d55O9piwLG pl26E1ud7cDPED3CkZt036nkWtYOhLcDhlNOuvauGLuLP3mohIqxz/tTnh86y0Or uYHAb6Djsa4efLkhjGsu =/yFj -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
debian-gis 0.0.5 MIGRATED to testing
FYI: The status of the debian-gis source package in Debian's testing distribution has changed. Previous version: 0.0.4 Current version: 0.0.5 -- This email is automatically generated once a day. As the installation of new packages into testing happens multiple times a day you will receive later changes on the next day. See https://release.debian.org/testing-watch/ for more information. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
python-mapnik_0.0~20150817-da1d9dd-2_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Sun, 30 Aug 2015 18:36:37 +0200 Source: python-mapnik Binary: python-mapnik python3-mapnik Architecture: source amd64 Version: 1:0.0~20150817-da1d9dd-2 Distribution: unstable Urgency: medium Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Changed-By: Bas Couwenberg sebas...@debian.org Description: python-mapnik - Python 2 interface to the mapnik library python3-mapnik - Python 3 interface to the mapnik library Changes: python-mapnik (1:0.0~20150817-da1d9dd-2) unstable; urgency=medium . * Use upstream patch for boost library names fix. Checksums-Sha1: d090c1a79721bdbf89350c094fdc9953190c1475 2287 python-mapnik_0.0~20150817-da1d9dd-2.dsc d5d30cc57a54c997eab15027bb5f3c113d947dcb 4676 python-mapnik_0.0~20150817-da1d9dd-2.debian.tar.xz 927271b279c1b2864523f4e056266ed585d72a6b 830266 python-mapnik_0.0~20150817-da1d9dd-2_amd64.deb c0b37d9a398788806469d8d433997b5ae1ee5aee 828274 python3-mapnik_0.0~20150817-da1d9dd-2_amd64.deb Checksums-Sha256: 294fe7ec67b14485f1c34aa74dc9e4d22c5801a95fd258cc00a0df2b5a16e9c5 2287 python-mapnik_0.0~20150817-da1d9dd-2.dsc 871fd7c4ae1e22e815b19c01c769b3a68b190902a3ca635862b498e812a317a0 4676 python-mapnik_0.0~20150817-da1d9dd-2.debian.tar.xz f1fbb9a7573342a7f4190cd4e62790dd70de78eb9eea055942a649a58aa88b4d 830266 python-mapnik_0.0~20150817-da1d9dd-2_amd64.deb b5ab740942e7383bbce4014d1c8e48a5e9e0487d3e4356adf10419ae5018c655 828274 python3-mapnik_0.0~20150817-da1d9dd-2_amd64.deb Files: bcc55b50faeef917ab92b5e12e37bdeb 2287 python optional python-mapnik_0.0~20150817-da1d9dd-2.dsc 169666421b176b0a38f8ba4286a6e06d 4676 python optional python-mapnik_0.0~20150817-da1d9dd-2.debian.tar.xz 085fa5da9292f82aef65ada867f83c0a 830266 python optional python-mapnik_0.0~20150817-da1d9dd-2_amd64.deb 824f0753db7adb287b691ca2e4182cb3 828274 python optional python3-mapnik_0.0~20150817-da1d9dd-2_amd64.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJV4za6AAoJEGdQ8QrojUrxgD4QAJNKhEFCP3qv/PHympFX1evF juQQd3YjnCzY/s6y0oJLRnKKJrijdzbcuqJe4aIGi759qtLOROkQMQtTYY6QQzPW jPmKHyudSxUe/tGLHLR3MDw+7A2VOETgyf+kL8UhXfCYyZEFzd3xKGet49iFCDsR pEomy6AgHOgImg/s0xZl/CUSrQ7koDlHPiLjyBX4KXL6TQezNKaPSOTVcyd6VRSu o4DSN2YbQ1bcO+MrSEHwSKVGvDvTdY2T31hrNA4nJtPEPgh7Yo7DL2GDvEtMqHp/ exL0SMfDp9yYx8TYCyU/361JL9OtR84hr6lmwHs78lgVRmZssbQHuTqo8nNpkr5x MQEpzqla6TWdilPoB3JGJO4LwN4LKvw+/kEoYkxn4phzFQBZtVrGPGDimhvuFvoI oW4xXuOziwOyiU0t9FYasqL6gbq/blGaklIYul9SnWarBlOJmWd5pZ6U5Swcsc/f D0BvR7nEa31Z9xX+imANrwWywkkHpxw8aB3K6KIBHAig/KhO7QiIKOEm8dt0ePAz N4ybdCSt9yxvy5Ok58QU+jMrlkNMk6ZKVVUzEDRfLphs/SECqaaPSG9rus9l3ZS6 fK+IsRDxBBnVvmHN9ASWOctxiI3s3rHK4Xbm2W2ohWAxXX6I+M897/VfWUQar42c /TTOSEbpqXmv/gh12UnS =839H -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
[osmcoastline] branch master updated (af0f9ef - 603dcca)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository osmcoastline. from af0f9ef Set distribution to unstable. new fa11a4f Update Vcs-Browser URL to use HTTPS. new 603dcca Set distribution to unstable. The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 7 +++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmcoastline.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
[osmcoastline] 01/02: Update Vcs-Browser URL to use HTTPS.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmcoastline. commit fa11a4fd207d625fc31ba97d7f5bc2afa4efef6a Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Aug 30 15:58:20 2015 +0200 Update Vcs-Browser URL to use HTTPS. --- debian/changelog | 6 ++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1c0fbd1..1c1f22f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmcoastline (2.1.0-2) UNRELEASED; urgency=medium + + * Update Vcs-Browser URL to use HTTPS. + + -- Bas Couwenberg sebas...@debian.org Sun, 30 Aug 2015 15:58:11 +0200 + osmcoastline (2.1.0-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 6e6f244..7e4b220 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: debhelper (= 9), sqlite3, zlib1g-dev Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/osmcoastline.git/ +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osmcoastline.git/ Vcs-Git: git://anonscm.debian.org/pkg-grass/osmcoastline.git Homepage: http://osmcode.org/osmcoastline/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmcoastline.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.4+ds.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository mapnik. commit 53c2e77e980f7cb8d0608f5aec40b4bf3565643e Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Aug 30 13:38:04 2015 +0200 pristine-tar data for mapnik_3.0.4+ds.orig.tar.gz --- mapnik_3.0.4+ds.orig.tar.gz.delta | Bin 0 - 3500145 bytes mapnik_3.0.4+ds.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/mapnik_3.0.4+ds.orig.tar.gz.delta b/mapnik_3.0.4+ds.orig.tar.gz.delta new file mode 100644 index 000..141b34c Binary files /dev/null and b/mapnik_3.0.4+ds.orig.tar.gz.delta differ diff --git a/mapnik_3.0.4+ds.orig.tar.gz.id b/mapnik_3.0.4+ds.orig.tar.gz.id new file mode 100644 index 000..26fd1a7 --- /dev/null +++ b/mapnik_3.0.4+ds.orig.tar.gz.id @@ -0,0 +1 @@ +c97da29551c5686151b8a1844a16ac813c3a -- 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/05: Add lintian override for hardening-no-fortify-functions.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapnik. commit 7c0d1d2a2900cc764fae71623c7dc155cc7459c8 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Aug 30 15:23:42 2015 +0200 Add lintian override for hardening-no-fortify-functions. --- debian/libmapnik3.0.lintian-overrides | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/libmapnik3.0.lintian-overrides b/debian/libmapnik3.0.lintian-overrides new file mode 100644 index 000..b230dea --- /dev/null +++ b/debian/libmapnik3.0.lintian-overrides @@ -0,0 +1,6 @@ +# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports: +# Fortify Source functions: no, only unprotected functions found! +# unprotected: memmove +# unprotected: memcpy +libmapnik3.0: hardening-no-fortify-functions usr/lib/mapnik/*/input/*.input + -- 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 upstream updated (a8ab0b3 - 2108614)
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch upstream
in repository mapnik.
from a8ab0b3 Imported Upstream version 3.0.3+ds
new 2108614 Imported Upstream version 3.0.4+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| 12 +-
CHANGELOG.md | 54 +-
benchmark/test_polygon_clipping.cpp| 20 +-
include/build.py |1 +
include/mapnik/csv/csv_grammar.hpp | 103 ++
include/mapnik/datasource_cache.hpp|6 +
include/mapnik/marker_helpers.hpp |1 -
include/mapnik/value.hpp |6 +
include/mapnik/version.hpp |2 +-
plugins/input/csv/build.py |2 +
plugins/input/csv/csv_datasource.cpp | 838 -
plugins/input/csv/csv_datasource.hpp | 43 +-
.../csv_featureset.cpp}| 62 +-
.../csv_featureset.hpp}| 40 +-
plugins/input/csv/csv_inline_featureset.cpp| 78 ++
.../csv_inline_featureset.hpp} | 41 +-
plugins/input/csv/csv_utils.hpp| 297 -
plugins/input/geojson/large_geojson_featureset.cpp |1 -
plugins/input/geojson/large_geojson_featureset.hpp |2 -
src/datasource_cache.cpp | 14 +-
src/image_util_jpeg.cpp|2 +-
test/standalone/csv_test.cpp | 1229 ++--
test/standalone/datasource_registration_test.cpp | 46 +
test/unit/svg/svg_parser_test.cpp |4 +-
test/visual/run.cpp|2 +
test/visual/runner.cpp | 52 +-
test/visual/runner.hpp | 11 +-
27 files changed, 1583 insertions(+), 1386 deletions(-)
create mode 100644 include/mapnik/csv/csv_grammar.hpp
copy plugins/input/{geojson/large_geojson_featureset.cpp =
csv/csv_featureset.cpp} (58%)
copy plugins/input/{geojson/large_geojson_featureset.hpp =
csv/csv_featureset.hpp} (59%)
create mode 100644 plugins/input/csv/csv_inline_featureset.cpp
copy plugins/input/{geojson/large_geojson_featureset.hpp =
csv/csv_inline_featureset.hpp} (55%)
create mode 100644 test/standalone/datasource_registration_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] branch pristine-tar updated (5892b5b - 53c2e77)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository mapnik. from 5892b5b pristine-tar data for mapnik_3.0.3+ds.orig.tar.gz new 53c2e77 pristine-tar data for mapnik_3.0.4+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.4+ds.orig.tar.gz.delta | Bin 0 - 3500145 bytes mapnik_3.0.4+ds.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 mapnik_3.0.4+ds.orig.tar.gz.delta create mode 100644 mapnik_3.0.4+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] 03/05: New upstream release.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapnik. commit 3c656dc77646e6f7b4168086003e6f2942d79089 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Aug 30 13:39:46 2015 +0200 New upstream release. --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 111a6d3..c100c0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mapnik (3.0.4+ds-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Bas Couwenberg sebas...@debian.org Sun, 30 Aug 2015 13:39:42 +0200 + mapnik (3.0.3+ds-1) unstable; urgency=medium * Team upload. -- 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
Processing of mapnik_3.0.4+ds-1_amd64.changes
mapnik_3.0.4+ds-1_amd64.changes uploaded successfully to localhost along with the files: mapnik_3.0.4+ds-1.dsc mapnik_3.0.4+ds.orig.tar.gz mapnik_3.0.4+ds-1.debian.tar.xz libmapnik-dev_3.0.4+ds-1_amd64.deb libmapnik2-dev_3.0.4+ds-1_all.deb libmapnik3.0_3.0.4+ds-1_amd64.deb mapnik-doc_3.0.4+ds-1_all.deb mapnik-utils_3.0.4+ds-1_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
[mapnik] tag debian/3.0.4+ds-1 created (now 21f06ce)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/3.0.4+ds-1 in repository mapnik. at 21f06ce (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/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.4+ds created (now bf1ec14)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/3.0.4+ds in repository mapnik. at bf1ec14 (tag) tagging 2108614bff665e12a28d47ca68d21b7263f07396 (commit) replaces upstream/3.0.3+ds tagged by Bas Couwenberg on Sun Aug 30 13:38:04 2015 +0200 - Log - Upstream version 3.0.4+ds Bas Couwenberg (1): Imported Upstream version 3.0.4+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
[mapnik] 05/05: Set distribution to unstable.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapnik. commit 21f06ce8bd8c1865fa3565829f86f2b503f1d271 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Aug 30 13:41:36 2015 +0200 Set distribution to unstable. --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c100c0b..f721f39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -mapnik (3.0.4+ds-1) UNRELEASED; urgency=medium +mapnik (3.0.4+ds-1) unstable; urgency=medium + * Team upload. * New upstream release. - -- Bas Couwenberg sebas...@debian.org Sun, 30 Aug 2015 13:39:42 +0200 + -- Bas Couwenberg sebas...@debian.org Sun, 30 Aug 2015 13:40:37 +0200 mapnik (3.0.3+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] 02/05: Merge tag 'upstream/3.0.4+ds'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapnik. commit a248d4f2a539170cc0c6c6cb6f4df50909b86192 Merge: cf91821 2108614 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Aug 30 13:38:04 2015 +0200 Merge tag 'upstream/3.0.4+ds' Upstream version 3.0.4+ds .travis.yml| 12 +- CHANGELOG.md | 54 +- benchmark/test_polygon_clipping.cpp| 20 +- include/build.py |1 + include/mapnik/csv/csv_grammar.hpp | 103 ++ include/mapnik/datasource_cache.hpp|6 + include/mapnik/marker_helpers.hpp |1 - include/mapnik/value.hpp |6 + include/mapnik/version.hpp |2 +- plugins/input/csv/build.py |2 + plugins/input/csv/csv_datasource.cpp | 838 - plugins/input/csv/csv_datasource.hpp | 43 +- .../csv_featureset.cpp}| 62 +- .../csv_featureset.hpp}| 40 +- plugins/input/csv/csv_inline_featureset.cpp| 78 ++ .../csv_inline_featureset.hpp} | 41 +- plugins/input/csv/csv_utils.hpp| 297 - plugins/input/geojson/large_geojson_featureset.cpp |1 - plugins/input/geojson/large_geojson_featureset.hpp |2 - src/datasource_cache.cpp | 14 +- src/image_util_jpeg.cpp|2 +- test/standalone/csv_test.cpp | 1229 ++-- test/standalone/datasource_registration_test.cpp | 46 + test/unit/svg/svg_parser_test.cpp |4 +- test/visual/run.cpp|2 + test/visual/runner.cpp | 52 +- test/visual/runner.hpp | 11 +- 27 files changed, 1583 insertions(+), 1386 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_3.0.4+ds-1_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Sun, 30 Aug 2015 13:40:37 +0200 Source: mapnik Binary: libmapnik3.0 libmapnik2-dev libmapnik-dev mapnik-utils mapnik-doc Architecture: source amd64 all Version: 3.0.4+ds-1 Distribution: unstable Urgency: medium Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Changed-By: Bas Couwenberg sebas...@debian.org Description: libmapnik-dev - C++ toolkit for developing GIS applications (devel) libmapnik2-dev - C++ toolkit for developing GIS applications (dummy) libmapnik3.0 - C++ toolkit for developing GIS applications (libraries) mapnik-doc - C++ toolkit for developing GIS applications (doc) mapnik-utils - C++ toolkit for developing GIS applications (utilities) Changes: mapnik (3.0.4+ds-1) unstable; urgency=medium . * Team upload. * New upstream release. Checksums-Sha1: 8fb968faee5a6a069f899b15bd72d20f8e03f5cc 3065 mapnik_3.0.4+ds-1.dsc bf0f5a5a43835d94e8028792f6794d79f50d3f58 4473399 mapnik_3.0.4+ds.orig.tar.gz 75c2c8ff93fe455e41cf64e321060cae4c972aa3 14900 mapnik_3.0.4+ds-1.debian.tar.xz 302c8b342e1d00f93d869441ffd6709f8e06ad8a 698320 libmapnik-dev_3.0.4+ds-1_amd64.deb 1edc84a5ac88728f3d3ae7f5de789e0633b7be34 30954 libmapnik2-dev_3.0.4+ds-1_all.deb 62fc6bad88bb86c7cbde88bcf63c1ace184945b5 3076606 libmapnik3.0_3.0.4+ds-1_amd64.deb 4697c3dc7dc9e942d849e7c6d331fada2382dc3e 2133854 mapnik-doc_3.0.4+ds-1_all.deb 4cbbe727e5fb1def862d358671c5bcd3c6dc1eaa 66970 mapnik-utils_3.0.4+ds-1_amd64.deb Checksums-Sha256: 46eeb0ab6d555410034d2a5066a5a782187c72f67405334aa05f65673525cb81 3065 mapnik_3.0.4+ds-1.dsc 9c4fd0f5688110bcdaee5ece1b869f51efc92171a647a9d8372dd12e9d19135e 4473399 mapnik_3.0.4+ds.orig.tar.gz 6e11ad096c221e45ffed88ed474a70449c14d493ef1348415c4cc58bf66d51a8 14900 mapnik_3.0.4+ds-1.debian.tar.xz 20d9f300bdcd878a20f25de863952ce20445ceb59b3d601100a52b54d4517a28 698320 libmapnik-dev_3.0.4+ds-1_amd64.deb a3a456b1af45d22b8e14ea04140bcdac1d1e6ee7458748e228369184dd58084f 30954 libmapnik2-dev_3.0.4+ds-1_all.deb deeb0c5941e3f910cd730887a67811b3aa717f2fff22361d70600ce8c81eee8b 3076606 libmapnik3.0_3.0.4+ds-1_amd64.deb 68999fd385abfb024e747f93846231b4aae6f8edf1d6cc340f31a2ab270ded49 2133854 mapnik-doc_3.0.4+ds-1_all.deb 6e31ada0c152f8bd25aab76696c8236158d2d8e63b1eb3f192db5debbe42861c 66970 mapnik-utils_3.0.4+ds-1_amd64.deb Files: f377385a3e3c5719e6953e1b4e0b09ad 3065 libs optional mapnik_3.0.4+ds-1.dsc fa9b1b7899f916dabe48e8975f109125 4473399 libs optional mapnik_3.0.4+ds.orig.tar.gz 65374b5389fb57b7998713784b75dd81 14900 libs optional mapnik_3.0.4+ds-1.debian.tar.xz c0fa9dfaf98f58e112cf991c9d445519 698320 libdevel optional libmapnik-dev_3.0.4+ds-1_amd64.deb 2f27db17db34e21921b7b69232d3787b 30954 oldlibs extra libmapnik2-dev_3.0.4+ds-1_all.deb 415ef7969b48c31f373399644ade8ec8 3076606 libs optional libmapnik3.0_3.0.4+ds-1_amd64.deb 24c97c35ac05cd33624c0e53bcc9bc7f 2133854 doc optional mapnik-doc_3.0.4+ds-1_all.deb da84460e27b83cc1a91718f5124d1a05 66970 utils optional mapnik-utils_3.0.4+ds-1_amd64.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJV4xC6AAoJEGdQ8QrojUrxcRwP/R0R2oBFvNaHn4E/f3w2S5Rc B+GTAg0fZGlj5HGWe3U8uz0R/Z27t3Rnxr9GGzNH7j12V23Y59oOz78QgUaICX4h N4qsBpnSOzOJ0Hl1tHcdeO8DeYaBOntqccArTIcGV5a03aDYkyT+zbP/wZhpnbe7 BqnIGfbfnpOX+IkQG8mCnY5n0y6VFL2bz3Q6Q8CCOX2FNARaH67IziGJx8dpzEK1 WGVDwQ6Jj9IKj9hqW68lfJCoEnU6d8iC3qhSHyk1G8gjnwCWem/QZtYCltSftakI PgeUri7CzqNAfYqHam9q7VKpqZuk2BddY+74+GZUKwFi8nY6/aR7NIxhOTcvNO+C dQWQkx93lgySBESSRH5cZWZgybvqr8Lu7Hb1VWHyCtZpLBe9aTVHOU1jy71esxFI e7Slrot6VAw8sX5f9hxHGNDwu+YfCLCqxt8koJb1eafznLs7/FEB5JA4+Dk+nwg6 EmSsWo2eceT4aXhRC/klvm6c7px/vViEReYos1l5VpMBx1ZwWcje99SyXc0wckbz NHItx/9Tafhn7gYNrO3tliIxLSv92qDT0PoIus3NEjlie/d1bd8QFFfLPm0dsdWN etDGOffodfcDA/jd1pMjxavtw9tetnuvsfll508NfaxzmYcoU91SzB5OxYpY32Ky 48a5sHPEO1VCxtil1Fr9 =GRTf -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
Processing of sfcgal_1.1.0-4_amd64.changes
sfcgal_1.1.0-4_amd64.changes uploaded successfully to localhost along with the files: sfcgal_1.1.0-4.dsc sfcgal_1.1.0-4.debian.tar.xz libsfcgal-dev_1.1.0-4_amd64.deb libsfcgal1_1.1.0-4_amd64.deb sfcgal-bin_1.1.0-4_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
Processed: Downgrade severity, fix migration prevented by gcc-5
Processing commands for cont...@bugs.debian.org:
#777955: liblas: should update symbols files for GCC 5
#791240: pktools: symbols file update needed for GCC 5
#796544: osrm: FTBFS: undefined reference to `stxxl::print_msg(...)'
severity 777955 important
Bug #777955 {Done: Bas Couwenberg sebas...@debian.org} [src:liblas] liblas:
should update symbols files for GCC 5
Severity set to 'important' from 'serious'
severity 791240 important
Bug #791240 {Done: Bas Couwenberg sebas...@debian.org} [src:pktools] pktools:
symbols file update needed for GCC 5
Severity set to 'important' from 'serious'
severity 796544 important
Bug #796544 {Done: Bas Couwenberg sebas...@debian.org} [src:osrm] osrm:
FTBFS: undefined reference to `stxxl::print_msg(char const*,
std::__cxx11::basic_stringchar, std::char_traitschar, std::allocatorchar
const, unsigned int)'
Severity set to 'important' from 'serious'
thanks
Stopping processing here.
Please contact me if you need assistance.
--
777955: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=777955
791240: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=791240
796544: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=796544
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
grass_7.0.1-2_mipsel.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Sat, 29 Aug 2015 13:28:25 +0200 Source: grass Binary: grass grass-core grass-gui grass-doc grass-dev-doc grass-dev Architecture: mipsel Version: 7.0.1-2 Distribution: unstable Urgency: medium Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Changed-By: Bas Couwenberg sebas...@debian.org 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.1-2) unstable; urgency=medium . * Update Vcs-Browser URL to use HTTPS. * Drop .0 from LGPL licese shortname in copyright file. * Drop obsolete TODO file. * Enable parallel builds. Checksums-Sha1: 4066468ec758fe4a02624e75408f2a972547d160 6990768 grass-core_7.0.1-2_mipsel.deb 3e972cb00b0ae6d8620e65ea6b58e0bda74860f8 194870 grass-dev_7.0.1-2_mipsel.deb 13ddd384e686d4d20d2c0f9582a8a29614bd2128 1931204 grass-gui_7.0.1-2_mipsel.deb Checksums-Sha256: 729790e2b433f4a236d96283f21b8989d3737cc85e0e31a5796082dd2a442e49 6990768 grass-core_7.0.1-2_mipsel.deb 89f1ede9b2dae423a95754fda2a69c62da7ff46eddd7607dcbc829bb5022ad80 194870 grass-dev_7.0.1-2_mipsel.deb 8be2f68b6021975638d9e431e2b87b88801143fa5524f2bcf3c69b50dd5df0c9 1931204 grass-gui_7.0.1-2_mipsel.deb Files: dca12ececeafbaadc413e31e1be37582 6990768 science optional grass-core_7.0.1-2_mipsel.deb ed48ef3d7ccacbc9f4b2bb72eb9c107f 194870 devel optional grass-dev_7.0.1-2_mipsel.deb 1966d3a03fc79e36e122ff1e516dda66 1931204 science optional grass-gui_7.0.1-2_mipsel.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJV4wJCAAoJEGdQ8QrojUrxU3wP/1Slo6OxbFEUH4mMaWUFlTyt Rn3H0e1QhpSj3LIOlkl0pqllvD0IXgJSEbC7oukxaaR9MzcVbfMEKtyuUgKbVRY3 BS/Do7STFrzxliHVNGLazTp0U2jy4N+OA7Q9SpKd1kpexUpzvTl/QC/fzutOWxCI nnMPxCRQ7MHuGJvKRgMtGBj1nTnxGTR6f8DV6xqcXMAfi3EUl60M15Qvd1Q+KW4Q KwYMdwhoXLt8tPPIvS+He6w/Py7fkPTWZ6aUr3Ei4qqrujPPJ1aPa4SUO6LY6qjo K7vnF4/knnpD7K+UYMNbz1ypVy0Bhbwc9jxtopz0v0IEVPuSPXto9Ylv3kwQKQCb TiXQD0ouTWi2udG4esZhNcpl4BejQIFkQOLMQWrCHXkK9gj7x56ARv4YYINdJIYr dB9WzzRLvPWX9ThKam+G20IEHuNoWdRn+mQdcAsUPXMVVoOkcECHFFKIu3CS/sDU cq75Gng2Ado0E+XlZWNUgV+k5IE07Ohq9jlVskQgCHyYRDtJYYuXpwsgMklG7vlx FsYCwfDpKFRR43G3UMA0sGzkcVfobe1343aJftlQE8HSr631AXfPIz+5veXUrU/E JNM4vM0udNmlNa3CoydlSGjfvp865WeQcMLmBdd1XAt0UkD7n/hhx83iBp1v2pJY K6M18xph5SH3cM7gp0qz =//A2 -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
Processing of python-mapnik_0.0~20150817-da1d9dd-2_amd64.changes
python-mapnik_0.0~20150817-da1d9dd-2_amd64.changes uploaded successfully to localhost along with the files: python-mapnik_0.0~20150817-da1d9dd-2.dsc python-mapnik_0.0~20150817-da1d9dd-2.debian.tar.xz python-mapnik_0.0~20150817-da1d9dd-2_amd64.deb python3-mapnik_0.0~20150817-da1d9dd-2_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
