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

Sat Jul 28 03:12:53 UTC 2012

The following commit has been merged in the master branch:
commit 7edc1740898da86a43bd5f094921102928c9b8aa
Author: Andrew Harvey <andrew.harvey4 at gmail.com>
Date:   Sat Jul 28 09:08:21 2012 +1000

    add patch to use system modestmaps library

diff --git a/debian/changelog b/debian/changelog
index f93718b..2ae4857 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ tilestache (1.39.0-1) UNRELEASED; urgency=low
   * New upstream version
   * Patches refreshed
   * Update docs with new README file name
+  * Add new patch to use system modestmaps javascript library
 
- -- Andrew Harvey <andrew.harvey4 at gmail.com>  Fri, 27 Jul 2012 22:21:28 +1000
+ -- Andrew Harvey <andrew.harvey4 at gmail.com>  Sat, 28 Jul 2012 09:10:32 +1000
 
 tilestache (1.31.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 9738278..c3de652 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Depends:
  , python-modestmaps (>= 1.3.0)
  , python-werkzeug
  , ttf-dejavu-core
+ , libjs-modestmaps (= 1.0.0)
 Recommends:
  python-mapnik
 Description: map tiles caching system
diff --git a/debian/patches/03-use_system_modestmaps.patch b/debian/patches/03-use_system_modestmaps.patch
new file mode 100644
index 0000000..320822a
--- /dev/null
+++ b/debian/patches/03-use_system_modestmaps.patch
@@ -0,0 +1,19 @@
+Description: use system modestmaps rather than remote instance
+Author: Andrew Harvey <andrew.harvey4 at gmail.com>
+Bug-Debian: http://bugs.debian.org/650057
+Forwarded: not-needed
+---
+ TileStache/Core.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- tilestache.orig/TileStache/Core.py
++++ tilestache/TileStache/Core.py
+@@ -576,7 +576,7 @@
+ <html>
+ <head>
+     <title>TileStache Preview: %(layername)s</title>
+-    <script src="http://code.modestmaps.com/tilestache/modestmaps.min.js" type="text/javascript"></script>
++    <script src="/javascript/modestmaps/modestmaps.min.js" type="text/javascript"></script>
+     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;">
+     <style type="text/css">
+         html, body, #map {
diff --git a/debian/patches/series b/debian/patches/series
index 879e141..251d81f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 00-use_system_font.patch
 01-fix_manpages.patch
 02-fix_shebang.patch
+03-use_system_modestmaps.patch

-- 
map tiles caching system

