[DebianGIS-dev] [SCM] osm2pgsql branch, master, updated. upstream/0.70.5+r25090-25-g4c55a70

[David Paleino]

The following commit has been merged in the master branch:
commit 4c55a702e36d118e902206708874b1ed50b2ecc9
Author: David Paleino <dapal at debian.org>
Date:   Tue Jan 18 21:27:15 2011 +0100

    Updated manpage

diff --git a/debian/changelog b/debian/changelog
index 3e11d8d..6d20362 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,5 @@
 osm2pgsql (0.70.5+r25090-1) UNRELEASED; urgency=low
 
-  ***DO NOT RELEASE***
-  TODO:
-   + update manpage (reported upstream?)
-
-  [ David Paleino ]
   * New SVN snapshot
   * debian/control:
     - fix Vcs-* fields to point to the git repository.
@@ -21,8 +16,9 @@ osm2pgsql (0.70.5+r25090-1) UNRELEASED; urgency=low
   * Add Build-Dependencies on zlib, protobuf-c and dh-autoreconf
   * Use DEP-5 for debian/copyright
   * Clean protoc-generated files during the clean target
+  * Updated manpage
 
- -- David Paleino <dapal at debian.org>  Tue, 18 Jan 2011 21:15:19 +0100
+ -- David Paleino <dapal at debian.org>  Tue, 18 Jan 2011 21:26:47 +0100
 
 osm2pgsql (0.69+r20104-2) unstable; urgency=low
 
diff --git a/debian/osm2pgsql.1 b/debian/osm2pgsql.1
index 2d05cd6..30e7404 100644
--- a/debian/osm2pgsql.1
+++ b/debian/osm2pgsql.1
@@ -91,11 +91,38 @@ Create a tile expiry list.
 \fB\-o\fR|\-\-expire-output filename
 Output filename for expired tiles list.
 .TP
+\fB\-r\fR|\-\-input-reader
+Input frontend.
+libxml2 - Parse XML using libxml2. (default)
+primitive - Primitive XML parsing.
+pbf - OSM binary format.
+.TP
 \fB\-O\fR|\-\-output
 Output backend.
 pgsql - Output to a PostGIS database. (default)
 null - No output. Useful for testing.
 .TP
+\fB\-x\fR|\-\-extra-attributes
+Include attributes for each object in the database.
+This includes the username, userid, timestamp and version.
+Note: this option also requires additional entries in your style file.
+.TP
+\fB\-k\fR|\-\-hstore
+Generate an additional hstore (key/value) column to  postgresql tables
+.TP
+\fB\-z\fR|\-\-hstore-column
+Generate an additional hstore (key/value) column to containing all tags
+that start with the specified string, for example \-\-hstore-column "name:" will
+produce an extra hstore column that contains all name:xx tags
+.TP
+\fB\-G\fR|\-\-multi-geometry
+Generate multi-geometry features in postgresql tables.
+.TP
+\fB\-K\fR|\-\-keep-coastlines
+Keep coastline data rather than filtering it out.
+By default natural=coastline tagged data will be discarded based on the
+assumption that post-processed Coastline Checker shapefiles will be used.
+.TP
 \fB\-h\fR|\-\-help
 Help information.
 .br

-- 
OpenStreetMap data to PostgreSQL converter