[Tile-serving] [osm2pgsql] Various cleanups (#140)

Jochen Topf notifications at github.com
Wed Apr 30 14:30:45 UTC 2014


This pull request contains various whitespace cleanups and adds some generated files to .gitignore. Also two small changes to the built scripts that came up when looking at creating Debian packages. See the individual commits for details.
You can merge this Pull Request by running:

  git pull https://github.com/joto/osm2pgsql master

Or you can view, comment on it, or merge it online at:

  https://github.com/openstreetmap/osm2pgsql/pull/140

-- Commit Summary --

  * Remove whitespace at end of lines.
  * Add additional generated files to .gitignore.
  * Allow maintainer mode to be disabled (debian build scripts do this).
  * Add ZLIB_CFLAGS to CFLAGS.
  * Add file config.h.in~ to .gitignore.

-- File Changes --

    M .gitignore (3)
    M Makefile.am (6)
    M NEWS (2)
    M README (38)
    M README_lua.md (4)
    M UTF8sanitizer.c (12)
    M build_geometry.cpp (16)
    M build_geometry.h (8)
    M configure.ac (21)
    M docs/osm2pgsql.1 (12)
    M empty.style (2)
    M expire-tiles.c (8)
    M geos-fallback/geos/noding/SegmentNode.h (8)
    M geos-fallback/geos/noding/SegmentNodeList.h (6)
    M geos-fallback/geos/noding/SegmentString.h (6)
    M input.c (16)
    M install-postgis-osm-db.sh (12)
    M install-postgis-osm-user.sh (2)
    M keyvals.c (50)
    M keyvals.h (6)
    M m4/ax_config_nice.m4 (2)
    M m4/ax_lib_bzip2.m4 (4)
    M m4/ax_lib_proj.m4 (2)
    M m4/ax_lib_protobuf_c.m4 (4)
    M m4/ax_lib_zlib.m4 (4)
    M mapnik-osm-updater.sh (70)
    M middle-pgsql.c (328)
    M middle-pgsql.h (4)
    M middle-ram.c (4)
    M middle-ram.h (4)
    M middle.h (2)
    M node-persistent-cache.c (6)
    M node-ram-cache.c (58)
    M node-ram-cache.h (4)
    M osm2pgsql.c (38)
    M osm2pgsql.spec.in (6)
    M osmtypes.h (4)
    M output-gazetteer.c (68)
    M output-null.c (4)
    M output-null.h (2)
    M output-pgsql.c (110)
    M output-pgsql.h (2)
    M output.h (4)
    M parse-o5m.c (12)
    M parse-pbf.c (124)
    M parse-primitive.c (16)
    M parse-xml2.c (6)
    M pgsql.c (6)
    M protobuf/fileformat.proto (2)
    M protobuf/osmformat.proto (18)
    M reprojection.c (56)
    M sprompt.c (2)
    M style.lua (18)
    M tagtransform.c (16)
    M tests/regression-test.py (12)
    M tests/regression-test.sh (2)
    M wildcmp.c (4)

-- Patch Links --

https://github.com/openstreetmap/osm2pgsql/pull/140.patch
https://github.com/openstreetmap/osm2pgsql/pull/140.diff

---
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/osm2pgsql/pull/140
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstreetmap.org/pipermail/tile-serving/attachments/20140430/686d19b3/attachment.html>


More information about the Tile-serving mailing list