[SCM] mapcache branch, master, updated. upstream/1.0.0-37-g9911706

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 678c17e824ace68f8677b3f73906be298b1f2e82
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jul 18 00:04:20 2013 +0200

    Add patch to fix deletion of map tiles in seeder's delete mode.

diff --git a/debian/changelog b/debian/changelog
index 2e23626..076329e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ mapcache (1.0.0-3) UNRELEASED; urgency=low
   * Add patch to set the page height to 100% for the demo service.
   * Add patch to use 4 space indenting in the generated HTML.
   * Add patch to return non-zero exit status if errors occured in mapcache_seed.
+  * Add patch to fix deletion of map tiles in seeder's delete mode.
   * Add watch file.
   * Add maintainer scripts for libmapcache0 to call ldconfig.
 
diff --git a/debian/patches/mapcache_seed_delete_mode.patch b/debian/patches/mapcache_seed_delete_mode.patch
new file mode 100644
index 0000000..e9f4fa8
--- /dev/null
+++ b/debian/patches/mapcache_seed_delete_mode.patch
@@ -0,0 +1,14 @@
+Description: Fix deletion of map tiles in seeder's delete mode
+Origin: https://github.com/mapserver/mapcache/commit/fde669fa6a9829afcb3d3be234abf38c1cf2aebe
+Last-Update: 2013-07-15
+--- a/util/mapcache_seed.c
++++ b/util/mapcache_seed.c
+@@ -569,7 +569,7 @@ void cmd_worker()
+       tile->z = z;
+       action = examine_tile(&cmd_ctx, tile);
+ 
+-      if(action == MAPCACHE_CMD_SEED || action == MAPCACHE_CMD_TRANSFER) {
++      if(action == MAPCACHE_CMD_SEED || action == MAPCACHE_CMD_DELETE || action == MAPCACHE_CMD_TRANSFER) {
+         //current x,y,z needs seeding, add it to the queue
+         struct seed_cmd cmd;
+         cmd.x = x;
diff --git a/debian/patches/series b/debian/patches/series
index 3a9d9be..7387d1a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ demo_service_list_newlines.patch
 demo_service_page_height.patch
 demo_service_indenting.patch
 mapcache_seed_non_zero_exit.patch
+mapcache_seed_delete_mode.patch

-- 
Packaging for MapCache