This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch jessie-backports in repository osm2pgsql.
commit b3d318f3c62b075f9e9caf866cba05e7d6e76c77 Merge: 43ea242 0f86a6c Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Mon Jul 20 09:09:21 2015 +0200 Merge tag 'debian/0.88.0-1' into jessie-backports Conflicts: debian/changelog .gitignore | 5 +- AUTHORS | 4 +- CONTRIBUTING.md | 103 ++++++++++++++ Makefile.am | 15 ++- README.md | 25 +--- configure.ac | 2 +- debian/changelog | 18 +++ debian/copyright | 5 +- debian/docs | 1 + debian/lintian-overrides | 3 + debian/watch | 6 +- docs/migrations.md | 15 +++ geometry-builder.cpp | 57 ++++---- node-persistent-cache.cpp | 89 ++++++------ node-ram-cache.cpp | 53 +++++--- node-ram-cache.hpp | 21 ++- options.cpp | 14 +- pgsql-id-tracker.cpp | 153 --------------------- pgsql-id-tracker.hpp | 31 ----- tagtransform.cpp | 52 ++++--- tests/common-pg.cpp | 35 ++--- tests/common-pg.hpp | 2 + tests/regression-test.py | 4 +- tests/test-middle-flat.cpp | 112 ++++++++++++++++ tests/test-output-multi-line.cpp | 2 - tests/test-output-multi-point-multi-table.cpp | 2 - tests/test-output-multi-point.cpp | 2 - tests/test-output-multi-polygon.cpp | 2 - tests/test-output-pgsql-tablespace.cpp | 146 ++++++++++++++++++++ tests/test-output-pgsql-z_order.cpp | 186 ++++++++++++++++++++++++++ tests/test-output-pgsql.cpp | 103 +++++++++++++- tests/test_output_pgsql_z_order.osm | 75 +++++++++++ 32 files changed, 967 insertions(+), 376 deletions(-) diff --cc debian/changelog index 5c8d202,5583b55..ff64820 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,21 +1,27 @@@ + osm2pgsql (0.88.0-1) unstable; urgency=medium + + * Fix filenamemangle in watch file for non pre-releases. + * New upstream release. + * Add lintian override for spelling-error-in-binary false positive. + * Move from experimental to unstable. + + -- Bas Couwenberg <sebas...@debian.org> Wed, 15 Jul 2015 08:05:18 +0200 + + osm2pgsql (0.88.0~rc1-1~exp1) experimental; urgency=medium + + * Support pre-releases in watch file. + * New upstream release candidate. + * Add additional contributors to copyright file. + * Also include CONTRIBUTING.md in docs. + + -- Bas Couwenberg <sebas...@debian.org> Sat, 11 Jul 2015 10:31:41 +0200 + +osm2pgsql (0.87.4-1~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + + -- Bas Couwenberg <sebas...@debian.org> Sat, 11 Jul 2015 10:35:26 +0200 + osm2pgsql (0.87.4-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 Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel