The following commit has been merged in the master branch:
commit f00f3cb54f8f5ebad67c10612e0ba6d31328212b
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Wed Sep 11 20:30:01 2013 +0200
Drop obsolete patch: mapcache_seed_delete_mode.patch.
diff --git a/debian/changelog b/debian/changelog
index 3fefdb4..8fdacc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ mapcache (1.1dev+ee206af-1) UNRELEASED; urgency=low
- demo_service_page_height.patch (applied upstream)
- demo_service_indenting.patch (applied upstream)
- mapcache_seed_non_zero_exit.patch (applied upstream)
+ - mapcache_seed_delete_mode.patch (applied upstream)
-- Bas Couwenberg <sebas...@xs4all.nl> Wed, 11 Sep 2013 19:16:06 +0200
diff --git a/debian/patches/mapcache_seed_delete_mode.patch
b/debian/patches/mapcache_seed_delete_mode.patch
deleted file mode 100644
index f578720..0000000
--- a/debian/patches/mapcache_seed_delete_mode.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix deletion of map tiles in seeder's delete mode
-Origin:
https://github.com/mapserver/mapcache/commit/fde669fa6a9829afcb3d3be234abf38c1cf2aebe
-Bug: https://github.com/mapserver/mapcache/pull/78
-Last-Update: 2013-07-15
---- a/util/mapcache_seed.c
-+++ b/util/mapcache_seed.c
-@@ -561,7 +561,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 740c47c..58c17e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
includepath.patch
-mapcache_seed_delete_mode.patch
mapcache_seed_typo.patch
--
Packaging for MapCache
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
