[SCM] tilestache branch, master, updated. debian/1.31.0-1-7-g6640232

[Andrew Harvey]

The following commit has been merged in the master branch:
commit 66402327b6a9733af92c145696fa68ef51acc4a9
Author: Andrew Harvey <andrew.harvey4 at gmail.com>
Date:   Sat Jul 28 11:15:25 2012 +1000

    add patch for modestmaps >=2.0.0 compatibility

diff --git a/debian/changelog b/debian/changelog
index 2ae4857..8ce8cdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ tilestache (1.39.0-1) UNRELEASED; urgency=low
   * Patches refreshed
   * Update docs with new README file name
   * Add new patch to use system modestmaps javascript library
+  * Add new patch for compatibility with modestmaps >= 2.0.0
 
  -- Andrew Harvey <andrew.harvey4 at gmail.com>  Sat, 28 Jul 2012 09:10:32 +1000
 
diff --git a/debian/control b/debian/control
index c3de652..1972a2f 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Depends:
  , python-modestmaps (>= 1.3.0)
  , python-werkzeug
  , ttf-dejavu-core
- , libjs-modestmaps (= 1.0.0)
+ , libjs-modestmaps (>= 2.0.0)
 Recommends:
  python-mapnik
 Description: map tiles caching system
diff --git a/debian/patches/04-fix_for_newer_modestmaps.patch b/debian/patches/04-fix_for_newer_modestmaps.patch
new file mode 100644
index 0000000..6a42063
--- /dev/null
+++ b/debian/patches/04-fix_for_newer_modestmaps.patch
@@ -0,0 +1,29 @@
+Description: fix for modestmaps versions >= 2.0.0
+ Modestmaps >= 2.0.0 have a different API to 1.0.0. This patch makes the code
+ >=2.0.0 compatible.
+Author: Andrew Harvey <andrew.harvey4 at gmail.com>
+Forwarded: no
+
+---
+ TileStache/Core.py |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+--- tilestache.orig/TileStache/Core.py
++++ tilestache/TileStache/Core.py
+@@ -593,15 +593,12 @@
+     <script type="text/javascript" defer>
+     <!--
+         var template = '{Z}/{X}/{Y}.%(ext)s';
+-        var provider = new com.modestmaps.TemplatedMapProvider(template);
+-        var map = new MM.Map('map', provider, null, [
++        var map = new MM.Map('map', new MM.TemplatedLayer(template), null, [
+             new MM.TouchHandler(),
+             new MM.DragHandler(),
+             new MM.DoubleClickHandler()
+         ]);
+         map.setCenterZoom(new com.modestmaps.Location(%(lat).6f, %(lon).6f), %(zoom)d);
+-        // hashify it
+-        new MM.Hash(map);
+     //-->
+     </script>
+ </body>
diff --git a/debian/patches/series b/debian/patches/series
index 251d81f..81e34be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 01-fix_manpages.patch
 02-fix_shebang.patch
 03-use_system_modestmaps.patch
+04-fix_for_newer_modestmaps.patch

-- 
map tiles caching system