[osm2pgsql] 01/02: Merge tag 'debian/0.94.0+ds-1' into stretch-backports
Bas Couwenberg
sebastic at debian.org
Thu Oct 12 05:55:31 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch stretch-backports
in repository osm2pgsql.
commit aec82173eee9d0280ee8853232a3b0ab55442a2a
Merge: 17ee5f2 b25abb3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Oct 12 07:37:23 2017 +0200
Merge tag 'debian/0.94.0+ds-1' into stretch-backports
.clang-format | 9 +
.travis.yml | 7 +-
CMakeLists.txt | 32 +-
CONTRIBUTING.md | 36 +-
README.md | 28 +-
appveyor.yml | 45 +-
debian/changelog | 27 +
debian/control | 6 +-
debian/copyright | 19 -
debian/tests/control | 3 +
docs/lua.md | 2 +-
docs/migrations.md | 5 +
docs/osm2pgsql.1 | 5 +-
docs/pgsql.md | 4 +-
docs/usage.md | 7 +-
expire-tiles.cpp | 391 ++++++-------
expire-tiles.hpp | 207 +++++--
geometry-builder.cpp | 739 -----------------------
geometry-builder.hpp | 114 ----
geometry-processor.cpp | 101 ++--
geometry-processor.hpp | 48 +-
middle-pgsql.cpp | 627 +++++++++-----------
middle-pgsql.hpp | 55 +-
middle-ram.cpp | 99 ++--
middle-ram.hpp | 52 +-
middle.hpp | 54 +-
multi.lua | 16 +-
node-persistent-cache.cpp | 658 ++-------------------
node-persistent-cache.hpp | 100 +---
node-ram-cache.cpp | 406 +++++++------
node-ram-cache.hpp | 90 +--
options.cpp | 111 ++--
options.hpp | 12 +-
osm2pgsql.cpp | 6 +-
osmdata.cpp | 93 +--
osmdata.hpp | 22 +-
osmium-builder.cpp | 410 +++++++++++++
osmium-builder.hpp | 51 ++
osmtypes.hpp | 111 +++-
output-gazetteer.cpp | 804 ++++++++++++--------------
output-gazetteer.hpp | 139 ++---
output-multi.cpp | 300 +++++-----
output-multi.hpp | 62 +-
output-null.cpp | 30 +-
output-null.hpp | 34 +-
output-pgsql.cpp | 463 +++++++--------
output-pgsql.hpp | 67 +--
output.cpp | 4 +-
output.hpp | 12 +-
parse-osmium.cpp | 81 +--
parse-osmium.hpp | 27 +-
pgsql.cpp | 45 +-
pgsql.hpp | 19 +-
processor-line.cpp | 21 +-
processor-line.hpp | 17 +-
processor-point.cpp | 14 +-
processor-point.hpp | 10 +-
processor-polygon.cpp | 21 +-
processor-polygon.hpp | 18 +-
style.lua | 16 +-
table.cpp | 110 ++--
table.hpp | 21 +-
taginfo.cpp | 54 +-
taginfo_impl.hpp | 14 +-
tagtransform-c.cpp | 421 ++++++++++++++
tagtransform-c.hpp | 31 +
tagtransform-lua.cpp | 202 +++++++
tagtransform-lua.hpp | 38 ++
tagtransform.cpp | 675 +--------------------
tagtransform.hpp | 70 +--
tests/000466354.osc.gz | Bin 161335 -> 125326 bytes
tests/CMakeLists.txt | 1 +
tests/common-pg.cpp | 8 +-
tests/common.hpp | 3 +-
tests/liechtenstein-2013-08-03.osm.pbf | Bin 666646 -> 592570 bytes
tests/middle-tests.cpp | 425 ++++++++------
tests/mockups.hpp | 137 ++---
tests/regression-test.py | 90 +--
tests/test-expire-tiles.cpp | 430 +++++++++-----
tests/test-hstore-match-only.cpp | 2 +-
tests/test-middle-flat.cpp | 1 -
tests/test-middle-pgsql.cpp | 1 -
tests/test-middle-ram.cpp | 1 -
tests/test-options-database.cpp | 14 +-
tests/test-options-parse.cpp | 41 +-
tests/test-options-projection.cpp | 2 +-
tests/test-output-multi-line-storage.cpp | 2 +-
tests/test-output-multi-line.cpp | 8 +-
tests/test-output-multi-point-multi-table.cpp | 4 +-
tests/test-output-multi-point.cpp | 4 +-
tests/test-output-multi-poly-trivial.cpp | 2 +-
tests/test-output-multi-polygon.cpp | 4 +-
tests/test-output-multi-tags.cpp | 2 +-
tests/test-output-pgsql-area.cpp | 3 +-
tests/test-output-pgsql-schema.cpp | 2 +-
tests/test-output-pgsql-tablespace.cpp | 6 +-
tests/test-output-pgsql-validgeom.cpp | 4 +-
tests/test-output-pgsql-z_order.cpp | 2 +-
tests/test-output-pgsql.cpp | 43 +-
tests/test-parse-diff.cpp | 32 +-
tests/test-parse-xml2.cpp | 63 +-
tests/test-persistent-node-cache.cpp | 119 ++++
tests/test_output_multi_poly_trivial.lua | 6 +-
win_fsync.h | 71 ---
wkb.hpp | 363 ++++++++++++
105 files changed, 5050 insertions(+), 5494 deletions(-)
diff --cc debian/changelog
index afba42f,da8a6e7..5ceb93c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,30 +1,37 @@@
+ osm2pgsql (0.94.0+ds-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 07 Oct 2017 09:38:57 +0200
+
+ osm2pgsql (0.94.0~rc2+ds-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Drop spelling-errors.patch, applied upstream.
+ * Bump Standards-Version to 4.1.1, no changes.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 04 Oct 2017 07:42:16 +0200
+
+ osm2pgsql (0.94.0~rc1+ds-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Drop GEOS build dependencies, no longer required.
+ * Bump Standards-Version to 4.0.0, no changes.
+ * Add autopkgtest to test installability.
+ * Bump minimum required libosmium2-dev to 2.13.1.
+ * Drop license & copyright for win_fsync.h.
+ * Add patch to fix spelling errors.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 19 Sep 2017 00:46:23 +0200
+
+osm2pgsql (0.92.1+ds-1~bpo9+1) stretch-backports; urgency=medium
+
+ * Rebuild for stretch-backports.
+ * Update branch in gbp.conf & Vcs-Git URL.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 02 Jul 2017 14:01:36 +0200
+
osm2pgsql (0.92.1+ds-1) unstable; urgency=medium
* Move from experimental to unstable.
diff --cc debian/control
index d39abf1,d2a3c6f..ef59dbf
--- a/debian/control
+++ b/debian/control
@@@ -23,9 -21,9 +21,9 @@@ Build-Depends: debhelper (>= 9)
lua5.2,
python,
python-psycopg2
- Standards-Version: 3.9.8
+ Standards-Version: 4.1.1
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osm2pgsql.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osm2pgsql.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osm2pgsql.git -b stretch-backports
Homepage: https://wiki.openstreetmap.org/wiki/Osm2pgsql
Package: osm2pgsql
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm2pgsql.git
More information about the Pkg-grass-devel
mailing list