[SCM] mapcache branch, master, updated. upstream/1.0.0-67-g63042ca

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 7c16fdfb27a77b6fd2494b4e4ed607847bf4cd21
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Sep 11 20:28:29 2013 +0200

    Drop obsolete patch: mapcache_seed_non_zero_exit.patch.

diff --git a/debian/changelog b/debian/changelog
index 6c16f9a..3fefdb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ mapcache (1.1dev+ee206af-1) UNRELEASED; urgency=low
     - demo_service_list_newlines.patch (applied upstream)
     - demo_service_page_height.patch (applied upstream)
     - demo_service_indenting.patch (applied upstream)
+    - mapcache_seed_non_zero_exit.patch (applied upstream)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Wed, 11 Sep 2013 19:16:06 +0200
 
diff --git a/debian/patches/mapcache_seed_non_zero_exit.patch b/debian/patches/mapcache_seed_non_zero_exit.patch
deleted file mode 100644
index cf64e69..0000000
--- a/debian/patches/mapcache_seed_non_zero_exit.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Return non-zero exit status if errors occured.
-Origin: https://github.com/mapserver/mapcache/commit/fde669fa6a9829afcb3d3be234abf38c1cf2aeb
-Bug: https://github.com/mapserver/mapcache/issues/76
-Bug: https://github.com/mapserver/mapcache/pull/77
-Last-Update: 2013-07-11
---- a/util/mapcache_seed.c
-+++ b/util/mapcache_seed.c
-@@ -940,7 +940,9 @@ int main(int argc, const char **argv)
-       }
-     }
-     if((nClippers=OGR_L_GetFeatureCount(layer, TRUE)) == 0) {
--      return usage(argv[0],"no features in provided ogr parameters, cannot continue");
-+      printf("no features in provided ogr parameters, cannot continue\n");
-+      apr_terminate();
-+      exit(0);
-     }
- 
- 
-@@ -1190,6 +1192,11 @@ int main(int argc, const char **argv)
-     printf("\nseeded %d metatiles at %g tiles/sec\n",seededtilestot, seededtilestot/duration);
-   }
-   apr_terminate();
-+
-+  if (error_detected > 0) {
-+    exit(1);  
-+  }
-+  
-   return 0;
- }
- /* vim: ts=2 sts=2 et sw=2
diff --git a/debian/patches/series b/debian/patches/series
index be553e7..740c47c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 includepath.patch
-mapcache_seed_non_zero_exit.patch
 mapcache_seed_delete_mode.patch
 mapcache_seed_typo.patch

-- 
Packaging for MapCache