[SCM] osm2pgsql branch, master, updated. debian/0.80.0+r27899-3-25-g6136dde

Andreas Tille tille at debian.org
Thu Sep 19 07:08:23 UTC 2013 

The following commit has been merged in the master branch:
commit 6136ddeaa2afceaeabb781081c68bf96ef1bbe70
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 19 08:44:29 2013 +0200

    Install manpages provided upstream

diff --git a/debian/changelog b/debian/changelog
index 9849572..feb5077 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ osm2pgsql (0.82.0-1) UNRELEASED; urgency=low
      - DEP5
      - New Source location
      - Added Upstream-Contact
+  * debian/manpages: Install manpages provided upstream
+  * debian/osm2pgsql.1: removed
 
  -- Andreas Tille <tille at debian.org>  Tue, 17 Sep 2013 23:21:42 +0200
 
diff --git a/debian/manpages b/debian/manpages
index b351308..7fc9e0a 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1 +1 @@
-debian/osm2pgsql.1
+docs/*.1
diff --git a/debian/osm2pgsql.1 b/debian/osm2pgsql.1
deleted file mode 100644
index 5f008ec..0000000
--- a/debian/osm2pgsql.1
+++ /dev/null
@@ -1,222 +0,0 @@
-.TH OSM2PGSQL 1 "September 23, 2012"
-.\" Please adjust this date whenever revising the manpage.
-.SH NAME
-osm2pgsql \- Openstreetmap data to PostgreSQL converter.
-.SH SYNOPSIS
-.B osm2pgsql
-.RI [ options ] " planet.osm"
-.br
-.B osm2pgsql
-.RI [ options ] " planet.osm.{gz,bz2,pbf}"
-.br
-.B osm2pgsql
-.RI [ options ] " file1.osm file2.osm file3.osm"
-.br
-.SH DESCRIPTION
-This manual page documents briefly the
-.B osm2pgsql
-command.
-.PP
-.B osm2pgsql
-imports data from OSM file(s) into a PostgreSQL database
-suitable for use by the Mapnik renderer.
-.br
-OSM planet snapshots can be downloaded from http://planet.openstreetmap.org
-.PP
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-\fB\-a\fR, \fB\-\-append
-Add the OSM file into the database without removing
-existing data.
-.TP
-\fB\-b\fR, \fB\-\-bbox
-Apply a bounding box filter on the imported data
-Must be specified as: minlon,minlat,maxlon,maxlat
-e.g. \fB\-\-bbox\fR \-0.5,51.25,0.5,51.75
-.TP
-\fB\-c\fR, \fB\-\-create
-Remove existing data from the database. This is the
-default if \fB\-\-append\fR is not specified.
-.TP
-\fB\-d\fR, \fB\-\-database
-The name of the PostgreSQL database to connect
-to (default: \fIgis\fR).
-.TP
-\fB\-i\fR, \fB\-\-tablespace\-index
-The name of the PostreSQL tablespace where all indexes will be created.
-If unset, use db's default; \fB\-i\fR is equivalent to setting
-\fB\-\-tablespace\-main\-index\fR and \fB\-\-tablespace\-slim\-index\fR
-.br
-.br
-The following options allow more fine-grained control:
-.br
-\fB\-\-tablespace\-main\-data\fR
-tablespace for main tables
-.br
-\fB\-\-tablespace\-main\-index\fR
-tablespace for main table indexes
-.br
-\fB\-\-tablespace\-slim\-data\fR
-tablespace for slim mode tables
-.br
-\fB\-\-tablespace\-slim\-index\fR
-tablespace for slim mode indexes
-.TP
-\fB\-l\fR, \fB\-\-latlong
-Store data in degrees of latitude & longitude.
-.TP
-\fB\-m\fR, \fB\-\-merc
-Store data in proper spherical mercator (default)
-.TP
-\fB\-M\fR, \fB\-\-oldmerc
-Store data in the legay OSM mercator format
-.TP
-\fB\-E\fR, \fB\-\-proj num
-Use projection \fIEPSG:num\fR
-.TP
-\fB\-u\fR, \fB\-\-utf8\-sanitize
-Repair bad UTF8 input data (present in planet
-dumps prior to August 2007). Adds about 10% overhead.
-.TP
-\fB\-p\fR, \fB\-\-prefix
-Prefix for table names (default \fIplanet_osm\fR)
-.TP
-\fB\-s\fR, \fB\-\-slim
-Store temorary data in the database. This greatly reduces the RAM usage but is much slower.
-This switch is required if you want to update with \fB\-\-append\fR later.
-.TP
-\fB\-\-drop
-Used with \fB\-\-slim\fR option to drop temporary tables after import, eliminating the
-ability to apply updates.
-.TP
-\fB\-S\fR, \fB\-\-style
-Location of the style file. Default to \fI/usr/share/osm2pgsql/default.style\fR
-.TP
-\fB\-C\fR, \fB\-\-cache
-Use up to this this many MB for caching nodes. Default is 800MB.
-.TP
-\fB\-U\fR, \fB\-\-username
-Postgresql user name.
-.TP
-\fB\-W\fR, \fB\-\-password
-Force password prompt.
-If omitted, password will be sourced from prompt or PGPASS environment variable.
-.TP
-\fB\-H\fR, \fB\-\-host
-Database server hostname or socket location.
-.TP
-\fB\-P\fR, \fB\-\-port
-Database server port.
-.TP
-\fB\-e\fR, \fB\-\-expire-tiles \fR[\fImin_zoom\fR-]\fImax_zoom\fR
-Create a tile expiry list.
-.TP
-\fB\-o\fR, \fB\-\-expire-output filename
-Output filename for expired tiles list.
-.TP
-\fB\-r\fR, \fB\-\-input-reader
-Input frontend.
-.br
-\fIlibxml2\fR - Parse XML using libxml2. (default)
-.br
-\fIprimitive\fR - Primitive XML parsing.
-.br
-\fIpbf\fR - OSM binary format.
-.TP
-\fB\-O\fR, \fB\-\-output
-Output backend.
-.br
-\fIpgsql\fR - Output to a PostGIS database. (default)
-.br
-\fIgazetteer\fR - Output to a PostGIS database suitable for gazetteer.
-.br
-\fInull\fR - No output. Useful for testing.
-.TP
-\fB\-x\fR, \fB\-\-extra-attributes
-Include attributes for each object in the database.
-.br
-This includes the username, userid, timestamp and version.
-.br
-\fINote\fR: this option also requires additional entries in your style file.
-.TP
-\fB\-k\fR, \fB\-\-hstore
-Add tags without column to an additional hstore (key/value) column to postgresql tables
-.TP
-\fB\-\-hstore\-match\-only\fR
-Only keep objects that have a value in one of the columns (normal action with
-\fB\-\-hstore\fR is to keep all objects)
-.TP
-\fB-j\fR, \fB\-\-hstore\-all
-Add all tags to an additional hstore (key/value) column in postgresql tables
-.TP
-\fB\-z\fR, \fB\-\-hstore-column
-Add an additional hstore (key/value) column to containing all tags
-that start with the specified string, for example \fB\-\-hstore\-column\fR "name:" will
-produce an extra hstore column that contains all name:xx tags
-.TP
-\fB\-G\fR, \fB\-\-multi-geometry
-Generate multi-geometry features in postgresql tables.
-.TP
-\fB\-K\fR, \fB\-\-keep-coastlines
-Keep coastline data rather than filtering it out.
-.br
-By default \fInatural=coastline\fR tagged data will be discarded based on the
-assumption that post-processed Coastline Checker shapefiles will be used.
-.TP
-\fB\-\-number\-processes\fR \fInum_processes\fR
-Specifies the number of parallel processes used for certain operations
-Default is 1
-.TP
-\fB\-I\fR, \fB\-\-disable\-parallel\-indexing\fR
-Disable indexing all tables concurrently.
-.TP
-\fB\-\-unlogged\fR
-Use unlogged tables (lost on crash but faster). Requires PostgreSQL 9.1.
-.TP
-\fB\-\-cache\-strategy\fR
-Specifies the method used to cache nodes in ram. Available options are:
-.br
-\fIdense\fR - caching strategy optimised for full planet import
-.br
-\fIchunked\fR - caching strategy optimised for non-contigouse memory allocation
-.br
-\fIsparse\fR - caching strategy optimised for small extracts
-.br
-\fIoptimized\fR - automatically combines dense and sparse strategies for optimal storage efficiency.
-optimized may use twice as much virtual memory, but no more physical memory (default)
-.TP
-\fB\-\-flat\-nodes\fR
-Specifies the flat file to use to persistently store node information in slim
-mode instead of in pgsql.This file is a single > 16Gb large file. This method
-is only recomended for full planet imports as it doesn't work well with small
-extracts. The default is disabled.
-.TP
-\fB\-h\fR, \fB\-\-help
-Help information.
-.br
-Add \fB\-vh\fR to display supported projections.
-.br
-Use \fB\-E\fR to access any espg projections (usually in /usr/share/proj/epsg)
-.TP
-\fB\-v\fR, \fB\-\-verbose
-Verbose output.
-.PP
-.SH SUPPORTED PROJECTIONS
-Latlong             (\-l) SRS:  4326 (none)
-.br       
-WGS84 Mercator      (\-M) SRS:  3395 +proj=merc +datum=WGS84  +k=1.0 +units=m +over +no_defs
-.br
-Spherical Mercator  (\-m) SRS:900913 +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs +over
-.PP
-.SH SEE ALSO
-.BR proj (1),
-.BR postgres (1).
-.br
-.SH AUTHOR
-osm2pgsql was written by Jon Burgess and Artem Pavlenko.
-.PP
-This manual page was written by Andreas Putzo <andreas at putzo.net>,
-for the Debian project (but may be used by others).

-- 
OpenStreetMap data to PostgreSQL converter

More information about the Pkg-grass-devel mailing list