[Git][debian-gis-team/mapserver][upstream] New upstream version 7.4.0~rc2

[Bas Couwenberg]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / mapserver


Commits:
88c20fd2 by Bas Couwenberg at 2019-05-10T14:53:52Z
New upstream version 7.4.0~rc2
- - - - -


3 changed files:

- CMakeLists.txt
- HISTORY.TXT
- mapogcsld.c


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -18,7 +18,7 @@ include(CheckCSourceCompiles)
 set (MapServer_VERSION_MAJOR 7)
 set (MapServer_VERSION_MINOR 4)
 set (MapServer_VERSION_REVISION 0)
-set (MapServer_VERSION_SUFFIX "-rc1")
+set (MapServer_VERSION_SUFFIX "-rc2")
 
 set(TARGET_VERSION_MAJOR ${MapServer_VERSION_MAJOR})
 set(TARGET_VERSION_MINOR ${MapServer_VERSION_MINOR})


=====================================
HISTORY.TXT
=====================================
@@ -12,6 +12,11 @@ For a complete change history, please see the Git log comments.  For more
 details about recent point releases, please see the online changelog at:
 http://mapserver.org/development/changelog/
 
+7.4.0-rc2 release (2019-5-10)
+----------------------------
+
+- No major changes, see detailed changelog for bug fixes
+
 7.4.0-rc1 release (2019-5-1)
 ----------------------------
 


=====================================
mapogcsld.c
=====================================
@@ -81,7 +81,7 @@ int msSLDApplySLDURL(mapObj *map, char *szURL, int iLayer,
       pszSLDTmpFile = msTmpFile(map, NULL, NULL, "sld.xml" );
     }
     if (pszSLDTmpFile == NULL) {
-      msSetError(MS_WMSERR, "Could not determine temporary file %s. Please make sure that the temporary path is set. The temporary path can be defined for example by setting TMPPATH in the map file. Please check the MapServer documentation on temporary path settings.", "msSLDApplySLDURL()", pszSLDTmpFile);
+      msSetError(MS_WMSERR, "Could not determine temporary file %s. Please make sure that the temporary path is set. The temporary path can be defined for example by setting TEMPPATH in the map file. Please check the MapServer documentation on temporary path settings.", "msSLDApplySLDURL()", pszSLDTmpFile);
     } else {
       int nMaxRemoteSLDBytes;
       const char *pszMaxRemoteSLDBytes = msOWSLookupMetadata(&(map->web.metadata), "MO", "remote_sld_max_bytes");
@@ -108,7 +108,7 @@ int msSLDApplySLDURL(mapObj *map, char *szURL, int iLayer,
         }
       } else {
         unlink(pszSLDTmpFile);
-        msSetError(MS_WMSERR, "Could not open SLD %s and save it in a temporary file. Please make sure that the sld url is valid and that the temporary path is set. The temporary path can be defined for example by setting TMPPATH in the map file. Please check the MapServer documentation on temporary path settings.", "msSLDApplySLDURL", szURL);
+        msSetError(MS_WMSERR, "Could not open SLD %s and save it in a temporary file. Please make sure that the sld url is valid and that the temporary path is set. The temporary path can be defined for example by setting TEMPPATH in the map file. Please check the MapServer documentation on temporary path settings.", "msSLDApplySLDURL", szURL);
       }
       msFree(pszSLDTmpFile);
       if (pszSLDbuf)



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/commit/88c20fd2b635681930dd77576f0d1b99b226fe89

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/commit/88c20fd2b635681930dd77576f0d1b99b226fe89
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190510/05d01ab7/attachment-0001.html>