[DebianGIS-dev] [SCM] tilestache branch, master, updated. debian/1.2.2-1-12-gd2247dc

[David Paleino]

The following commit has been merged in the master branch:
commit eabd8e38c4a704c9b422f85ba8ce3667f70a55d0
Author: David Paleino <dapal at debian.org>
Date:   Mon Jan 24 12:41:57 2011 +0100

    Manpages have been merged upstream, fix their location

diff --git a/debian/changelog b/debian/changelog
index cab2b36..93830d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ tilestache (1.6.1-1) UNRELEASED; urgency=low
 
   * New upstream release
   * Add Recommends on python-werkzeug
+  * Manpages have been merged upstream, fix their location
 
- -- David Paleino <dapal at debian.org>  Mon, 24 Jan 2011 12:40:13 +0100
+ -- David Paleino <dapal at debian.org>  Mon, 24 Jan 2011 12:41:45 +0100
 
 tilestache (1.2.2-1) unstable; urgency=low
 
diff --git a/debian/man/tilestache-render.1 b/debian/man/tilestache-render.1
deleted file mode 100644
index 9c385a9..0000000
--- a/debian/man/tilestache-render.1
+++ /dev/null
@@ -1,32 +0,0 @@
-.TH TILESTACHE-RENDER 1 "Nov 10, 2010"
-.SH NAME
-tilestache-render \- render tiles from tilestache
-.SH SYNOPSIS
-.B tilestache-render
-.RI [ options ] " coordinates" ...
-.SH DESCRIPTION
-This manual page documents briefly the \fBtilestache-render\fR command.
-.PP
-\fBtilestache-render\fP is used to render tiles from \fBTileStache\fR.
-.br
-Each coordinate in the argument list should look like "12/656/1582.png",
-similar to URL paths in web server usage. Coordinates are processed in
-order, each one rendered to an image file in a temporary location and
-output to stdout.
-.SH REQUIRED OPTIONS
-.TP
-\fB-c\fR, \fB\-\-config\fR \fIfile\fR
-Path to configuration file.
-.TP
-\fB-l\fR, \fB\-\-layer\fR \fIlayer\fR
-Layer name from configuration.
-.SH OPTIONS
-.B \-h, \-\-help
-Show summary of options.
-.SH SEE ALSO
-.BR tilestache-seed (1)
-.SH AUTHOR
-\fBTileStache\fR was written by Michal Migurski <mike at stamen.com>.
-.PP
-This manual page was written by David Paleino <dapal at debian.org>,
-for the Debian project (and may be used by others).
diff --git a/debian/man/tilestache-seed.1 b/debian/man/tilestache-seed.1
deleted file mode 100644
index a393822..0000000
--- a/debian/man/tilestache-seed.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.TH TILESTACHE-SEED 1 "Nov 10, 2010"
-.SH NAME
-tilestache-seed \- seed a single layer in your TileStache configuration
-.SH SYNOPSIS
-.B tilestache-seed
-.RI [ options ] " zoom" ...
-.SH DESCRIPTION
-This manual page documents briefly the \fBtilestache-seed\fR command.
-.PP
-\fBtilestache-seed\fR seeds a single layer in your TileStache configuration.
-No images are returned, but TileStache ends up with a pre-filled cache.
-Bounding box is given as a pair of lat/lon coordinates, e.g. "37.788
-\-122.349 37.833 \-122.246". Output is a list of tile paths as they are
-created.
-.br
-Configuration, BBox, and Layer options are required.
-.SH REQUIRED OPTIONS
-.TP
-\fB\-c\fR, \fB\-\-config\fR \fIfile\fR
-Path to configuration file. \fBRequired\fR.
-.TP
-\fB-l\fR, \fB\-\-layer\fR \fIlayer\fR
-Layer name from configuration. \fBRequired\fR.
-.TP
-\fB-b\fR, \fB\-\-bbox\fR \fIsouth\fR \fIwest\fR \fInorth\fR \fIeast\fR
-Bounding box in floating point geographic coordinates. \fBRequired\fR.
-.SH OPTIONS
-.TP
-.B \-h, \-\-help
-Show summary of options.
-.TP
-\fB-p\fR, \fB\-\-padding\fR \fIpadding\fR
-Extra margin of tiles to add around bounded area. Default value is 0 (no extra tiles).
-.TP
-\fB-e\fR, \fB\-\-extension\fR \fIextension\fR
-Optional file type for rendered tiles. Default value is "png".
-.TP
-\fB-f\fR, \fB\-\-progress-file\fR \fIfile\fR
-Optional JSON progress file that gets written on each iteration, so you don't have to pay close attention.
-.TP
-.B \-q
-Suppress chatty output, \-\-progress-file works well with this.
-.TP
-.B \-i, \-\-include-path
-Add the following colon-separated list of paths to Python's include path (aka sys.path).
-.SH SEE ALSO
-.BR tilestache-render (1)
-.SH AUTHOR
-\fBTileStache\fR was written by Michal Migurski <mike at stamen.com>.
-.PP
-This manual page was written by David Paleino <dapal at debian.org>,
-for the Debian project (and may be used by others).
diff --git a/debian/manpages b/debian/manpages
index a397f81..09f7d98 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1,2 +1,2 @@
-debian/man/tilestache-render.1
-debian/man/tilestache-seed.1
+man/tilestache-render.1
+man/tilestache-seed.1

-- 
map tiles caching system