[SCM] tilestache branch, master, updated. debian/1.31.0-1-5-g2c1428d

[Andrew Harvey]

The following commit has been merged in the master branch:
commit 1be8cc6b8f7a1181944c72273e132d831c825952
Author: Andrew Harvey <andrew.harvey4 at gmail.com>
Date:   Fri Jul 27 22:07:56 2012 +1000

    Patches refreshed

diff --git a/debian/changelog b/debian/changelog
index 69656c8..0440795 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 tilestache (1.39.0-1) UNRELEASED; urgency=low
 
   * New upstream version
+  * Patches refreshed
 
- -- Andrew Harvey <andrew.harvey4 at gmail.com>  Fri, 27 Jul 2012 21:45:06 +1000
+ -- Andrew Harvey <andrew.harvey4 at gmail.com>  Fri, 27 Jul 2012 22:11:16 +1000
 
 tilestache (1.31.0-1) unstable; urgency=low
 
diff --git a/debian/patches/01-fix_manpages.patch b/debian/patches/01-fix_manpages.patch
index 1ffaf82..c10851f 100644
--- a/debian/patches/01-fix_manpages.patch
+++ b/debian/patches/01-fix_manpages.patch
@@ -9,13 +9,16 @@ Forwarded: no
 
 --- tilestache.orig/man/tilestache-seed.1
 +++ tilestache/man/tilestache-seed.1
-@@ -54,10 +54,10 @@ More information in http://tilestache.or
+@@ -54,13 +54,13 @@
  Optional output file for tiles, will be created as an MBTiles 1.1 tileset. See http://mbtiles.org for more information.
  .TP
  .B \-\-from\-mbtiles
 -Optional input file for tiles, will be read as an MBTiles 1.1 tileset. See http://mbtiles.org for more information. Overrides --extension, --bbox and --padding (this may change).
 +Optional input file for tiles, will be read as an MBTiles 1.1 tileset. See http://mbtiles.org for more information. Overrides \-\-extension, \-\-bbox and \-\-padding (this may change).
  .TP
+ .B \-\-to-s3
+ Optional output bucket for tiles, will be populated with tiles in a standard Z/X/Y layout. Three required arguments: AWS access-key, secret, and bucket name.
+ .TP
  .B \-\-tile\-list
 -Optional file of tile coordinates, a simple text list of Z/X/Y coordinates. Overrides --bbox and --padding.
 +Optional file of tile coordinates, a simple text list of Z/X/Y coordinates. Overrides \-\-bbox and \-\-padding.

-- 
map tiles caching system