[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 743096794bfa468331022d47beb1a8ec492f2262
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Sep 1 17:38:50 2013 +0200

    Drop obsolete patch: shp2img-typo.patch.

diff --git a/debian/changelog b/debian/changelog
index 5737efe..5bec8c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
     - fixmapscriptvars.patch (mapscriptvars no longer used)
     - php_segfault.patch (applied upstream)
     - mapows-contenttype.patch (applied upstream)
+    - shp2img-typo.patch (applied upstream)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 01 Sep 2013 14:14:54 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index f7d70be..49df62d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 hardening.patch
-shp2img-typo.patch
 ruby-shebang.patch
diff --git a/debian/patches/shp2img-typo.patch b/debian/patches/shp2img-typo.patch
deleted file mode 100644
index 502d2a8..0000000
--- a/debian/patches/shp2img-typo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix typo in usage information.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Bug: https://github.com/mapserver/mapserver/pull/4740
-Applied-Upstream: https://github.com/mapserver/mapserver/commit/cbc9683b3a3fd07059312583aaa10b267907e711
-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" );

-- 
Packaging for MapServer