This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch jessie-backports in repository osm2pgsql.
commit 1e208d6099cbdb9b88c184a448ad2f62684759be Merge: 4081629 3864e4b Author: Bas Couwenberg <[email protected]> Date: Fri Dec 30 10:14:18 2016 +0100 Merge tag 'debian/0.92.0+ds-1' into jessie-backports Conflicts: debian/changelog 900913.sql | 1 - CMakeLists.txt | 15 +- README.md | 12 +- cmake/config.h.in | 3 - debian/changelog | 14 + debian/copyright | 530 ++++++++++++++++++++++++++++++++++ default.style | 2 +- docs/export.md | 2 +- docs/migrations.md | 16 + docs/osm2pgsql.1 | 17 +- docs/usage.md | 10 +- expire-tiles.cpp | 338 +++++++++------------- expire-tiles.hpp | 57 ++-- geometry-builder.cpp | 48 +-- id-tracker.cpp | 2 +- id-tracker.hpp | 2 +- middle-pgsql.cpp | 451 +++++++++++++---------------- middle-pgsql.hpp | 9 +- multi.style.json | 10 - options.cpp | 17 +- options.hpp | 1 + osm2pgsql.cpp | 2 +- osmdata.cpp | 4 +- output-gazetteer.cpp | 2 +- output-gazetteer.hpp | 10 +- output-multi.cpp | 93 +++--- output-multi.hpp | 17 +- output-pgsql.cpp | 102 +++---- output-pgsql.hpp | 13 +- output.cpp | 31 +- output.hpp | 6 +- parse-osmium.cpp | 2 +- pgsql.cpp | 10 +- pgsql.hpp | 11 +- reprojection.cpp | 2 +- reprojection.hpp | 2 +- sprompt.cpp | 10 +- style.lua | 428 ++++++++++++++++----------- table.cpp | 150 +++++----- table.hpp | 4 +- taginfo.cpp | 74 +++-- taginfo.hpp | 21 ++ taginfo_impl.hpp | 30 +- tagtransform.cpp | 6 +- tests/CMakeLists.txt | 12 + tests/common-pg.cpp | 17 ++ tests/common-pg.hpp | 2 + tests/regression-test.py | 32 +- tests/test-expire-tiles.cpp | 83 +++--- tests/test-options-projection.cpp | 114 ++++++++ tests/test-output-pgsql-validgeom.cpp | 97 +++++++ tests/test-output-pgsql.cpp | 2 +- tests/test-parse-xml2.cpp | 2 +- tests/test-wildcard-match.cpp | 61 ++++ tests/test_output_multi_tags.json | 25 +- tests/test_output_pgsql_validgeom.osm | 250 ++++++++++++++++ wildcmp.cpp | 115 ++------ wildcmp.hpp | 6 +- 58 files changed, 2219 insertions(+), 1186 deletions(-) diff --cc debian/changelog index 37bba6b,39af702..4f14af2 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,17 +1,23 @@@ + osm2pgsql (0.92.0+ds-1) unstable; urgency=medium + + * New upstream release. + * Move from experimental to unstable. + + -- Bas Couwenberg <[email protected]> Fri, 16 Dec 2016 11:34:24 +0100 + + osm2pgsql (0.92.0~rc1+ds-1~exp1) experimental; urgency=medium + + * New upstream release candidate. + * Add license & copyright for test_output_pgsql_validgeom.osm. + + -- Bas Couwenberg <[email protected]> Thu, 08 Dec 2016 00:17:36 +0100 + +osm2pgsql (0.90.1+ds-1~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + + -- Bas Couwenberg <[email protected]> Sat, 23 Jul 2016 18:55:19 +0200 + osm2pgsql (0.90.1+ds-1) unstable; urgency=medium * New upstream release. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm2pgsql.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
