This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch jessie-backports in repository osm2pgsql.
commit fe7fd53d4c39fbbbaa3bef760fd72c78462571e7 Merge: 1a227cd eba309d Author: Bas Couwenberg <[email protected]> Date: Sat Jul 11 10:35:21 2015 +0200 Merge tag 'debian/0.87.4-1' into jessie-backports Conflicts: debian/changelog .travis.yml | 92 ++- Makefile.am | 29 +- UTF8sanitizer.cpp | 10 +- configure.ac | 29 +- debian/changelog | 8 + debian/copyright | 5 - debian/rules | 6 +- debian/watch | 5 +- default.style | 10 +- docs/osm2pgsql.1 | 7 +- empty.style | 2 +- expire-tiles.cpp | 14 +- expire-tiles.hpp | 8 +- geometry-builder.cpp | 18 +- geometry-processor.cpp | 8 +- geometry-processor.hpp | 12 +- input.cpp | 9 +- input.hpp | 1 + m4/ax_cxx_compile_stdcxx_11.m4 | 142 ++++ middle-pgsql.cpp | 20 +- middle-ram.cpp | 9 +- middle-ram.hpp | 6 +- middle.hpp | 7 +- multi.lua | 4 +- multi.style.json | 2 +- node-persistent-cache-reader.cpp | 30 +- node-persistent-cache.cpp | 361 ++++------ node-persistent-cache.hpp | 18 +- node-ram-cache.cpp | 113 ++-- node-ram-cache.hpp | 83 ++- options.cpp | 5 - osm2pgsql.cpp | 8 +- osmdata.cpp | 44 +- output-multi.cpp | 12 +- output-multi.hpp | 20 +- output-null.cpp | 13 +- output-pgsql.cpp | 2 +- output.hpp | 9 +- parse-o5m.cpp | 11 +- parse-o5m.hpp | 5 +- parse-pbf.cpp | 21 +- parse-pbf.hpp | 10 +- parse-xml2.cpp | 11 +- parse-xml2.hpp | 1 - parse.cpp | 14 +- parse.hpp | 9 +- pgsql-id-tracker.cpp | 4 +- pgsql-id-tracker.hpp | 3 + pgsql.cpp | 8 +- processor-line.cpp | 2 - processor-point.cpp | 11 +- processor-point.hpp | 5 +- processor-polygon.cpp | 2 - rb.cpp | 930 -------------------------- rb.hpp | 122 ---- reprojection.cpp | 13 +- reprojection.hpp | 2 +- sanitizer.hpp | 1 - style.lua | 137 ++-- table.cpp | 19 +- table.hpp | 9 +- tagtransform.cpp | 20 +- tagtransform.hpp | 13 +- tests/middle-tests.cpp | 140 +++- tests/middle-tests.hpp | 3 + tests/regression-test.py | 2 +- tests/test-expire-tiles.cpp | 1 + tests/test-middle-pgsql.cpp | 95 ++- tests/test-middle-ram.cpp | 62 +- tests/test-output-multi-line-storage.cpp | 2 +- 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-poly-trivial.cpp | 2 +- tests/test-output-multi-polygon.cpp | 2 +- tests/test-output-multi-tags.cpp | 2 +- tests/test-output-pgsql.cpp | 4 +- tests/test-parse-options.cpp | 1 - tests/test-parse-xml2.cpp | 1 + util.hpp | 7 +- 80 files changed, 1039 insertions(+), 1855 deletions(-) diff --cc debian/changelog index 5eed2b2,ec3c5bd..b88198b --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,11 +1,18 @@@ + osm2pgsql (0.87.4-1) unstable; urgency=medium + + * New upstream release. + * Update copyright file, changes: + - Drop license & copyright for rb.{c,h}pp, removed upstream. + + -- Bas Couwenberg <[email protected]> Mon, 06 Jul 2015 08:37:56 +0200 + +osm2pgsql (0.87.3-3~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + * Update branch in gbp.conf and Vcs-Git URL. + + -- Bas Couwenberg <[email protected]> Mon, 11 May 2015 19:44:05 +0200 + osm2pgsql (0.87.3-3) unstable; urgency=medium * Use --without-lockfree configure option on problematic architectures, -- 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
