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

[Bas Couwenberg]

The following commit has been merged in the jessie branch:
commit e85b7b2915236b6a0cad8120a72c7631c52d27d1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jul 18 00:03:40 2013 +0200

    Add patch to return non-zero exit status if errors occured in mapcache_seed.

diff --git a/debian/changelog b/debian/changelog
index b174640..2e23626 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ mapcache (1.0.0-3) UNRELEASED; urgency=low
   * Add patch to add newlines after each list item.
   * 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 watch file.
   * Add maintainer scripts for libmapcache0 to call ldconfig.
 
diff --git a/debian/patches/mapcache_seed_non_zero_exit.patch b/debian/patches/mapcache_seed_non_zero_exit.patch
new file mode 100644
index 0000000..1728be0
--- /dev/null
+++ b/debian/patches/mapcache_seed_non_zero_exit.patch
@@ -0,0 +1,28 @@
+Description: Return non-zero exit status if errors occured.
+Origin: https://github.com/mapserver/mapcache/commit/fde669fa6a9829afcb3d3be234abf38c1cf2aeb
+Last-Update: 2013-07-11
+--- a/util/mapcache_seed.c
++++ b/util/mapcache_seed.c
+@@ -963,7 +963,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);
+     }
+ 
+ 
+@@ -1248,6 +1250,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 a5aeb20..3a9d9be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ demo_service_html_charset.patch
 demo_service_list_newlines.patch
 demo_service_page_height.patch
 demo_service_indenting.patch
+mapcache_seed_non_zero_exit.patch

-- 
Packaging for MapCache