[osm2pgsql] 01/02: Merge tag 'debian/0.90.0+ds-1' into jessie-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Mar 8 23:55:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository osm2pgsql.
commit 613bc78f8dff6a8654a279b700deb520c65b84c1
Merge: f37b5c1 5066473
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Mar 9 00:42:03 2016 +0100
Merge tag 'debian/0.90.0+ds-1' into jessie-backports
Conflicts:
debian/changelog
debian/control
.gitignore | 70 +-
.travis.yml | 82 +-
CMakeLists.txt | 261 +++
CONTRIBUTING.md | 22 +-
Makefile.am | 188 --
NEWS | 10 -
README.md | 88 +-
UTF8sanitizer.cpp | 160 --
appveyor.yml | 69 +
autogen.sh | 2 -
cmake/FindLua.cmake | 171 ++
cmake/FindOsmium.cmake | 317 +++
cmake/config.h.in | 35 +
configure.ac | 171 --
cygpkg.sh | 59 -
debian/changelog | 26 +
debian/clean | 2 -
debian/control | 16 +-
debian/copyright | 21 +-
debian/docs | 1 -
debian/examples | 1 -
debian/install | 2 -
debian/manpages | 1 -
debian/rules | 10 +-
debian/upstream/metadata | 2 +-
debian/watch | 5 +-
default.style | 19 +-
docs/Doxyfile | 2362 ++++++++++++++++++++
docs/lua.md | 4 +-
docs/multi.md | 54 +-
docs/nodecachefilereader.1 | 37 -
docs/osm2pgsql.1 | 20 +-
docs/pgsql.md | 2 +-
docs/usage.md | 18 +-
empty.style | 58 +-
expire-tiles.cpp | 57 +-
expire-tiles.hpp | 2 +-
geometry-builder.cpp | 691 +++---
geometry-builder.hpp | 92 +-
geometry-processor.cpp | 26 +-
geometry-processor.hpp | 16 +-
geos-fallback/geos/noding/SegmentNode.h | 123 -
geos-fallback/geos/noding/SegmentNodeList.h | 204 --
geos-fallback/geos/noding/SegmentString.h | 224 --
id-tracker.hpp | 21 +-
input.cpp | 226 --
input.hpp | 14 -
install-postgis-osm-db.sh | 12 +-
install-postgis-osm-user.sh | 2 +-
m4/ax_append_flag.m4 | 71 -
m4/ax_boost_base.m4 | 285 ---
m4/ax_boost_filesystem.m4 | 118 -
m4/ax_boost_system.m4 | 120 -
m4/ax_boost_thread.m4 | 149 --
m4/ax_cflags_warn_all.m4 | 122 -
m4/ax_compare_version.m4 | 177 --
m4/ax_compile_check_sizeof.m4 | 114 -
m4/ax_config_nice.m4 | 37 -
m4/ax_cxx_compile_stdcxx_11.m4 | 142 --
m4/ax_lib_bzip2.m4 | 221 --
m4/ax_lib_geos.m4 | 161 --
m4/ax_lib_postgresql.m4 | 164 --
m4/ax_lib_proj.m4 | 216 --
m4/ax_lib_protobuf_c.m4 | 257 ---
m4/ax_lib_xml2.m4 | 150 --
m4/ax_lib_zlib.m4 | 220 --
m4/ax_lua.m4 | 664 ------
m4/ax_pthread.m4 | 332 ---
middle-pgsql.cpp | 501 ++---
middle-pgsql.hpp | 55 +-
middle-ram.cpp | 114 +-
middle-ram.hpp | 93 +-
middle.cpp | 8 +-
middle.hpp | 62 +-
multi.lua | 2 +-
node-persistent-cache-reader.cpp | 140 --
node-persistent-cache.cpp | 64 +-
node-persistent-cache.hpp | 20 +-
node-ram-cache.cpp | 71 +-
node-ram-cache.hpp | 26 +-
options.cpp | 267 ++-
options.hpp | 120 +-
osm2pgsql.cpp | 67 +-
osm2pgsql.spec.in | 96 -
osmdata.cpp | 156 +-
osmdata.hpp | 10 +-
osmtypes.hpp | 31 +-
output-gazetteer.cpp | 492 ++--
output-gazetteer.hpp | 50 +-
output-multi.cpp | 116 +-
output-multi.hpp | 30 +-
output-null.cpp | 4 +-
output-null.hpp | 2 +-
output-pgsql.cpp | 315 +--
output-pgsql.hpp | 27 +-
output.cpp | 44 +-
output.hpp | 26 +-
parse-o5m.cpp | 962 --------
parse-o5m.hpp | 44 -
parse-osmium.cpp | 229 ++
parse-osmium.hpp | 145 ++
parse-pbf.cpp | 554 -----
parse-pbf.hpp | 67 -
parse-xml2.cpp | 414 ----
parse-xml2.hpp | 62 -
parse.cpp | 178 --
parse.hpp | 96 -
pgsql.cpp | 19 +-
pgsql.hpp | 10 +-
processor-line.cpp | 7 +-
processor-line.hpp | 2 +-
processor-point.cpp | 14 +-
processor-point.hpp | 2 +-
processor-polygon.cpp | 13 +-
processor-polygon.hpp | 4 +-
protobuf/fileformat.proto | 30 -
protobuf/osmformat.proto | 206 --
reprojection.cpp | 235 +-
reprojection.hpp | 71 +-
sanitizer.hpp | 8 -
sprompt.cpp | 13 +-
style.lua | 12 +-
table.cpp | 109 +-
table.hpp | 51 +-
taginfo.cpp | 11 +-
taginfo_impl.hpp | 3 +-
tagtransform.cpp | 133 +-
tagtransform.hpp | 2 +-
tests/008-ch.osc.gz | Bin 0 -> 110786 bytes
tests/CMakeLists.txt | 69 +
tests/common-cleanup.cpp | 21 +
tests/common-cleanup.hpp | 21 +
tests/common-pg.cpp | 146 +-
tests/common-pg.hpp | 63 +-
tests/common.hpp | 22 +
tests/hstore-match-only.osm | 323 +++
tests/hstore-match-only.style | 31 +
tests/liechtenstein-2013-08-03.osm.bz2 | Bin 1061981 -> 0 bytes
tests/middle-tests.cpp | 25 +-
tests/mockups.hpp | 116 +
tests/regression-test.py | 41 +-
tests/regression-test.sh | 3 +-
tests/test-expire-tiles.cpp | 1 +
tests/test-hstore-match-only.cpp | 92 +
tests/test-middle-flat.cpp | 27 +-
tests/test-middle-pgsql.cpp | 17 +-
tests/test-options-database.cpp | 87 +
...st-parse-options.cpp => test-options-parse.cpp} | 73 +-
tests/test-output-multi-line-storage.cpp | 64 +-
tests/test-output-multi-line.cpp | 91 +-
tests/test-output-multi-point-multi-table.cpp | 70 +-
tests/test-output-multi-point.cpp | 62 +-
tests/test-output-multi-poly-trivial.cpp | 76 +-
tests/test-output-multi-polygon.cpp | 93 +-
tests/test-output-multi-tags.cpp | 90 +-
tests/test-output-pgsql-area.cpp | 107 +
tests/test-output-pgsql-schema.cpp | 110 +
tests/test-output-pgsql-tablespace.cpp | 81 +-
tests/test-output-pgsql-z_order.cpp | 127 +-
tests/test-output-pgsql.cpp | 325 +--
tests/test-parse-diff.cpp | 126 ++
tests/test-parse-xml2.cpp | 78 +-
tests/test_output_pgsql_area.osm | 55 +
163 files changed, 7728 insertions(+), 11516 deletions(-)
diff --cc debian/changelog
index 9b56935,4e4be0b..0ef2649
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,29 +1,35 @@@
+ osm2pgsql (0.90.0+ds-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop clean file, protobuf files no longer (re)generated.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 02 Mar 2016 18:48:55 +0100
+
+ osm2pgsql (0.90.0~rc1+ds-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Update Vcs-Git URL to use HTTPS.
+ * Update Homepage & Donation URLs to use HTTPS.
+ * Switch to CMake buildsystem.
+ * Update build dependencies:
+ - Drop libboost-thread-dev, libxml2-dev & protobuf dependencies
+ - Add libexpat1-dev & libosmium2-dev
+ * Repack upstream tarball to exclude embedded copy of libosmium.
+ * Update copyright file, changes:
+ - Drop license & copyright for geos-fallback, no longer included
+ - Drop © character from copyright statements
+ * Bump Standards-Version to 3.9.7, no changes.
+ * Override dh_install to use --list-missing.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 27 Feb 2016 16:23:37 +0100
+
+osm2pgsql (0.88.1-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 07 Sep 2015 08:30:51 +0200
+
osm2pgsql (0.88.1-1) unstable; urgency=medium
* New upstream release.
diff --cc debian/control
index 3578a09,ab73817..43bf7c3
--- a/debian/control
+++ b/debian/control
@@@ -25,10 -23,10 +23,10 @@@ Build-Depends: debhelper (>= 9)
lua5.2,
python,
python-psycopg2
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.7
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osm2pgsql.git
- Vcs-Git: git://anonscm.debian.org/pkg-grass/osm2pgsql.git -b jessie-backports
- Homepage: http://wiki.openstreetmap.org/wiki/Osm2pgsql
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osm2pgsql.git
++Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osm2pgsql.git -b jessie-backports
+ Homepage: https://wiki.openstreetmap.org/wiki/Osm2pgsql
Package: osm2pgsql
Architecture: any
--
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