[DebianGIS-dev] r1516 - packages/osm2pgsql/trunk/debian

nd-guest at alioth.debian.org nd-guest at alioth.debian.org
Fri Apr 11 22:44:04 UTC 2008 

Author: nd-guest
Date: 2008-04-11 22:44:03 +0000 (Fri, 11 Apr 2008)
New Revision: 1516

Modified:
   packages/osm2pgsql/trunk/debian/changelog
   packages/osm2pgsql/trunk/debian/copyright
   packages/osm2pgsql/trunk/debian/docs
   packages/osm2pgsql/trunk/debian/osm2pgsql.1
Log:
* New upstream version.
* Update manpage.
* Update copyright.


Modified: packages/osm2pgsql/trunk/debian/changelog
===================================================================
--- packages/osm2pgsql/trunk/debian/changelog	2008-04-11 22:31:28 UTC (rev 1515)
+++ packages/osm2pgsql/trunk/debian/changelog	2008-04-11 22:44:03 UTC (rev 1516)
@@ -1,3 +1,12 @@
+osm2pgsql (0.52.20080408-1) unstable; urgency=low
+
+  * New upstream snapshot. (Closes: #474846)
+  * Adopt rename of readme.txt in debian/docs.
+  * Update manual page from usage output. (Closes: #468767)
+  * Add license and copyright of added file sprompt.c to debian/copyright.
+
+ -- Andreas Putzo <andreas at putzo.net>  Fri, 11 Apr 2008 22:43:08 +0000
+
 osm2pgsql (0.50.20071211-1) unstable; urgency=low
 
   * New upstream snapshot

Modified: packages/osm2pgsql/trunk/debian/copyright
===================================================================
--- packages/osm2pgsql/trunk/debian/copyright	2008-04-11 22:31:28 UTC (rev 1515)
+++ packages/osm2pgsql/trunk/debian/copyright	2008-04-11 22:44:03 UTC (rev 1516)
@@ -11,7 +11,7 @@
 
 Copyright: 
 
-    Copyright (C) 2006,2007 Jon Burgess
+    Copyright (C) 2006,2007,2008 Jon Burgess
     Copyright (C) 2007,2007 Artem Pavlenko
 
 License:
@@ -39,5 +39,28 @@
       License: GPL, see above.
 
 
+sprompt.c:  Copyright (c) 1994, The Regents of the University of California
+            Copyright (c) 1996-2006, PostgreSQL Global Development Group
+
+License:
+
+    Permission to use, copy, modify, and distribute this software and its
+    documentation for any purpose, without fee, and without a written agreement
+    is hereby granted, provided that the above copyright notice and this
+    paragraph and the following two paragraphs appear in all copies.
+    
+    IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+    DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
+    LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
+    DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+    
+    THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+    ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
+    PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+    
+              
 The Debian packaging is (C) 2007, Andreas Putzo <andreas at putzo.net> and
 is licensed under the GPL, see above.

Modified: packages/osm2pgsql/trunk/debian/docs
===================================================================
--- packages/osm2pgsql/trunk/debian/docs	2008-04-11 22:31:28 UTC (rev 1515)
+++ packages/osm2pgsql/trunk/debian/docs	2008-04-11 22:44:03 UTC (rev 1516)
@@ -1 +1 @@
-readme.txt
+README.txt

Modified: packages/osm2pgsql/trunk/debian/osm2pgsql.1
===================================================================
--- packages/osm2pgsql/trunk/debian/osm2pgsql.1	2008-04-11 22:31:28 UTC (rev 1515)
+++ packages/osm2pgsql/trunk/debian/osm2pgsql.1	2008-04-11 22:44:03 UTC (rev 1516)
@@ -1,10 +1,17 @@
-.TH OSM2PGSQL 1 "September 30, 2007"
+.TH OSM2PGSQL 1 "April 12, 2008"
 .\" Please adjust this date whenever revising the manpage.
 .SH NAME
 osm2pgsql \- Openstreetmap data to PostgreSQL converter.
 .SH SYNOPSIS
 .B osm2pgsql
-.RI [ options ] " file1.osm file2.osm file3.osm " ...
+.RI [ options ] " planet.osm"
+.br
+.B osm2pgsql
+.RI [ options ] " planet.osm.{gz,bz2}"
+.br
+.B osm2pgsql
+.RI [ options ] " file1.osm file2.osm file3.osm"
+.br
 .SH DESCRIPTION
 This manual page documents briefly the
 .B osm2pgsql
@@ -21,30 +28,70 @@
 options starting with two dashes (`-').
 A summary of options is included below.
 .TP
-.B \-h, \-\-help
-Show summary of options.
+\fB\-a\fR|\-\-append
+Add the OSM file into the database without removing
+existing data.
 .TP
-.B \-a, \-\-append
-Add the OSM file into the database without removing existing data.
+\fB\-b\fR|\-\-bbox
+Apply a bounding box filter on the imported data
+Must be specified as: minlon,minlat,maxlon,maxlat
+e.g. \fB\-\-bbox\fR \fB\-0\fR.5,51.25,0.5,51.75
 .TP
-.B \-c, \-\-create
-Remove existing data from the database. This is the default if --append is not specified.
+\fB\-c\fR|\-\-create
+Remove existing data from the database. This is the
+default if \fB\-\-append\fR is not specified.
 .TP
-.B \-d, \-\-database
-The name of the PostgreSQL database to connect to (default: gis).
+\fB\-d\fR|\-\-database
+The name of the PostgreSQL database to connect
+to (default: gis).
 .TP
-.B \-l, \-\-latlong
+\fB\-l\fR|\-\-latlong
 Store data in degrees of latitude & longitude.
 .TP
-.B \-u, \-\-utf8\-sanitize
-Repair bad UTF8 input data (present in planet dumps prior to August 2007). Adds about 10% overhead.
+\fB\-m\fR|\-\-merc
+Store data in proper spherical mercator, not OSM merc
 .TP
-.B \-s, \-\-slim
-Store temporary data in the database. This greatly reduces the RAM usage but is much slower.
+\fB\-E\fR|\-\-proj num
+Use projection EPSG:num
 .TP
-.B \-v, \-\-verbose
+\fB\-u\fR|\-\-utf8\-sanitize
+Repair bad UTF8 input data (present in planet
+dumps prior to August 2007). Adds about 10% overhead.
+.TP
+\fB\-p\fR|\-\-prefix
+Prefix for table names (default planet_osm)
+.TP
+\fB\-U\fR|\-\-username
+Postgresql user name.
+.TP
+\fB\-W\fR|\-\-password
+Force password prompt.
+.TP
+\fB\-H\fR|\-\-host
+Database server hostname or socket location.
+.TP
+\fB\-P\fR|\-\-port
+Database server port.
+.TP
+\fB\-h\fR|\-\-help
+Help information.
+.br
+Add \fB\-v\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|\-\-verbose
 Verbose output.
+.PP
+.SH SUPPORTED PROJECTIONS
+Latlong             (-l) SRS:  4326 (none)
+.br       
+WGS84 Mercator      (  ) 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

More information about the Pkg-grass-devel mailing list