This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository osm2pgsql.

commit 7d682c1365c3fdc8f744b26e32c1a3b031653da6
Merge: 7f701d6 bc5a886
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Wed Apr 30 12:45:30 2014 +0200

    Merge tag 'upstream/0.84.0'
    
    Upstream version 0.84.0
    
    Conflicts:
        debian/changelog
        debian/compat
        debian/control
        debian/copyright
        debian/dirs
        debian/install
        debian/manpages
        debian/rules
        debian/source/format

 .gitignore                             |   35 +
 INSTALL                                |  365 --------
 Makefile.am                            |   10 +-
 README                                 |   37 +-
 README_lua.md                          |   57 ++
 build_geometry.cpp                     |   79 +-
 configure.ac                           |   23 +-
 cygpkg.sh                              |   59 ++
 default.style                          |  350 +++++---
 docs/nodecachefilereader.1             |    4 +-
 docs/osm2pgsql.1                       |   46 +-
 empty.style                            |  107 +++
 legacy/Makefile.am                     |   11 -
 legacy/build_geometry.cpp              |  163 ----
 legacy/build_geometry.h                |   40 -
 legacy/osm2pgsql.c                     |  642 --------------
 m4/ax_lua.m4                           |  607 +++++++++++++
 middle-pgsql.c                         |   16 +-
 middle-ram.c                           |    1 -
 node-persistent-cache.c                |   17 +-
 node-persistent-cache.h                |    2 +-
 node-ram-cache.c                       |    7 +-
 node-ram-cache.h                       |    2 +-
 osm2pgsql.c                            |  272 +++---
 output-gazetteer.c                     |   85 +-
 output-pgsql.c                         |  583 ++----------
 output-pgsql.h                         |   14 +
 output.h                               |    1 +
 parse-pbf.c                            |   14 +-
 style.lua                              |  178 ++++
 tagtransform.c                         |  756 ++++++++++++++++
 tagtransform.h                         |   29 +
 tests/000466354.osc.gz                 |  Bin 0 -> 161335 bytes
 tests/liechtenstein-2013-08-03.osm.pbf |  Bin 0 -> 666646 bytes
 tests/regression-test.py               |  605 +++++++++++++
 tests/regression-test.sh               |   63 +-
 tests/test_multipolygon.osm            | 1508 ++++++++++++++++++++++++++++++++
 tests/test_multipolygon_diff.osc       |  193 ++++
 tests/test_multipolygon_postdiff.osm   |  987 +++++++++++++++++++++
 39 files changed, 5895 insertions(+), 2073 deletions(-)

-- 
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

Reply via email to