[SCM] tilestache branch, master, updated. debian/1.31.0-1-25-g846dd81

[Andrew Harvey]

The following commit has been merged in the master branch:
commit 5f9b7ae98e18675d0946060315138aa3a39c8b08
Author: Andrew Harvey <andrew.harvey4 at gmail.com>
Date:   Fri Mar 15 21:58:20 2013 +1100

    drop patch 02-fix_shebang.patch since it is included upstream

diff --git a/debian/changelog b/debian/changelog
index f924fc4..c877845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ tilestache (1.46.2-1) UNRELEASED; urgency=low
     #650057)
   * Add new patch for compatibility with modestmaps >= 2.0.0
   * Add missing tilestache-clean manpage
+  * Drop 02-fix_shebang.patch since it is included upstream now
 
  -- Andrew Harvey <andrew.harvey4 at gmail.com>  Fri, 15 Mar 2013 21:53:11 +1100
 
diff --git a/debian/patches/02-fix_shebang.patch b/debian/patches/02-fix_shebang.patch
deleted file mode 100644
index a0da8dd..0000000
--- a/debian/patches/02-fix_shebang.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: add shebang so that it can be run directly
-Forwarded: no
-
----
- scripts/tilestache-compose.py |    1 +
- 1 file changed, 1 insertion(+)
-
---- tilestache.orig/scripts/tilestache-compose.py
-+++ tilestache/scripts/tilestache-compose.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from sys import stderr, path
- from tempfile import mkstemp
- from thread import allocate_lock
diff --git a/debian/patches/series b/debian/patches/series
index 81e34be..74ebdf9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 00-use_system_font.patch
 01-fix_manpages.patch
-02-fix_shebang.patch
 03-use_system_modestmaps.patch
 04-fix_for_newer_modestmaps.patch

-- 
map tiles caching system