[mapserver] 10/11: Add patch for "didn't" typo.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Thu Feb 25 22:00:50 UTC 2016


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

sebastic pushed a commit to branch master
in repository mapserver.

commit 0860f2542ebd789a4ecd07cb9da5419fef437007
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Feb 25 22:47:09 2016 +0100

    Add patch for "didn't" typo.
---
 debian/changelog                |  1 +
 debian/patches/didnt-typo.patch | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8881e65..ba5447b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ mapserver (7.0.1-1) UNRELEASED; urgency=medium
   * Update symbols for amd64.
   * Add dependency on php5-common to php5-mapscript for php5enmod.
   * Fix 'associated' typo in manpage.
+  * Add patch for "didn't" typo.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 25 Feb 2016 21:05:55 +0100
 
diff --git a/debian/patches/didnt-typo.patch b/debian/patches/didnt-typo.patch
new file mode 100644
index 0000000..72e074c
--- /dev/null
+++ b/debian/patches/didnt-typo.patch
@@ -0,0 +1,34 @@
+Description: Fix "didnt" typo, replace with "didn't".
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/mapmssql2008.c
++++ b/mapmssql2008.c
+@@ -726,7 +726,7 @@ int msMSSQL2008LayerOpen(layerObj *layer
+                  "This error occured when trying to make a connection to the specified SQL server.  \n"
+                  "<br>\nMost commonly this is caused by <br>\n"
+                  "(1) incorrect connection string <br>\n"
+-                 "(2) you didnt specify a 'user id=...' in your connection string <br>\n"
++                 "(2) you didn't specify a 'user id=...' in your connection string <br>\n"
+                  "(3) SQL server isnt running <br>\n"
+                  "(4) TCPIP not enabled for SQL Client or server <br>\n\n",
+                  "msMSSQL2008LayerOpen()", maskeddata, errMess);
+@@ -2099,7 +2099,7 @@ static int msMSSQL2008LayerParseData(lay
+   } else {
+     slength = strspn(pos_srid + 12, "-0123456789");
+     if(!slength) {
+-      msSetError(MS_QUERYERR, DATA_ERROR_MESSAGE, "msMSSQL2008LayerParseData()", "Error parsing MSSQL2008 data variable: You specified 'using SRID=#' but didnt have any numbers!<br><br>\n\nMore Help:<br><br>\n\n", data);
++      msSetError(MS_QUERYERR, DATA_ERROR_MESSAGE, "msMSSQL2008LayerParseData()", "Error parsing MSSQL2008 data variable: You specified 'using SRID=#' but didn't have any numbers!<br><br>\n\nMore Help:<br><br>\n\n", data);
+ 
+       msFree(data);
+       return MS_FAILURE;
+--- a/mappostgis.c
++++ b/mappostgis.c
+@@ -1394,7 +1394,7 @@ int msPostGISParseData(layerObj *layer)
+   } else {
+     slength = strspn(pos_srid + 12, "-0123456789");
+     if (!slength) {
+-      msSetError(MS_QUERYERR, "Error parsing PostGIS DATA variable. You specified 'USING SRID' but didnt have any numbers! %s", "msPostGISParseData()", data);
++      msSetError(MS_QUERYERR, "Error parsing PostGIS DATA variable. You specified 'USING SRID' but didn't have any numbers! %s", "msPostGISParseData()", data);
+       return MS_FAILURE;
+     } else {
+       layerinfo->srid = (char*) msSmallMalloc(slength + 1);
diff --git a/debian/patches/series b/debian/patches/series
index 78cc1a1..46c2393 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ hardening.patch
 perl-mapscript-install.patch
 ruby-mapscript-install.patch
 java-hardening.patch
+didnt-typo.patch

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



More information about the Pkg-grass-devel mailing list