[Git][debian-gis-team/mapserver][experimental] 5 commits: Update symbols for other architectures.
Bas Couwenberg
gitlab at salsa.debian.org
Fri May 10 16:07:36 BST 2019
Bas Couwenberg pushed to branch experimental at Debian GIS Project / mapserver
Commits:
a477ef92 by Bas Couwenberg at 2019-05-05T19:01:28Z
Update symbols for other architectures.
- - - - -
88c20fd2 by Bas Couwenberg at 2019-05-10T14:53:52Z
New upstream version 7.4.0~rc2
- - - - -
6201bf15 by Bas Couwenberg at 2019-05-10T14:53:58Z
Merge tag 'upstream/7.4.0_rc2' into experimental
Upstream version 7.4.0~rc2
- - - - -
f4b49449 by Bas Couwenberg at 2019-05-10T14:54:24Z
New upstream release candidate.
- - - - -
8ecb0190 by Bas Couwenberg at 2019-05-10T14:55:02Z
Set distribution to experimental.
- - - - -
5 changed files:
- CMakeLists.txt
- HISTORY.TXT
- debian/changelog
- debian/libmapserver2.symbols
- 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)
----------------------------
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+mapserver (7.4.0~rc2-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Update symbols for other architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 10 May 2019 16:54:50 +0200
+
mapserver (7.4.0~rc1-1~exp1) experimental; urgency=medium
* New upstream release candidate.
=====================================
debian/libmapserver2.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 7.4.0~rc1 amd64
+# SymbolsHelper-Confirmed: 7.4.0~rc1 amd64 armel armhf i386 mips mipsel powerpc
libmapserver.so.2 #PACKAGE# #MINVER#
* Build-Depends-Package: libmapserver-dev
BuildExpressionTree at Base 6.2.1
@@ -516,6 +516,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
(optional=templinst|arch=sparc)_ZN9mapserver21rasterizer_outline_aaINS_22renderer_outline_imageINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEENS_18line_image_patternINS_28pattern_filter_bilinear_rgbaIS5_EEEEEENS_14line_coord_satEED2Ev at Base 6.4.1
(optional=templinst)_ZN9mapserver22comp_op_rgba_exclusionINS_5rgba8ENS_10order_bgraEE9blend_pixEPhjjjjj at Base 7.0.0
(optional=templinst)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE10add_vertexEddj at Base 6.2.1
+ (optional=templinst|arch=!amd64)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE14sweep_scanlineINS_11scanline_p8EEEbRT_ at Base 7.4.0~rc1
(optional=templinst|arch=armel armhf hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE8add_pathINS_10conv_curveINS_20path_storage_integerIiLj6EEENS_6curve3ENS_6curve4EEEEEvRT_j at Base 6.2.1
(optional=templinst|arch=armel armhf hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE8add_pathINS_10conv_curveINS_20path_storage_integerIsLj6EEENS_6curve3ENS_6curve4EEEEEvRT_j at Base 6.2.1
(optional=templinst)_ZN9mapserver22renderer_outline_imageINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEENS_18line_image_patternINS_28pattern_filter_bilinear_rgbaIS4_EEEEE13line3_no_clipERKNS_15line_parametersEiiii at Base 6.2.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/compare/073ca9d6c20be29a1606f6b52f229a1e49f41cd8...8ecb01906ff2b1a60c926d2c71f9f5e7e00e8c7b
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/compare/073ca9d6c20be29a1606f6b52f229a1e49f41cd8...8ecb01906ff2b1a60c926d2c71f9f5e7e00e8c7b
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/ca5a7da4/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list