[SCM] mapcache branch, master, updated. upstream/1.0.0-86-g0771daf

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 60b71e6e6cc9292e9c75ac71840ac5dcceb547c0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 17 22:08:56 2013 +0200

    Drop obsolete patch: mapcache_seed_typo.patch.

diff --git a/debian/changelog b/debian/changelog
index a78672f..3fa9beb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ mapcache (1.2.0-1) UNRELEASED; urgency=low
     - demo_service_indenting.patch (applied upstream)
     - mapcache_seed_non_zero_exit.patch (applied upstream)
     - mapcache_seed_delete_mode.patch (applied upstream)
-  * Refresh mapcache_seed_typo.patch.
+    - mapcache_seed_typo.patch (applied upstream)
   * Add patch to support building with mapserver.
   * Add patch from upstream to fix building with mapserver.
   * SONAME of libmapcache changed from libmapcache.so.0 to
diff --git a/debian/patches/mapcache_seed_typo.patch b/debian/patches/mapcache_seed_typo.patch
deleted file mode 100644
index 24279f9..0000000
--- a/debian/patches/mapcache_seed_typo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix typo in mapcache_seed utility.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Bug: https://github.com/mapserver/mapcache/pull/83
-Applied-Upstream: https://github.com/mapserver/mapcache/commit/fd657d632d6f633d0d2d21ce4dfa7f3deb64944d
-Last-Update: 2013-07-23
---- a/util/mapcache_seed.c
-+++ b/util/mapcache_seed.c
-@@ -1072,11 +1072,11 @@ int main(int argc, const char **argv)
- 
-   if (mode == MAPCACHE_CMD_TRANSFER) {
-     if (!tileset_transfer_name)
--      return usage(argv[0],"tileset where tiles should be transfered to not specified");
-+      return usage(argv[0],"tileset where tiles should be transferred to not specified");
- 
-     tileset_transfer = mapcache_configuration_get_tileset(cfg,tileset_transfer_name);
-     if(!tileset_transfer)
--      return usage(argv[0], "tileset where tiles should be transfered to not found in configuration");
-+      return usage(argv[0], "tileset where tiles should be transferred to not found in configuration");
-   }
- 
-   if(old) {
diff --git a/debian/patches/series b/debian/patches/series
index 261bd5e..f309f6f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-mapcache_seed_typo.patch
 cmake-with-mapserver.patch
 allow-building-with-mapserver.patch

-- 
Packaging for MapCache