[SCM] mapserver branch, jessie, updated. upstream/6.2.1-97-g257f52a

[Bas Couwenberg]

The following commit has been merged in the jessie branch:
commit b8626c025eb465654c526cf4590e025171633524
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jul 14 16:54:06 2013 +0200

    Add shp2img-typo.patch to fix a typo in the shp2img usage information.

diff --git a/debian/changelog b/debian/changelog
index 5f9bdb8..7e16e83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * Update copyright for v6.2.1. Convert to DEP5 format.
   * Rename libmapserver package to libmapserver-6.2.1 to match SONAME.
   * Add symbols file for libmapserver-6.2.1.so.
+  * Add shp2img-typo.patch to fix a typo in the shp2img usage information.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 8f58ad2..6624be5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fixmapscriptvars.patch
 php_segfault
 mapows-contenttype.patch
 hardening.patch
+shp2img-typo.patch
diff --git a/debian/patches/shp2img-typo.patch b/debian/patches/shp2img-typo.patch
new file mode 100644
index 0000000..7cfa6a2
--- /dev/null
+++ b/debian/patches/shp2img-typo.patch
@@ -0,0 +1,14 @@
+Description: Fix typo in usage information.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-06-14
+--- a/shp2img.c
++++ b/shp2img.c
+@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
+       fprintf(stdout,"  -o image: output filename (stdout if not provided)\n");
+       fprintf(stdout,"  -e minx miny maxx maxy: extents to render\n");
+       fprintf(stdout,"  -s sizex sizey: output image size\n");
+-      fprintf(stdout,"  -l layers: layers / groups to enable - make sure they are quoted and space seperated if more than one listed\n" );
++      fprintf(stdout,"  -l layers: layers / groups to enable - make sure they are quoted and space separated if more than one listed\n" );
+       fprintf(stdout,"  -all_debug n: Set debug level for map and all layers\n" );
+       fprintf(stdout,"  -map_debug n: Set map debug level\n" );
+       fprintf(stdout,"  -layer_debug layer_name n: Set layer debug level\n" );

-- 
Mapserver