[tilestache] 14/22: Refresh patches.

Thu Oct 27 21:40:31 UTC 2016

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository tilestache.

commit 13cd8a8f27255a47c1041a6a081228252064f32a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Oct 27 17:39:38 2016 +0200

    Refresh patches.
---
 debian/changelog                                 |  1 +
 debian/patches/03-use_system_modestmaps.patch    |  4 ++--
 debian/patches/04-fix_for_newer_modestmaps.patch |  2 +-
 debian/patches/pillow-3.0.0.patch                | 18 +++++++++---------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d4a480e..b7e8d6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ tilestache (1.51.2-1) UNRELEASED; urgency=medium
   * Update watch file to use GitHub instead of outdated tilestache.org/download/.
   * Strip © symbol from copyright statements in copyright file.
   * Update dependencies for new upstream release.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 27 Oct 2016 17:15:15 +0200
 
diff --git a/debian/patches/03-use_system_modestmaps.patch b/debian/patches/03-use_system_modestmaps.patch
index 2d2e1ec..0caed71 100644
--- a/debian/patches/03-use_system_modestmaps.patch
+++ b/debian/patches/03-use_system_modestmaps.patch
@@ -8,12 +8,12 @@ Forwarded: not-needed
 
 --- a/TileStache/Core.py
 +++ b/TileStache/Core.py
-@@ -702,7 +702,7 @@ def _preview(layer):
+@@ -733,7 +733,7 @@ def _preview(layer):
  <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;">
+     <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/04-fix_for_newer_modestmaps.patch b/debian/patches/04-fix_for_newer_modestmaps.patch
index 2c44e84..31bc06f 100644
--- a/debian/patches/04-fix_for_newer_modestmaps.patch
+++ b/debian/patches/04-fix_for_newer_modestmaps.patch
@@ -10,7 +10,7 @@ Forwarded: https://github.com/TileStache/TileStache/pull/246
 
 --- a/TileStache/Core.py
 +++ b/TileStache/Core.py
-@@ -724,15 +724,12 @@ def _preview(layer):
+@@ -755,15 +755,12 @@ def _preview(layer):
      <script type="text/javascript" defer>
      <!--
          var template = '{Z}/{X}/{Y}.%(ext)s';
diff --git a/debian/patches/pillow-3.0.0.patch b/debian/patches/pillow-3.0.0.patch
index 7d79f45..68fe0a6 100644
--- a/debian/patches/pillow-3.0.0.patch
+++ b/debian/patches/pillow-3.0.0.patch
@@ -6,34 +6,34 @@ Forwarded: https://github.com/TileStache/TileStache/pull/246
 
 --- a/TileStache/Mapnik.py
 +++ b/TileStache/Mapnik.py
-@@ -128,7 +128,12 @@ class ImageProvider:
+@@ -151,7 +151,12 @@ class ImageProvider:
                  # always release the lock
                  global_mapnik_lock.release()
  
--        img = Image.fromstring('RGBA', (width, height), img.tostring())
+-        img = Image.frombytes('RGBA', (width, height), img.tostring())
 +        if hasattr(Image, 'frombytes'):
 +            # Image.fromstring is deprecated past Pillow 2.0
 +            img = Image.frombytes('RGBA', (width, height), img.tostring())
 +        else:
 +            # PIL still uses Image.fromstring
 +            img = Image.fromstring('RGBA', (width, height), img.tostring())
-         
+ 
          logging.debug('TileStache.Mapnik.ImageProvider.renderArea() %dx%d in %.3f from %s', width, height, time() - start_time, self.mapfile)
-     
+ 
 --- a/TileStache/Pixels.py
 +++ b/TileStache/Pixels.py
-@@ -100,7 +100,13 @@ def apply_palette(image, palette, t_inde
-         
+@@ -101,7 +101,13 @@ def apply_palette(image, palette, t_inde
+ 
          indexes.append(mapping[(r, g, b)])
  
--    output = Image.fromstring('P', image.size, ''.join(indexes))
+-    output = Image.frombytes('P', image.size, ''.join(indexes))
 +    if hasattr(Image, 'frombytes'):
 +        # Image.fromstring is deprecated past Pillow 2.0
 +        output = Image.frombytes('P', image.size, ''.join(indexes))
 +    else:
 +        # PIL still uses Image.fromstring
 +        output = Image.fromstring('P', image.size, ''.join(indexes))
-+ 
++
      bits = int(ceil(log(len(palette)) / log(2)))
-     
+ 
      palette += [(0, 0, 0)] * (256 - len(palette))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/tilestache.git

