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

2012-07-27 Thread Andrew Harvey
The following commit has been merged in the master branch:
commit d0d214b051c8202e185421f9864d7195f70248c1
Merge: 72bdc1c59993922ac7e673d1237ea2543aea1047 
6d80914f0172fe5bab267cd97a35cccb15a019c6
Author: Andrew Harvey andrew.harv...@gmail.com
Date:   Fri Jul 27 21:44:12 2012 +1000

Merge tag 'upstream/1.39.0'

Upstream version 1.39.0


-- 
map tiles caching system

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


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

2012-07-27 Thread Andrew Harvey
The following commit has been merged in the master branch:
commit ef136aeb3a478ddf08a0f777330957d5b47c5b95
Author: Andrew Harvey andrew.harv...@gmail.com
Date:   Fri Jul 27 21:46:16 2012 +1000

New upstream version

diff --git a/debian/changelog b/debian/changelog
index aa5e6a3..69656c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tilestache (1.39.0-1) UNRELEASED; urgency=low
+
+  * New upstream version
+
+ -- Andrew Harvey andrew.harv...@gmail.com  Fri, 27 Jul 2012 21:45:06 +1000
+
 tilestache (1.31.0-1) unstable; urgency=low
 
   * New upstream version

-- 
map tiles caching system

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


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

2012-07-27 Thread Andrew Harvey
The following commit has been merged in the master branch:
commit 1be8cc6b8f7a1181944c72273e132d831c825952
Author: Andrew Harvey andrew.harv...@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.harv...@gmail.com  Fri, 27 Jul 2012 21:45:06 +1000
+ -- Andrew Harvey andrew.harv...@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

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


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

2012-07-27 Thread Andrew Harvey
The following commit has been merged in the master branch:
commit 2c1428d4443844c0ae0e589594bb67025165e5a4
Author: Andrew Harvey andrew.harv...@gmail.com
Date:   Fri Jul 27 22:22:14 2012 +1000

Update debian/docs to use the new README.md file

diff --git a/debian/changelog b/debian/changelog
index 0440795..f93718b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ tilestache (1.39.0-1) UNRELEASED; urgency=low
 
   * New upstream version
   * Patches refreshed
+  * Update docs with new README file name
 
- -- Andrew Harvey andrew.harv...@gmail.com  Fri, 27 Jul 2012 22:11:16 +1000
+ -- Andrew Harvey andrew.harv...@gmail.com  Fri, 27 Jul 2012 22:21:28 +1000
 
 tilestache (1.31.0-1) unstable; urgency=low
 
diff --git a/debian/docs b/debian/docs
index e845566..b43bf86 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-README
+README.md

-- 
map tiles caching system

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel