[mapserver] 03/03: Add patches for typos.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository mapserver.

commit 48be97408b7e68ede429b887e3d429c2543e099e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jul 8 01:58:43 2015 +0200

    Add patches for typos.
---
 debian/changelog                     |  1 +
 debian/patches/consistent-typo.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                |  2 ++
 debian/patches/unknown-typo.patch    | 15 +++++++++++++++
 4 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 73dcc29..b78634f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ mapserver (7.0.0~beta2-1) UNRELEASED; urgency=medium
     - add libharfbuzz-dev & libpixman-1-dev
   * Drop SOVERSION from -dbg & -dev package name.
   * Add libcurl-ssl-dev as alternative for libcurl-gnutls-dev build dependency.
+  * Add patches for typos.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 07 Jul 2015 21:38:27 +0200
 
diff --git a/debian/patches/consistent-typo.patch b/debian/patches/consistent-typo.patch
new file mode 100644
index 0000000..aa56ffc
--- /dev/null
+++ b/debian/patches/consistent-typo.patch
@@ -0,0 +1,26 @@
+Description: Fix 'consistant' typo, replace with 'consistent'.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/mapserver/mapserver/pull/5116
+
+--- a/mapogcfilter.c
++++ b/mapogcfilter.c
+@@ -3537,7 +3537,7 @@ int FLTCheckFeatureIdFilters(FilterEncod
+                 if( pszDot - pszId != strlen(lp->name) ||
+                     strncasecmp(pszId, lp->name, strlen(lp->name)) != 0 )
+                 {
+-                    msSetError(MS_MISCERR, "Feature id %s not consistant with feature type name %s.",
++                    msSetError(MS_MISCERR, "Feature id %s not consistent with feature type name %s.",
+                                "FLTPreParseFilterForAlias()", pszId, lp->name);
+                     status = MS_FAILURE;
+                     break;
+--- a/mapwfs.c
++++ b/mapwfs.c
+@@ -2059,7 +2059,7 @@ static int msWFSRunFilter(mapObj* map,
+     /*preparse the filter for gml aliases*/
+     FLTPreParseFilterForAliasAndGroup(psNode, map, lp->index, "G");
+ 
+-    /* Check that FeatureId filters are consistant with the active layer */
++    /* Check that FeatureId filters are consistent with the active layer */
+     if( FLTCheckFeatureIdFilters(psNode, map, lp->index) == MS_FAILURE)
+     {
+         FLTFreeFilterEncodingNode( psNode );
diff --git a/debian/patches/series b/debian/patches/series
index 58ac143..0162ab6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@ perl-mapscript-install.patch
 ruby-mapscript-install.patch
 cmake-mapserver-export.patch
 java-hardening.patch
+consistent-typo.patch
+unknown-typo.patch
diff --git a/debian/patches/unknown-typo.patch b/debian/patches/unknown-typo.patch
new file mode 100644
index 0000000..10789d4
--- /dev/null
+++ b/debian/patches/unknown-typo.patch
@@ -0,0 +1,15 @@
+Description: Fix 'Unkown' typo, replace with 'Unknown'.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/mapserver/mapserver/pull/5116
+
+--- a/mapgdal.c
++++ b/mapgdal.c
+@@ -243,7 +243,7 @@ int msSaveImageGDAL( mapObj *map, imageO
+     eDataType = GDT_Byte;
+   } else {
+     msReleaseLock( TLOCK_GDAL );
+-    msSetError( MS_MEMERR, "Unkown format. This is a bug.", "msSaveImageGDAL()");
++    msSetError( MS_MEMERR, "Unknown format. This is a bug.", "msSaveImageGDAL()");
+     return MS_FAILURE;
+   }
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git