This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapserver.
commit b0e665b37dc64e7d40eafb70f0fc85672d7eac36 Author: Bas Couwenberg <[email protected]> Date: Wed Sep 21 21:00:32 2016 +0200 Drop didnt-typo.patch, applied upstream. --- debian/changelog | 1 + debian/patches/didnt-typo.patch | 36 ------------------------------------ debian/patches/series | 1 - 3 files changed, 1 insertion(+), 37 deletions(-) diff --git a/debian/changelog b/debian/changelog index 20f6f76..1a918b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ mapserver (7.0.2-1) UNRELEASED; urgency=medium * New upstream release. * Bump Standards-Version to 3.9.8, no changes. * Drop unused override for incompatible-java-bytecode-format. + * Drop didnt-typo.patch, applied upstream. -- Bas Couwenberg <[email protected]> Wed, 21 Sep 2016 20:56:49 +0200 diff --git a/debian/patches/didnt-typo.patch b/debian/patches/didnt-typo.patch deleted file mode 100644 index 54a4293..0000000 --- a/debian/patches/didnt-typo.patch +++ /dev/null @@ -1,36 +0,0 @@ -Description: Fix "didnt" typo, replace with "didn't". -Author: Bas Couwenberg <[email protected]> -Forwarded: https://github.com/mapserver/mapserver/pull/5324 -Applied-Upstream: https://github.com/mapserver/mapserver/commit/66309eebb7ba0dc70469efeb40f865a8e88fafbd - ---- 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 46c2393..78cc1a1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,3 @@ 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 _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
