This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository osm2pgsql.
commit 2775c833b9175f9d8a44112bd348507a10ef8199 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Wed Apr 30 16:26:15 2014 +0200 Add patch to fix hyphen-used-as-minus-sign warnings. --- debian/changelog | 1 + debian/patches/01-hyphen-used-as-minus-sign.patch | 146 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 148 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0c14322..c23de83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ osm2pgsql (0.84.0-1) UNRELEASED; urgency=low * Drop get-orig-source target, upstream moved from OSM SVN to GitHub. * Add build dependency on liblua5.2-dev and lua5.2. * Append CPPFLAGS to CFLAGS & CXXFLAGS to use -D_FORTIFY_SOURCE=2. + * Add patch to fix hyphen-used-as-minus-sign warnings. -- Bas Couwenberg <sebas...@xs4all.nl> Wed, 30 Apr 2014 13:05:29 +0200 diff --git a/debian/patches/01-hyphen-used-as-minus-sign.patch b/debian/patches/01-hyphen-used-as-minus-sign.patch new file mode 100644 index 0000000..7692a5d --- /dev/null +++ b/debian/patches/01-hyphen-used-as-minus-sign.patch @@ -0,0 +1,146 @@ +Description: Fix hyphen-used-as-minus-sign lintian warnings by escaping -. +Author: Bas Couwenberg <sebas...@xs4all.nl> +--- a/docs/osm2pgsql.1 ++++ b/docs/osm2pgsql.1 +@@ -36,7 +36,7 @@ database up to date. + .PP + .SH OPTIONS + These programs follow the usual GNU command line syntax, with long +-options starting with two dashes (`-'). ++options starting with two dashes (`\-'). + A summary of options is included below. + .TP + \fB\-a\fR|\-\-append +@@ -85,7 +85,7 @@ Store data in the legacy OSM Mercator fo + Use projection EPSG:num + .TP + \fB\-u\fR|\-\-utf8\-sanitize +-Repair bad UTF-8 input data (present in planet ++Repair bad UTF\-8 input data (present in planet + dumps prior to August 2007). Adds about 10% overhead. + .TP + \fB\-p\fR|\-\-prefix prefix_string +@@ -119,11 +119,11 @@ imported into database columns and which + \fB\-C\fR|\-\-cache num + Only for slim mode: Use up to num many MB of RAM for caching nodes. Giving osm2pgsql sufficient cache + to store all imported nodes typically greatly increases the speed of the import. Each cached node +-requires 8 bytes of cache, plus about 10% - 30% overhead. For a current OSM full planet import with ++requires 8 bytes of cache, plus about 10% \- 30% overhead. For a current OSM full planet import with + its ~ 1.9 billion nodes, a good value would be 17000 if you have enough RAM. If you don't have enough + RAM, it is likely beneficial to give osm2pgsql close to the full available amount of RAM. Defaults to 800. + .TP +-\fB\ \fR\-\-cache-strategy strategy ++\fB\ \fR\-\-cache\-strategy strategy + There are a number of different modes in which osm2pgsql can organize its + node cache in RAM. These are optimized for different assumptions of the data + and the hardware resources available. Currently available strategies are +@@ -150,16 +150,16 @@ Database server hostname or socket locat + \fB\-P\fR|\-\-port num + Database server port. + .TP +-\fB\-e\fR|\-\-expire-tiles [min_zoom-]max-zoom ++\fB\-e\fR|\-\-expire\-tiles [min_zoom\-]max\-zoom + Create a tile expiry list. + .TP +-\fB\-o\fR|\-\-expire-output /path/to/expire.list ++\fB\-o\fR|\-\-expire\-output /path/to/expire.list + Output file name for expired tiles list. + .TP + \fB\-o\fR|\-\-output +-Specifies the output back-end or database schema to use. Currently ++Specifies the output back\-end or database schema to use. Currently + osm2pgsql supports \fBpgsql\fR, \fBgazetteer\fR and \fBnull\fR. \fBpgsql\fR is +-the default output back-end / schema and is optimized for rendering with Mapnik. ++the default output back\-end / schema and is optimized for rendering with Mapnik. + \fBgazetteer\fR is a db schema optimized for geocoding and is used by Nominatim. + \fBnull\fR does not write any output and is only useful for testing. + .TP +@@ -176,27 +176,27 @@ Add all tags to an additional hstore (ke + .TP + \fB\-z\fR|\-\-hstore\-column key_name + Add an additional hstore (key/value) column containing all tags +-that start with the specified string, egg --hstore-column "name:" will ++that start with the specified string, eg \-\-hstore\-column "name:" will + produce an extra hstore column that contains all name:xx tags + .TP + \fB\ \fR\-\-hstore\-match\-only + Only keep objects that have a value in one of the columns +-(normal action with --hstore is to keep all objects). ++(normal action with \-\-hstore is to keep all objects). + .TP +-\fB\ \fR\-\-hstore-add-index ++\fB\ \fR\-\-hstore\-add\-index + Create indices for the hstore columns during import. + .TP + \fB\-G\fR|\-\-melts\-geometry +-Normally osm2pgsql splits multi-part geometries into separate database rows per part. ++Normally osm2pgsql splits multi\-part geometries into separate database rows per part. + A single OSM id can therefore have several rows. With this option, PostgreSQL instead +-generates multi-geometry features in the PostgreSQL tables. ++generates multi\-geometry features in the PostgreSQL tables. + .TP +-\fB\-K\fR|\-\-keep-coastlines ++\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 shape files will be used. + .TP +-\fB\ \fR\-\-exclude-invalid-polygon ++\fB\ \fR\-\-exclude\-invalid\-polygon + OpenStreetMap data is defined in terms of nodes, ways and relations and not in + terms of actual geometric features. Osm2pgsql therefore tries to build postgis + geometries out of this data representation. However not all ways and relations +@@ -207,31 +207,31 @@ simply dropped from the database. + .TP + \fB\ \fR\-\-unlogged + Use postgresql's unlogged tables for storing data. This requires PostgreSQL 9.1 +-or above. Data written to unlogged tables is not written to PostgreSQL's write-ahead log, ++or above. Data written to unlogged tables is not written to PostgreSQL's write\-ahead log, + which makes them considerably faster than ordinary tables. However, they are not +-crash-safe: an unlogged table is automatically truncated after a crash or unclean shutdown. ++crash\-safe: an unlogged table is automatically truncated after a crash or unclean shutdown. + .TP + \fB\ \fR\-\-number\-processes num + Specifies the number of parallel processes used for certain operations. If disks are + fast enough e.g. if you have an SSD, then this can greatly increase speed of +-the "going over pending ways" and "going over pending relations" stages on a multi-core ++the "going over pending ways" and "going over pending relations" stages on a multi\-core + server. + .TP +-\fB\-I\fR|\-\-disable-parallel-indexing ++\fB\-I\fR|\-\-disable\-parallel\-indexing + By default osm2pgsql initiates the index building on all tables in parallel to increase + performance. This can be disadvantages on slow disks, or if you don't have + enough RAM for PostgreSQL to perform up to 7 parallel index building processes + (e.g. because maintenance_work_mem is set high). + .TP +-\fB\ \fR\-\-flat-nodes /path/to/nodes.cache +-The flat-nodes mode is a separate method to store slim mode node information on disk. ++\fB\ \fR\-\-flat\-nodes /path/to/nodes.cache ++The flat\-nodes mode is a separate method to store slim mode node information on disk. + Instead of storing this information in the main PostgreSQL database, this mode creates + its own separate custom database to store the information. As this custom database + has application level knowledge about the data to store and is not general purpose, + it can store the data much more efficiently. Storing the node information for the full + planet requires about 100GB in PostgreSQL, the same data is stored in only ~16GB using +-the flat-nodes mode. This can also increase the speed of applying diff files. This option +-activates the flat-nodes mode and specifies the location of the database file. It is a ++the flat\-nodes mode. This can also increase the speed of applying diff files. This option ++activates the flat\-nodes mode and specifies the location of the database file. It is a + single large > 16GB file. This mode is only recommended for full planet imports + as it doesn't work well with small extracts. The default is disabled. + .TP +@@ -244,11 +244,11 @@ Add \fB\-v\fR to display supported proje + Verbose output. + .PP + .SH SUPPORTED PROJECTIONS +-Latlong (-l) SRS: 4326 (none) ++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 ++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), diff --git a/debian/patches/series b/debian/patches/series index b75ec23..ca82ca2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 00-fix_build.patch +01-hyphen-used-as-minus-sign.patch -- 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