[mapserver] 41/43: Merge branch 'jessie' into wheezy-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Jul 7 20:21:36 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch wheezy-backports
in repository mapserver.
commit 72f06dc42c6812618f75723bd4df4f2d94aaa456
Merge: eb13a37 b6b6d08
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Oct 9 17:25:41 2013 +0200
Merge branch 'jessie' into wheezy-backports
Conflicts:
debian/changelog
debian/control
debian/libmapserver1.symbols
.gitignore | 41 +-
.travis.yml | 63 +-
CMakeLists.txt | 892 +
HISTORY.TXT | 37 +-
INSTALL | 2 +-
INSTALL.CMAKE | 179 +
MIGRATION_GUIDE.txt | 844 +-
Makefile | 63 +
Makefile.in | 533 -
Makefile.vc | 4 +-
README.CONFIGURE | 791 -
aclocal.m4 | 8620 ----
apache/CMakeLists.txt | 45 +
mod_mapserver.c => apache/mod_mapserver.c | 6 +-
cgiutil.c | 4 +-
cmake/FindAPACHE.cmake | 36 +
cmake/FindAPR.cmake | 78 +
cmake/FindCairo.cmake | 77 +
cmake/FindExempi.cmake | 11 +
cmake/FindFCGI.cmake | 11 +
cmake/FindFreetype.cmake | 96 +
cmake/FindFriBiDi.cmake | 30 +
cmake/FindGD.cmake | 100 +
cmake/FindGDAL.cmake | 106 +
cmake/FindGEOS.cmake | 34 +
cmake/FindICONV.cmake | 102 +
cmake/FindMySQL.cmake | 48 +
cmake/FindODBC.cmake | 58 +
cmake/FindOracle.cmake | 82 +
cmake/FindPHP5.cmake | 99 +
cmake/FindPerlLibs.cmake | 290 +
cmake/FindPostgreSQL.cmake | 40 +
cmake/FindProj.cmake | 17 +
cmake/FindRSVG.cmake | 39 +
cmake/FindSDE.cmake | 43 +
cmake/FindSVGCairo.cmake | 52 +
config.guess | 1519 -
config.sub | 1767 -
configure | 23934 ---------
configure.in | 2560 -
debian/changelog | 63 +-
debian/control | 286 +-
debian/copyright | 116 +-
debian/libmapscript-perl.install | 1 +
debian/libmapserver-6.2.1-dev.install | 4 -
debian/libmapserver-6.2.1-dev.manpages | 1 -
debian/libmapserver-6.2.1.install | 1 -
debian/libmapserver1-dev.install | 3 +
debian/libmapserver1.install | 1 +
...erver-6.2.1.postinst => libmapserver1.postinst} | 0
...mapserver-6.2.1.postrm => libmapserver1.postrm} | 0
...pserver-6.2.1.symbols => libmapserver1.symbols} | 470 +-
debian/man/mapserver-config.1.xml | 86 -
debian/mapscript.ini | 1 +
debian/patches/cmake-mapserver-export.patch | 368 +
debian/patches/fixmapscriptvars.patch | 14 -
debian/patches/hardening.patch | 120 +-
debian/patches/mapows-contenttype.patch | 16 -
debian/patches/perl-mapscript-install.patch | 23 +
debian/patches/php_segfault.patch | 15 -
debian/patches/ruby-mapscript-install.patch | 13 +
debian/patches/ruby-shebang.patch | 11 +
debian/patches/series | 8 +-
debian/patches/shp2img-typo.patch | 14 -
debian/php5-mapscript.config | 35 -
debian/php5-mapscript.install | 1 +
debian/php5-mapscript.lintian-overrides | 3 -
debian/php5-mapscript.postinst | 16 +-
debian/php5-mapscript.prerm | 28 +-
debian/php5-mapscript.templates | 15 -
debian/po/POTFILES.in | 1 -
debian/po/cs.po | 61 -
debian/po/da.po | 53 -
debian/po/de.po | 57 -
debian/po/es.po | 70 -
debian/po/fi.po | 51 -
debian/po/fr.po | 56 -
debian/po/gl.po | 52 -
debian/po/it.po | 54 -
debian/po/ja.po | 53 -
debian/po/nb.po | 58 -
debian/po/nl.po | 72 -
debian/po/output | 1 -
debian/po/pt.po | 54 -
debian/po/ru.po | 56 -
debian/po/sv.po | 61 -
debian/po/ta.po | 68 -
debian/po/templates.pot | 47 -
debian/po/vi.po | 55 -
debian/python-mapscript.install | 1 +
...{libmapscript-ruby.docs => ruby-mapscript.docs} | 0
...cript-ruby.examples => ruby-mapscript.examples} | 0
debian/ruby-mapscript.install | 1 +
debian/rules | 189 +-
debian/watch | 3 +-
genhtml.patch | 43 +
github_issue_no_activity_closer.py | 123 +
hittest.c | 273 +
mapthread.h => hittest.h | 100 +-
install-sh | 527 -
legend.c | 2 +-
ltmain.sh | 9655 ----
m4/apache.m4 | 124 -
m4/ax_append_flag.m4 | 241 -
m4/ax_cflags_warn_all.m4 | 120 -
m4/ax_jni_include_dir.m4 | 121 -
m4/ax_pkg_swig.m4 | 135 -
m4/libtool.m4 | 7982 ---
m4/ltoptions.m4 | 384 -
m4/ltsugar.m4 | 123 -
m4/ltversion.m4 | 23 -
m4/lt~obsolete.m4 | 98 -
m4/mapserver.m4 | 386 -
mapagg.cpp | 185 +-
mapagg.h | 186 -
mapcairo.c | 211 +-
mapchart.c | 105 +-
mapcontext.c | 2 +-
mapcontour.c | 900 +
mapcopy.c | 28 +
mapdebug.c | 2 +-
mapdraw.c | 62 +-
mapdrawgdal.c | 104 +-
maperror.c | 17 +-
maperror.h | 12 +-
mapfile.c | 767 +-
mapfile.dtd | 3 +-
mapfile.h | 5 +
mapgd.c | 37 +-
mapgdal.c | 55 +-
mapgeomtransform.c | 69 +-
mapgeomutil.cpp | 46 +-
mapgeos.c | 342 +-
mapgml.c | 8 +-
maphttp.c | 158 +-
maphttp.h | 6 +-
mapimageio.c | 54 +
mapimagemap.c | 2 +-
mapio.c | 7 +-
mapio.h | 14 +-
mapjoin.c | 4 +-
mapkmlrenderer.cpp | 5 +-
mapkmlrenderer.h | 1 +
maplayer.c | 264 +-
maplegend.c | 245 +-
maplexer.c | 4566 +-
maplexer.l | 27 +-
mapogcfilter.c | 112 +-
mapogcfilter.h | 1 +
mapogcfiltercommon.c | 52 +-
mapogcsld.c | 55 +-
mapogcsos.c | 7 +-
mapogr.cpp | 127 +-
mapogroutput.c | 152 +-
maporaclespatial.c | 27 +-
mapoutput.c | 20 +-
mapows.c | 304 +-
mapows.h | 2 +
mapowscommon.c | 2 +-
mapparser.c | 1306 +-
mapparser.h | 90 +-
mapparser.y | 89 +-
mappostgis.c | 16 +-
mappostgresql.c | 2 +-
mapprimitive.c | 30 +-
mapquery.c | 14 +-
mapraster.c | 523 +-
mapraster.h | 69 +
maprasterquery.c | 183 +-
maprendering.c | 238 +-
mapresample.c | 54 +-
mapscale.c | 25 +-
mapscript/csharp/CMakeLists.txt | 56 +
mapscript/csharp/DBFFieldType.cs | 15 -
mapscript/csharp/DBFInfo.cs | 241 -
mapscript/csharp/MS_ALIGN_VALUE.cs | 14 -
mapscript/csharp/MS_BITMAP_FONT_SIZES.cs | 16 -
mapscript/csharp/MS_CAPS_JOINS_AND_CORNERS.cs | 18 -
mapscript/csharp/MS_CONNECTION_TYPE.cs | 27 -
mapscript/csharp/MS_FILE_TYPE.cs | 13 -
mapscript/csharp/MS_FONT_TYPE.cs | 13 -
mapscript/csharp/MS_GEOS_OPERATOR.cs | 21 -
mapscript/csharp/MS_IMAGEMODE.cs | 19 -
mapscript/csharp/MS_JOIN_CONNECTION_TYPE.cs | 16 -
mapscript/csharp/MS_JOIN_TYPE.cs | 13 -
mapscript/csharp/MS_LABEL_BINDING_ENUM.cs | 20 -
mapscript/csharp/MS_LAYER_TYPE.cs | 20 -
mapscript/csharp/MS_PARSE_TYPE_ENUM.cs | 14 -
mapscript/csharp/MS_POSITIONS_ENUM.cs | 25 -
mapscript/csharp/MS_QUERYMAP_STYLES.cs | 14 -
mapscript/csharp/MS_QUERY_MODE.cs | 13 -
mapscript/csharp/MS_QUERY_TYPE.cs | 18 -
mapscript/csharp/MS_REQUEST_TYPE.cs | 13 -
mapscript/csharp/MS_RETURN_VALUE.cs | 14 -
mapscript/csharp/MS_SHAPE_TYPE.cs | 15 -
mapscript/csharp/MS_STYLE_BINDING_ENUM.cs | 23 -
mapscript/csharp/MS_SYMBOL_TYPE.cs | 18 -
mapscript/csharp/MS_TOKEN_BINDING_ENUM.cs | 16 -
mapscript/csharp/MS_TOKEN_COMPARISON_ENUM.cs | 31 -
mapscript/csharp/MS_TOKEN_FUNCTION_ENUM.cs | 19 -
mapscript/csharp/MS_TOKEN_LITERAL_ENUM.cs | 15 -
mapscript/csharp/MS_TOKEN_LOGICAL_ENUM.cs | 14 -
mapscript/csharp/MS_TRANSFORM_MODE.cs | 16 -
mapscript/csharp/MS_UNITS.cs | 20 -
mapscript/csharp/OWSRequest.cs | 182 -
mapscript/csharp/SWIGTYPE_p_double.cs | 27 -
mapscript/csharp/SWIGTYPE_p_int.cs | 27 -
mapscript/csharp/SWIGTYPE_p_p_char.cs | 27 -
mapscript/csharp/SWIGTYPE_p_tileCacheObj.cs | 27 -
mapscript/csharp/SWIGTYPE_p_uint32_t.cs | 27 -
mapscript/csharp/classObj.cs | 413 -
mapscript/csharp/clusterObj.cs | 152 -
mapscript/csharp/colorObj.cs | 152 -
mapscript/csharp/csmodule.i | 4 +-
mapscript/csharp/debugLevel.cs | 17 -
mapscript/csharp/errorObj.cs | 141 -
mapscript/csharp/fontSetObj.cs | 111 -
mapscript/csharp/hashTableObj.cs | 123 -
mapscript/csharp/imageObj.cs | 166 -
mapscript/csharp/intarray.cs | 88 -
mapscript/csharp/labelCacheMemberObj.cs | 204 -
mapscript/csharp/labelCacheObj.cs | 116 -
mapscript/csharp/labelCacheSlotObj.cs | 136 -
mapscript/csharp/labelLeaderObj.cs | 118 -
mapscript/csharp/labelObj.cs | 660 -
mapscript/csharp/labelStyleObj.cs | 185 -
mapscript/csharp/layerObj.cs | 1061 -
mapscript/csharp/legendObj.cs | 256 -
mapscript/csharp/lineObj.cs | 119 -
mapscript/csharp/mapObj.cs | 929 -
mapscript/csharp/mapscript.cs | 243 -
mapscript/csharp/mapscriptPINVOKE.cs | 3991 --
mapscript/csharp/mapscript_wrap.c | 24785 ----------
mapscript/csharp/markerCacheMemberObj.cs | 103 -
mapscript/csharp/outputFormatObj.cs | 272 -
mapscript/csharp/pointObj.cs | 171 -
mapscript/csharp/projectionObj.cs | 126 -
mapscript/csharp/queryMapObj.cs | 153 -
mapscript/csharp/rectObj.cs | 172 -
mapscript/csharp/referenceMapObj.cs | 248 -
mapscript/csharp/resultCacheObj.cs | 122 -
mapscript/csharp/resultObj.cs | 118 -
mapscript/csharp/scalebarObj.cs | 265 -
mapscript/csharp/shapeObj.cs | 427 -
mapscript/csharp/shapefileObj.cs | 202 -
mapscript/csharp/strokeStyleObj.cs | 194 -
mapscript/csharp/styleObj.cs | 591 -
mapscript/csharp/swig_csharp_extensions.i | 19 +-
mapscript/csharp/symbolObj.cs | 358 -
mapscript/csharp/symbolSetObj.cs | 165 -
mapscript/csharp/symbolStyleObj.cs | 186 -
mapscript/csharp/tileCacheObj.cs | 224 -
mapscript/csharp/webObj.cs | 324 -
mapscript/java/.gitignore | 1 +
mapscript/java/CMakeLists.txt | 30 +
mapscript/java/Makefile.in | 115 -
mapscript/java/examples/OutputFormatList.java | 29 +
mapscript/java/examples/RFC24.java | 36 +
mapscript/java/examples/WxSTest.java | 11 +-
.../{WxSTest.java => WxSTestNoThread.java} | 22 +-
mapscript/java/run_test.sh | 23 +
mapscript/mapscript.i | 1 +
mapscript/perl/CMakeLists.txt | 25 +
mapscript/perl/Makefile.PL.in | 81 -
mapscript/perl/mapscript.pm | 3052 --
mapscript/perl/mapscript_wrap.c | 47026 ------------------
mapscript/php/CMakeLists.txt | 34 +
mapscript/php/Makefile.in | 133 -
mapscript/php/class.c | 38 +-
mapscript/php/cluster.c | 38 +-
mapscript/php/color.c | 4 +-
mapscript/php/error.c | 4 +-
mapscript/php/grid.c | 4 +-
mapscript/php/hashtable.c | 12 +-
mapscript/php/image.c | 4 +-
mapscript/php/label.c | 36 +-
mapscript/php/labelcachemember.c | 4 +-
mapscript/php/labelleader.c | 4 +-
mapscript/php/layer.c | 125 +-
mapscript/php/legend.c | 34 +-
mapscript/php/line.c | 4 +-
mapscript/php/map.c | 82 +-
mapscript/php/mapscript_i.c | 61 +-
mapscript/php/outputformat.c | 14 +-
mapscript/php/owsrequest.c | 14 +-
mapscript/php/php_mapscript.c | 20 +-
mapscript/php/php_mapscript.h | 11 +
mapscript/php/point.c | 6 +-
mapscript/php/projection.c | 4 +-
mapscript/php/querymap.c | 34 +-
mapscript/php/rect.c | 6 +-
mapscript/php/referencemap.c | 34 +-
mapscript/php/result.c | 4 +-
mapscript/php/scalebar.c | 34 +-
mapscript/php/shape.c | 6 +-
mapscript/php/shapefile.c | 6 +-
mapscript/php/style.c | 38 +-
mapscript/php/symbol.c | 10 +-
mapscript/php/web.c | 34 +-
mapscript/python/CMakeLists.txt | 47 +
mapscript/python/Makefile.in | 63 -
mapscript/python/mapscript.py | 2653 -
mapscript/python/mapscript_wrap.c | 48483 -------------------
mapscript/python/wxs.py | 31 +
mapscript/ruby/CMakeLists.txt | 17 +
mapscript/swiginc/class.i | 10 +-
mapscript/swiginc/cluster.i | 134 +-
mapscript/swiginc/label.i | 6 +
mapscript/swiginc/layer.i | 23 +
mapscript/swiginc/legend.i | 6 +
mapscript/swiginc/map.i | 19 +-
mapscript/swiginc/outputformat.i | 18 +-
mapscript/swiginc/querymap.i | 6 +
mapscript/swiginc/referencemap.i | 6 +
mapscript/swiginc/scalebar.i | 6 +
mapscript/swiginc/style.i | 6 +
mapscript/swiginc/web.i | 6 +
mapsde.c | 96 +-
mapserv.c | 2 +-
mapserver-api.c | 20 +
mapserver-api.h | 39 +
mapserver-config.h.in | 66 +
mapserver-config.in | 49 -
mapserver-version.h.in | 11 +
mapserver.def | 6 -
mapserver.h | 186 +-
mapservutil.c | 65 +-
mapshape.c | 84 +-
mapsmoothing.c | 307 +
mapstring.c | 29 +-
mapsymbol.c | 94 +-
mapsymbol.h | 9 +-
maptemplate.c | 60 +-
maptemplate.h | 4 +-
mapthread.c | 2 +-
mapthread.h | 3 +
maptree.c | 4 +
maputil.c | 312 +-
mapuvraster.c | 107 +-
mapwcs.c | 87 +-
mapwcs20.c | 213 +-
mapwfs.c | 30 +-
mapwfs11.c | 9 +-
mapwfslayer.c | 58 +-
mapwms.c | 637 +-
mapwmslayer.c | 118 +-
mapxbase.c | 17 +-
mapxmp.c | 6 +-
print-test-results.sh | 2 +-
release-notes.sh | 11 +
renderers/agg/include/agg_span_image_filter_rgba.h | 6 +-
renderers/agg/include/clipper.hpp | 2 +-
renderers/agg/src/clipper.cpp | 4 +-
run-test-suite.sh | 9 +-
run_code_coverage_upload.sh | 37 +
shp2img.c | 2 +-
strptime.c | 2 +-
sym2img.c | 2 +-
tile4ms.c | 1 +
xmlmapfile/mapfile.xsd | 5 +-
xmlmapfile/mapfile.xsl | 5 +
xmlmapfile/tests/layerset.xml | 1 +
362 files changed, 14982 insertions(+), 209191 deletions(-)
diff --cc debian/changelog
index 1a17b09,b7c3133..d60a79c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,62 +1,69 @@@
- mapserver (6.2.1-3~bpo70+1linuxminded8) wheezy-backports; urgency=low
++mapserver (6.4.0-3~bpo70+1linuxminded1) wheezy-backports; urgency=low
+
+ * Rebuild for wheezy-backports.
+ * Only Build-Depend on libgd2-xpm-dev for wheezy.
+
+ -- Bas Couwenberg <sebastic at xs4all.nl> Tue, 18 Jun 2013 23:14:49 +0200
+
+ mapserver (6.4.0-3) UNRELEASED; urgency=low
+
+ * Drop obsolete Build-Depends:
+ - sharutils (AGG no longer built separately)
+ - libsdl1.2-dev (AGG examples no longer built)
+ - libogdi3.2-dev (no longer used)
+ - libpam0g-dev (no longer used),
+ - libreadline-dev (no longer used),
+ - libedit-dev (no longer used),
+ - libepsilon-dev (no longer used),
+ * Update debian watch file:
+ - Drop uupdate action
+ - Handle common mistakes
+ * Remove debconf translations, debconf template no longer used.
+
+ -- Bas Couwenberg <sebastic at xs4all.nl> Thu, 26 Sep 2013 16:16:20 +0200
+
+ mapserver (6.4.0-2) unstable; urgency=low
+
+ * Also include mapserver-config.h and mapserver-version.h in dev package.
+ Required to build MapCache with MapServer support.
+ * Use php5enmod and php5dismod instead of installing the ini directly.
+ (closes: #667771)
+ * Add patch to export mapserver cmake package for external projects.
+ * Add versioned Breaks/Replaces for dev package.
+ * Drop transitional packages and Breaks/Replaces for libmapserver.
+ (closes: #723979)
+ * Drop unused lintian-overrides for php5-mapscript.
+ * Build-Depend on libperl-dev so cmake can find PerlLibs.
+ (closes: #724259)
+
+ -- Bas Couwenberg <sebastic at xs4all.nl> Thu, 19 Sep 2013 19:52:12 +0200
+
+ mapserver (6.4.0-1) unstable; urgency=low
+
+ * New upstream release: 6.4.0.
+ * Build system changed from autotools to cmake.
+ * Update Build-Depends to include: libgif-dev, librsvg2-dev, pkg-config.
+ * Update hardening.patch for CMake build.
+ * Drop patches:
+ - fixmapscriptvars.patch (mapscriptvars no longer used)
+ - php_segfault.patch (applied upstream)
+ - mapows-contenttype.patch (applied upstream)
+ - shp2img-typo.patch (applied upstream)
+ * Add patch to fix the Perl mapscript module installation directory:
+ perl-mapscript-install.patch
+ * Drop ruby1.8 mapscript package for ruby1.8-removal transition.
+ * Rename libruby-mapscript to ruby-mapscript. (closes: #722394)
+ * Don't install Ruby mapscript in /usr/lib/ruby, use vendor_ruby instead.
+ * SONAME of libmapserver changed from libmapserver-6.2.1.so to
+ libmapserver.so.1.
+ * Use pkgkde-gensymbols & pkgkde-symbolshelper to handle C++ symbols.
+ * Use upstream version without debian revision when generating symbols.
+ * Update libmapserver symbols file for 6.4.0 on amd64.
+ * Add patch to install ruby mapscript into vendorarchdir instead of archdir.
+ * Enable verbose make output.
+
+ -- Bas Couwenberg <sebastic at xs4all.nl> Tue, 17 Sep 2013 17:16:30 +0200
+
mapserver (6.2.1-3) unstable; urgency=low
[ Bas Couwenberg ]
diff --cc debian/control
index e29ca97,20dbea7..fc279d5
--- a/debian/control
+++ b/debian/control
@@@ -1,43 -1,64 +1,64 @@@
Source: mapserver
+ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
+ Alan Boudreault <aboudreault at mapgears.com>,
+ Bas Couwenberg <sebastic at xs4all.nl>
Section: devel
Priority: optional
- Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
- Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Alan Boudreault <aboudreault at mapgears.com>, Bas Couwenberg <sebastic at xs4all.nl>
- Standards-Version: 3.9.4
- Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1.1), autotools-dev,
- libcurl4-gnutls-dev, libpng-dev, libjpeg-dev, zlib1g-dev (>= 1.1.4),
- libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9),
- libgdal1-dev (>= 1.9.0), libproj-dev, libgeos-dev (>= 3.3.1-1~),
- libfribidi-dev, libcairo2-dev,
- libpq-dev, php5-dev, swig, python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
- ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
- sharutils, libsdl1.2-dev,
- libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, libreadline-dev,
- libedit-dev, libepsilon-dev, pkg-kde-tools,
- autoconf, dh-autoreconf, chrpath,
- docbook2x, docbook-xsl, docbook-xml, xsltproc
+ Build-Depends: debhelper (>= 9),
+ dpkg-dev (>= 1.16.1.1),
+ libcurl4-gnutls-dev,
+ libpng-dev,
+ libjpeg-dev,
+ zlib1g-dev (>= 1.1.4),
- libgd-dev (>= 2.1.0~rc1-2),
++ libgd2-xpm-dev (>= 2.0.1-10),
+ libfreetype6-dev (>= 2.0.9),
+ libgdal1-dev (>= 1.9.0),
+ libproj-dev,
+ libgeos-dev (>= 3.3.1-1~),
+ libfribidi-dev,
+ libcairo2-dev,
+ libgif-dev,
+ librsvg2-dev,
+ libpq-dev,
+ php5-dev,
+ swig,
+ libperl-dev,
+ python-all (>= 2.6.6-3~),
+ python-all-dev (>= 2.6.6-3~),
+ ruby1.9.1,
+ ruby1.9.1-dev,
+ libfcgi-dev,
+ libxml2-dev,
+ libxslt1-dev,
+ pkg-kde-tools,
+ chrpath,
+ cmake (>= 2.8.0),
+ pkg-config,
+ docbook2x,
+ docbook-xsl,
+ docbook-xml,
+ xsltproc
Build-Conflicts: libcurl3-openssl-dev
- Homepage: http://www.mapserver.org
+ XS-Ruby-Versions: ruby1.9.1
+ Standards-Version: 3.9.4
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/mapserver.git
Vcs-Git: git://anonscm.debian.org/pkg-grass/mapserver.git
+ Homepage: http://www.mapserver.org
- Package: libmapserver
- Depends: libmapserver-6.2.1, ${misc:Depends}
- Architecture: all
- Section: oldlibs
- Description: Transitional dummy package for libmapserver-6.2.1
- This is a transitional dummy package to ease upgrades to the
- libmapserver-6.2.1 package. It can safely be removed.
-
- Package: libmapserver-6.2.1
- Replaces: libmapserver (<< 6.2.1-3~bpo70+1linuxminded4)
- Breaks: libmapserver (<< 6.2.1-3~bpo70+1linuxminded4)
- Section: libs
+ Package: libmapserver1
Architecture: any
+ Section: libs
+ Depends: ${shlibs:Depends},
+ ${misc:Depends}
+ Suggests: cgi-mapserver,
+ mapserver-bin,
+ mapserver-doc,
+ libmapscript-perl,
+ php5-mapscript,
+ python-mapscript,
+ ruby-mapscript
Pre-Depends: ${misc:Pre-Depends}
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Suggests: cgi-mapserver, mapserver-bin, mapserver-doc,
- php5-mapscript, python-mapscript, libmapscript-perl, libmapscript-ruby
Description: Shared library for MapServer
This package contains the shared library.
.
@@@ -46,22 -67,22 +67,23 @@@
functionality in MapScript is provided by the suggested mapscript
library packages.
- Package: libmapserver-dev
- Depends: libmapserver-6.2.1-dev, ${misc:Depends}
- Architecture: all
- Section: oldlibs
- Description: Transitional dummy package for libmapserver-6.2.1-dev
- This is a transitional dummy package to ease upgrades to the
- libmapserver-6.2.1-dev package. It can safely be removed.
+
- Package: libmapserver-6.2.1-dev
- Replaces: libmapserver-dev (<< 6.2.1-3~bpo70+1linuxminded4)
- Breaks: libmapserver-dev (<< 6.2.1-3~bpo70+1linuxminded4)
- Section: libdevel
+ Package: libmapserver1-dev
Architecture: any
- Depends: libmapserver-6.2.1 (=${binary:Version}), ${misc:Depends}
- Suggests: cgi-mapserver, mapserver-bin, mapserver-doc,
- php5-mapscript, python-mapscript, libmapscript-perl, libmapscript-ruby
+ Section: libdevel
+ Depends: libmapserver1 (= ${binary:Version}),
+ ${misc:Depends}
+ Suggests: cgi-mapserver,
+ mapserver-bin,
+ mapserver-doc,
+ libmapscript-perl,
+ php5-mapscript,
+ python-mapscript,
+ ruby-mapscript
+ Breaks: libmapserver-dev (<< 6.2.1-3~),
+ libmapserver-6.2.1-dev (<< 6.4.0-1~)
+ Replaces: libmapserver-dev (<< 6.2.1-3~),
+ libmapserver-6.2.1-dev (<< 6.4.0-1~)
Description: Shared library development files for MapServer
This package contains the development files for the shared library.
.
diff --cc debian/libmapserver1.symbols
index 71df8c6,556b269..dc5d1f4
--- a/debian/libmapserver1.symbols
+++ b/debian/libmapserver1.symbols
@@@ -168,11 -168,9 +168,11 @@@ libmapserver.so.1 #PACKAGE# #MINVER
_ZN10ClipperLib17E2InsertsBeforeE1ERNS_5TEdgeES1_ at Base 6.2.1
_ZN10ClipperLib17FindAppendLinkEndEPNS_6OutRecE at Base 6.2.1
_ZN10ClipperLib17GetOverlapSegmentENS_8IntPointES0_S0_S0_RS0_S1_ at Base 6.2.1
- _ZN10ClipperLib17PolyOffsetBuilder8DoSquareEd at Base 6.2.1
+ (arch=powerpc s390)_ZN10ClipperLib17PolyOffsetBuilder8DoSquareEd at Base 6.4.0
_ZN10ClipperLib17PolyOffsetBuilderC1ERKSt6vectorIS1_INS_8IntPointESaIS2_EESaIS4_EERS6_dNS_8JoinTypeEd at Base 6.2.1
_ZN10ClipperLib17PolyOffsetBuilderC2ERKSt6vectorIS1_INS_8IntPointESaIS2_EESaIS4_EERS6_dNS_8JoinTypeEd at Base 6.2.1
+ _ZN10ClipperLib17PolyOffsetBuilderD1Ev at Base 6.2.1
+ _ZN10ClipperLib17PolyOffsetBuilderD2Ev at Base 6.2.1
_ZN10ClipperLib18GetNextNonDupOutPtEPNS_5OutPtERS1_ at Base 6.2.1
_ZN10ClipperLib18GetPrevNonDupOutPtEPNS_5OutPtERS1_ at Base 6.2.1
_ZN10ClipperLib18ReversePolyPtLinksERNS_5OutPtE at Base 6.2.1
@@@ -403,35 -425,39 +431,40 @@@
_ZN9mapserver14verdana16_boldE at Base 6.2.1
_ZN9mapserver14verdana17_boldE at Base 6.2.1
_ZN9mapserver14verdana18_boldE at Base 6.2.1
+ _ZN9mapserver15block_allocator10remove_allEv at Base 6.2.1
_ZN9mapserver15block_allocator8allocateEjj at Base 6.2.1
- (optional=templinst)_ZN9mapserver15clip_move_pointIdEEbT_S1_S1_S1_RKNS_9rect_baseIS1_EEPS1_S6_j at Base 6.2.1
+ #MISSING: 6.4.0# (optional=templinst)_ZN9mapserver15clip_move_pointIdEEbT_S1_S1_S1_RKNS_9rect_baseIS1_EEPS1_S6_j at Base 6.2.1
(optional=templinst)_ZN9mapserver15clip_move_pointIiEEbT_S1_S1_S1_RKNS_9rect_baseIS1_EEPS1_S6_j at Base 6.2.1
- _ZN9mapserver15font_cache_pool4fontEPKcb at Base 6.2.1
+ (arch=ia64 sparc)_ZN9mapserver15font_cache_poolD1Ev at Base 6.4.0
+ (arch=ia64 sparc)_ZN9mapserver15font_cache_poolD2Ev at Base 6.4.0
_ZN9mapserver15line_parameters19s_diagonal_quadrantE at Base 6.2.1
_ZN9mapserver15line_parameters21s_orthogonal_quadrantE at Base 6.2.1
- _ZN9mapserver15line_parametersC1Eiiiii at Base 6.2.1
- _ZN9mapserver15line_parametersC2Eiiiii at Base 6.2.1
- _ZN9mapserver15line_profile_aa3setEdd at Base 6.2.1
- _ZN9mapserver15line_profile_aa5widthEd at Base 6.2.1
- _ZN9mapserver15line_profile_aa7profileEd at Base 6.2.1
+ (arch=armel armhf)_ZN9mapserver15line_parametersC1Eiiiii at Base 6.4.0
+ (arch=armel armhf)_ZN9mapserver15line_parametersC2Eiiiii at Base 6.4.0
+ #MISSING: 6.4.0# _ZN9mapserver15line_profile_aa3setEdd at Base 6.2.1
+ #MISSING: 6.4.0# _ZN9mapserver15line_profile_aa5widthEd at Base 6.2.1
+ #MISSING: 6.4.0# _ZN9mapserver15line_profile_aa7profileEd at Base 6.2.1
(optional=templinst)_ZN9mapserver15vertex_sequenceINS_11vertex_distELj6EE3addERKS1_ at Base 6.2.1
(optional=templinst)_ZN9mapserver15vertex_sequenceINS_11vertex_distELj6EE5closeEb at Base 6.2.1
+ (optional=templinst|arch=ia64 powerpc s390 s390x sparc)_ZN9mapserver15vertex_sequenceINS_11vertex_distELj6EED1Ev at Base 6.4.0
+ (optional=templinst|arch=ia64 powerpc s390 s390x sparc)_ZN9mapserver15vertex_sequenceINS_11vertex_distELj6EED2Ev at Base 6.4.0
(optional=templinst)_ZN9mapserver15vertex_sequenceINS_14line_aa_vertexELj6EE3addERKS1_ at Base 6.2.1
(optional=templinst)_ZN9mapserver15vertex_sequenceINS_14line_aa_vertexELj6EE5closeEb at Base 6.2.1
- _ZN9mapserver16image_filter_lut11realloc_lutEd at Base 6.2.1
- _ZN9mapserver16image_filter_lut9normalizeEv at Base 6.2.1
+ #MISSING: 6.4.0# _ZN9mapserver16image_filter_lut11realloc_lutEd at Base 6.2.1
+ #MISSING: 6.4.0# _ZN9mapserver16image_filter_lut9normalizeEv at Base 6.2.1
_ZN9mapserver16mcs7x12_mono_lowE at Base 6.2.1
- (optional=templinst)_ZN9mapserver16render_scanlinesINS_22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEEENS_11scanline_p8ENS_26renderer_scanline_aa_solidINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEEEEEEvRT_RT0_RT1_ at Base 6.2.1
- (optional=templinst)_ZN9mapserver16render_scanlinesINS_22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEEENS_11scanline_u8ENS_19scanline_storage_aaIhEEEEvRT_RT0_RT1_ at Base 6.2.1
+ (optional=templinst|arch=!ia64 !powerpc !s390 !s390x !sparc)_ZN9mapserver16render_scanlinesINS_22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEEENS_11scanline_p8ENS_26renderer_scanline_aa_solidINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEEEEEEvRT_RT0_RT1_ at Base 6.2.1
+ (optional=templinst|arch=!ia64 !powerpc !s390 !s390x !sparc)_ZN9mapserver16render_scanlinesINS_22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEEENS_11scanline_u8ENS_19scanline_storage_aaIhEEEEvRT_RT0_RT1_ at Base 6.2.1
(optional=templinst)_ZN9mapserver16render_scanlinesINS_22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEEENS_11scanline_u8ENS_26renderer_scanline_aa_solidINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEEEEEEvRT_RT0_RT1_ at Base 6.2.1
(optional=templinst)_ZN9mapserver16render_scanlinesINS_22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEEENS_12scanline_binENS_20scanline_storage_binEEEvRT_RT0_RT1_ at Base 6.2.1
- (optional=templinst)_ZN9mapserver17clip_line_segmentIdEEjPT_S2_S2_S2_RKNS_9rect_baseIS1_EE at Base 6.2.1
- (optional=templinst)_ZN9mapserver17clip_line_segmentIiEEjPT_S2_S2_S2_RKNS_9rect_baseIS1_EE at Base 6.2.1
- _ZN9mapserver17g_elder_bit_tableE at Base 6.2.1
+ (optional=templinst|arch=powerpc s390)_ZN9mapserver17calc_polygon_areaINS_15vertex_sequenceINS_11vertex_distELj6EEEEEdRKT_ at Base 6.4.0
+ #MISSING: 6.4.0# (optional=templinst)_ZN9mapserver17clip_line_segmentIdEEjPT_S2_S2_S2_RKNS_9rect_baseIS1_EE at Base 6.2.1
+ (optional=templinst|arch=ia64 powerpc s390 s390x sparc)_ZN9mapserver17clip_line_segmentIiEEjPT_S2_S2_S2_RKNS_9rect_baseIS1_EE at Base 6.4.0
+ #MISSING: 6.4.0# _ZN9mapserver17g_elder_bit_tableE at Base 6.2.1
_ZN9mapserver17mcs7x12_mono_highE at Base 6.2.1
(optional=templinst)_ZN9mapserver18conv_adaptor_vcgenI12line_adaptorNS_10vcgen_dashENS_12null_markersEE6vertexEPdS5_ at Base 6.2.1
- (optional=templinst)_ZN9mapserver18conv_adaptor_vcgenI12line_adaptorNS_12vcgen_strokeENS_12null_markersEE6vertexEPdS5_ at Base 6.2.1
+ (optional=templinst|arch=ia64 powerpc s390 s390x sparc)_ZN9mapserver18conv_adaptor_vcgenI12line_adaptorNS_12vcgen_strokeENS_12null_markersEE6vertexEPdS5_ at Base 6.4.0
+ (optional=templinst|arch=ia64 powerpc s390 s390x sparc)_ZN9mapserver18conv_adaptor_vcgenINS_9conv_dashI12line_adaptorNS_12null_markersEEENS_12vcgen_strokeES3_E6vertexEPdS7_ at Base 6.4.0
(optional=templinst)_ZN9mapserver18conv_adaptor_vcgenINS_9conv_dashINS_9path_baseINS_20vertex_block_storageIdLj8ELj256EEEEENS_12null_markersEEENS_12vcgen_strokeES6_E6vertexEPdSA_ at Base 6.2.1
(optional=templinst)_ZN9mapserver18conv_adaptor_vcgenINS_9path_baseINS_20vertex_block_storageIdLj8ELj256EEEEENS_10vcgen_dashENS_12null_markersEE6vertexEPdS8_ at Base 6.2.1
(optional=templinst)_ZN9mapserver18conv_adaptor_vcgenINS_9path_baseINS_20vertex_block_storageIdLj8ELj256EEEEENS_12vcgen_strokeENS_12null_markersEE6vertexEPdS8_ at Base 6.2.1
@@@ -467,41 -490,36 +497,40 @@@
(optional=templinst)_ZN9mapserver20decompose_ft_outlineINS_20path_storage_integerIiLj6EEEEEbRK11FT_Outline_bRKNS_12trans_affineERT_ at Base 6.2.1
(optional=templinst)_ZN9mapserver20decompose_ft_outlineINS_20path_storage_integerIsLj6EEEEEbRK11FT_Outline_bRKNS_12trans_affineERT_ at Base 6.2.1
_ZN9mapserver20mcs11_prop_condensedE at Base 6.2.1
- _ZN9mapserver20scanline_storage_binD1Ev at Base 6.2.1
- _ZN9mapserver20scanline_storage_binD2Ev at Base 6.2.1
- (optional=templinst)_ZN9mapserver20vertex_block_storageIdLj8ELj256EE10add_vertexEddj at Base 6.2.1
- (optional=templinst)_ZN9mapserver20vertex_block_storageIdLj8ELj256EE12storage_ptrsEPPd at Base 6.2.1
- (optional=templinst)_ZN9mapserver20vertex_block_storageIdLj8ELj256EE14allocate_blockEj at Base 6.2.1
- (optional=templinst)_ZN9mapserver20vertex_block_storageIdLj8ELj256EE8free_allEv at Base 6.2.1
+ (optional=templinst|arch=amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel)_ZN9mapserver20path_storage_integerIiLj6EE6curve4Eiiiiii at Base 6.2.1
+ (optional=templinst|arch=ia64 powerpc s390 s390x sparc)_ZN9mapserver20path_storage_integerIiLj6EED1Ev at Base 6.4.0
+ (optional=templinst|arch=ia64 powerpc s390 s390x sparc)_ZN9mapserver20path_storage_integerIiLj6EED2Ev at Base 6.4.0
+ (optional=templinst|arch=amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel)_ZN9mapserver20path_storage_integerIsLj6EE6curve4Essssss at Base 6.2.1
+ (optional=templinst|arch=ia64 powerpc s390 s390x sparc)_ZN9mapserver20path_storage_integerIsLj6EED1Ev at Base 6.4.0
+ (optional=templinst|arch=ia64 powerpc s390 s390x sparc)_ZN9mapserver20path_storage_integerIsLj6EED2Ev at Base 6.4.0
+ (arch=ia64 powerpc s390 s390x sparc)_ZN9mapserver20scanline_storage_binD1Ev at Base 6.4.0
+ (arch=ia64 powerpc s390 s390x sparc)_ZN9mapserver20scanline_storage_binD2Ev at Base 6.4.0
+ #MISSING: 6.4.0# (optional=templinst)_ZN9mapserver20vertex_block_storageIdLj8ELj256EE10add_vertexEddj at Base 6.2.1
+ (optional=templinst)_ZN9mapserver20vertex_block_storageIdLj8ELj256EE12storage_ptrsEPPd at Base 6.4.0
+ (optional=templinst|arch=ia64 powerpc s390 s390x sparc)_ZN9mapserver20vertex_block_storageIdLj8ELj256EE14allocate_blockEj at Base 6.4.0
+ (optional=templinst|arch=!ia64 !powerpc !s390 !s390x !sparc)_ZN9mapserver20vertex_block_storageIdLj8ELj256EE8free_allEv at Base 6.2.1
(optional=templinst)_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_satEE4drawERNSI_9draw_varsEjj at Base 6.2.1
(optional=templinst)_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_satEE6renderEb at Base 6.2.1
+ _ZN9mapserver22distance_interpolator45dec_xEi at Base 6.2.1
+ _ZN9mapserver22distance_interpolator45dec_yEi at Base 6.2.1
+ _ZN9mapserver22distance_interpolator4C1Eiiiiiiiiidii at Base 6.2.1
+ _ZN9mapserver22distance_interpolator4C2Eiiiiiiiiidii at Base 6.2.1
(optional=templinst)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE10add_vertexEddj at Base 6.2.1
- (optional=templinst)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE13close_polygonEv at Base 6.2.1
- (optional=templinst)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE14sweep_scanlineINS_11scanline_p8EEEbRT_ at Base 6.2.1
- (optional=templinst)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE8add_pathI15polygon_adaptorEEvRT_j at Base 6.2.1
- (optional=templinst)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE8add_pathINS_11conv_strokeI12line_adaptorNS_12null_markersEEEEEvRT_j at Base 6.2.1
- (optional=templinst)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE8add_pathINS_11conv_strokeINS_9conv_dashI12line_adaptorNS_12null_markersEEES9_EEEEvRT_j at Base 6.2.1
- (optional=templinst)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE8add_pathINS_11conv_strokeINS_9path_baseINS_20vertex_block_storageIdLj8ELj256EEEEENS_12null_markersEEEEEvRT_j at Base 6.2.1
- (optional=templinst)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE8add_pathINS_12conv_clipperI15polygon_adaptorNS_11conv_strokeINS_9conv_dashINS_9path_baseINS_20vertex_block_storageIdLj8ELj256EEEEENS_12null_markersEEESE_EEEEEEvRT_j at Base 6.2.1
- (optional=templinst)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE8add_pathINS_12conv_clipperI15polygon_adaptorNS_11conv_strokeINS_9path_baseINS_20vertex_block_storageIdLj8ELj256EEEEENS_12null_markersEEEEEEEvRT_j at Base 6.2.1
- (optional=templinst)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE8add_pathINS_12conv_contourINS_9path_baseINS_20vertex_block_storageIdLj8ELj256EEEEEEEEEvRT_j at Base 6.2.1
- (optional=templinst)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE8add_pathINS_9path_baseINS_20vertex_block_storageIdLj8ELj256EEEEEEEvRT_j at Base 6.2.1
- (optional=templinst)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE9line_to_dEdd at Base 6.2.1
- (optional=templinst)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE9move_to_dEdd at Base 6.2.1
+ (optional=templinst|arch=!ia64 !powerpc !s390 !s390x !sparc)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE14sweep_scanlineINS_11scanline_p8EEEbRT_ at Base 6.2.1
+ (optional=templinst|arch=amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel)_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=amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel)_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|arch=!ia64 !powerpc !s390x !sparc)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE8add_pathINS_12conv_contourINS_9path_baseINS_20vertex_block_storageIdLj8ELj256EEEEEEEEEvRT_j at Base 6.2.1
+ (optional=templinst|arch=!ia64 !powerpc !s390 !s390x !sparc)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE8add_pathINS_9path_baseINS_20vertex_block_storageIdLj8ELj256EEEEEEEvRT_j at Base 6.2.1
+ (optional=templinst|arch=ia64 powerpc s390 s390x sparc)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE9move_to_dEdd at Base 6.4.0
(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
- (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_EEEEE5line3ERKNS_15line_parametersEiiii at Base 6.2.1
- (optional=templinst)_ZN9mapserver23line_interpolator_imageINS_22renderer_outline_imageINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEENS_18line_image_patternINS_28pattern_filter_bilinear_rgbaIS5_EEEEEEE8step_horEv at Base 6.2.1
- (optional=templinst)_ZN9mapserver23line_interpolator_imageINS_22renderer_outline_imageINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEENS_18line_image_patternINS_28pattern_filter_bilinear_rgbaIS5_EEEEEEE8step_verEv at Base 6.2.1
- (optional=templinst)_ZN9mapserver23line_interpolator_imageINS_22renderer_outline_imageINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEENS_18line_image_patternINS_28pattern_filter_bilinear_rgbaIS5_EEEEEEEC1ERSG_RKNS_15line_parametersEiiiiid at Base 6.2.1
- (optional=templinst)_ZN9mapserver23line_interpolator_imageINS_22renderer_outline_imageINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEENS_18line_image_patternINS_28pattern_filter_bilinear_rgbaIS5_EEEEEEEC2ERSG_RKNS_15line_parametersEiiiiid at Base 6.2.1
- (optional=templinst)_ZN9mapserver23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjE17blend_color_hspanEiijPKS2_PKhh at Base 6.2.1
- (optional=templinst)_ZN9mapserver23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjE17blend_color_vspanEiijPKS2_PKhh at Base 6.2.1
- (optional=templinst)_ZN9mapserver24decompose_ft_bitmap_monoINS_12scanline_binENS_20scanline_storage_binEEEvRK10FT_Bitmap_iibRT_RT0_ at Base 6.2.1
- (optional=templinst)_ZN9mapserver25decompose_ft_bitmap_gray8INS_22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEEENS_11scanline_u8ENS_19scanline_storage_aaIhEEEEvRK10FT_Bitmap_iibRT_RT0_RT1_ at Base 6.2.1
+ (optional=templinst|arch=!ia64 !powerpc !s390 !s390x !sparc)_ZN9mapserver22renderer_outline_imageINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEENS_18line_image_patternINS_28pattern_filter_bilinear_rgbaIS4_EEEEE5line3ERKNS_15line_parametersEiiii at Base 6.2.1
+ (optional=templinst|arch=ia64 s390 s390x sparc)_ZN9mapserver23line_interpolator_imageINS_22renderer_outline_imageINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEENS_18line_image_patternINS_28pattern_filter_bilinear_rgbaIS5_EEEEEEE8step_horEv at Base 6.4.0
+ (optional=templinst|arch=ia64 powerpc s390 s390x sparc)_ZN9mapserver23line_interpolator_imageINS_22renderer_outline_imageINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEENS_18line_image_patternINS_28pattern_filter_bilinear_rgbaIS5_EEEEEEEC1ERSG_RKNS_15line_parametersEiiiiid at Base 6.4.0
+ (optional=templinst|arch=ia64 powerpc s390 s390x sparc)_ZN9mapserver23line_interpolator_imageINS_22renderer_outline_imageINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEENS_18line_image_patternINS_28pattern_filter_bilinear_rgbaIS5_EEEEEEEC2ERSG_RKNS_15line_parametersEiiiiid at Base 6.4.0
+ (optional=templinst|arch=ia64 powerpc s390 s390x sparc)_ZN9mapserver23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjE17blend_color_hspanEiijPKS2_PKhh at Base 6.4.0
+ (optional=templinst|arch=!armel !armhf)_ZN9mapserver23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjE17blend_color_vspanEiijPKS2_PKhh at Base 6.2.1
+ (optional=templinst|arch=ia64 powerpc s390 s390x sparc)_ZN9mapserver24decompose_ft_bitmap_monoINS_12scanline_binENS_20scanline_storage_binEEEvRK10FT_Bitmap_iibRT_RT0_ at Base 6.4.0
+ (optional=templinst|arch=ia64 powerpc s390 s390x sparc)_ZN9mapserver25decompose_ft_bitmap_gray8INS_22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEEENS_11scanline_u8ENS_19scanline_storage_aaIhEEEEvRK10FT_Bitmap_iibRT_RT0_RT1_ at Base 6.4.0
_ZN9mapserver25font_engine_freetype_base10resolutionEj at Base 6.2.1
_ZN9mapserver25font_engine_freetype_base11add_kerningEjjPdS1_ at Base 6.2.1
_ZN9mapserver25font_engine_freetype_base13prepare_glyphEj at Base 6.2.1
@@@ -572,44 -590,35 +601,37 @@@
_ZNK9mapserver25font_engine_freetype_base9descenderEv at Base 6.2.1
_ZNK9mapserver25font_engine_freetype_base9find_faceEPKc at Base 6.2.1
_ZNK9mapserver25font_engine_freetype_base9num_facesEv at Base 6.2.1
- (optional=templinst)_ZNSt12_Destroy_auxILb0EE9__destroyIPN10ClipperLib9ExPolygonEEEvT_S5_ at Base 6.2.1
- (optional=templinst)_ZNSt12_Destroy_auxILb0EE9__destroyIPSt6vectorIN10ClipperLib8IntPointESaIS4_EEEEvT_S8_ at Base 6.2.1
- (optional=templinst)_ZNSt12_Vector_baseIN10ClipperLib8IntPointESaIS1_EED1Ev at Base 6.2.1
- (optional=templinst)_ZNSt12_Vector_baseIN10ClipperLib8IntPointESaIS1_EED2Ev at Base 6.2.1
- (optional=templinst)_ZNSt12_Vector_baseISt6vectorIN10ClipperLib8IntPointESaIS2_EESaIS4_EED1Ev at Base 6.2.1
- (optional=templinst)_ZNSt12_Vector_baseISt6vectorIN10ClipperLib8IntPointESaIS2_EESaIS4_EED2Ev at Base 6.2.1
- (optional=templinst)_ZNSt20__copy_move_backwardILb0ELb0ESt26random_access_iterator_tagE13__copy_move_bIPSt6vectorIN10ClipperLib8IntPointESaIS5_EES8_EET0_T_SA_S9_ at Base 6.2.1
- (optional=templinst)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPN10ClipperLib9ExPolygonES4_EET0_T_S6_S5_ at Base 6.2.1
- (optional=templinst)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPSt6vectorIN10ClipperLib8IntPointESaIS4_EES7_EET0_T_S9_S8_ at Base 6.2.1
- (optional=templinst)_ZNSt22__uninitialized_fill_nILb0EE15__uninit_fill_nIPN10ClipperLib9ExPolygonEmS3_EEvT_T0_RKT1_ at Base 6.2.1
- (optional=templinst)_ZNSt22__uninitialized_fill_nILb0EE15__uninit_fill_nIPSt6vectorIN10ClipperLib8IntPointESaIS4_EEmS6_EEvT_T0_RKT1_ at Base 6.2.1
- (optional=templinst)_ZNSt6vectorIN10ClipperLib11DoublePointESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_ at Base 6.2.1
+ (optional=templinst|arch=!ia64 !powerpc !s390 !s390x !sparc)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPN10ClipperLib9ExPolygonES4_EET0_T_S6_S5_ at Base 6.2.1
+ (optional=templinst|arch=!ia64 !powerpc !s390 !s390x !sparc)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPSt6vectorIN10ClipperLib8IntPointESaIS4_EES7_EET0_T_S9_S8_ at Base 6.2.1
+ (optional=templinst|arch=armel armhf i386 kfreebsd-i386 mips mipsel)_ZNSt22__uninitialized_fill_nILb0EE15__uninit_fill_nIPSt6vectorIN10ClipperLib8IntPointESaIS4_EEjS6_EEvT_T0_RKT1_ at Base 6.2.1
+ (optional=templinst|arch=amd64 kfreebsd-amd64)_ZNSt22__uninitialized_fill_nILb0EE15__uninit_fill_nIPSt6vectorIN10ClipperLib8IntPointESaIS4_EEmS6_EEvT_T0_RKT1_ at Base 6.2.1
+ (optional=templinst|arch=armel armhf i386 kfreebsd-i386 mips mipsel sparc)_ZNSt6vectorIN10ClipperLib11DoublePointESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_ at Base 6.2.1
+ (optional=templinst|arch=amd64 ia64 kfreebsd-amd64)_ZNSt6vectorIN10ClipperLib11DoublePointESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_ at Base 6.2.1
(optional=templinst)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_ at Base 6.2.1
- (optional=templinst)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_ at Base 6.2.1
- (optional=templinst)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EE7reserveEm at Base 6.2.1
- (optional=templinst)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EED1Ev at Base 6.2.1
- (optional=templinst)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EED2Ev at Base 6.2.1
+ (optional=templinst|arch=armel armhf i386 kfreebsd-i386 mips mipsel powerpc sparc)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_ at Base 6.2.1
+ (optional=templinst|arch=amd64 ia64 kfreebsd-amd64 s390 s390x)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_ at Base 6.2.1
+ (optional=templinst|arch=armel armhf i386 ia64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc|subst)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EE7reserveE{size_t}@Base 6.4.0
+ (optional=templinst|arch=ia64 powerpc s390 s390x sparc)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EEC1ERKS3_ at Base 6.4.0
+ (optional=templinst|arch=ia64 powerpc s390 s390x sparc)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EEC2ERKS3_ at Base 6.4.0
(optional=templinst)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EEaSERKS3_ at Base 6.2.1
- (optional=templinst)_ZNSt6vectorIN10ClipperLib9ExPolygonESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_ at Base 6.2.1
- (optional=templinst)_ZNSt6vectorIN10ClipperLib9ExPolygonESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_ at Base 6.2.1
- (optional=templinst)_ZNSt6vectorIN10ClipperLib9ExPolygonESaIS1_EE7reserveEm at Base 6.2.1
+ (optional=templinst|arch=!ia64 !powerpc !s390 !s390x !sparc)_ZNSt6vectorIN10ClipperLib9ExPolygonESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_ at Base 6.2.1
+ (optional=templinst|arch=armel armhf i386 kfreebsd-i386 mips mipsel powerpc)_ZNSt6vectorIN10ClipperLib9ExPolygonESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_ at Base 6.2.1
+ (optional=templinst|arch=amd64 kfreebsd-amd64 s390 s390x)_ZNSt6vectorIN10ClipperLib9ExPolygonESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_ at Base 6.2.1
+ (optional=templinst|arch=armel armhf i386 kfreebsd-i386 mips mipsel powerpc sparc)_ZNSt6vectorIN10ClipperLib9ExPolygonESaIS1_EE7reserveEj at Base 6.2.1
+ (optional=templinst|arch=amd64 ia64 kfreebsd-amd64 s390 s390x)_ZNSt6vectorIN10ClipperLib9ExPolygonESaIS1_EE7reserveEm at Base 6.2.1
(optional=templinst)_ZNSt6vectorIPN10ClipperLib11HorzJoinRecESaIS2_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS2_S4_EERKS2_ at Base 6.2.1
- (optional=templinst)_ZNSt6vectorIPN10ClipperLib11HorzJoinRecESaIS2_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS2_S4_EEmRKS2_ at Base 6.2.1
- (optional=templinst)_ZNSt6vectorIPN10ClipperLib11HorzJoinRecESaIS2_EED1Ev at Base 6.2.1
- (optional=templinst)_ZNSt6vectorIPN10ClipperLib11HorzJoinRecESaIS2_EED2Ev at Base 6.2.1
+ (optional=templinst|arch=armel armhf i386 kfreebsd-i386 mips mipsel)_ZNSt6vectorIPN10ClipperLib11HorzJoinRecESaIS2_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS2_S4_EEjRKS2_ at Base 6.2.1
+ (optional=templinst|arch=amd64 kfreebsd-amd64)_ZNSt6vectorIPN10ClipperLib11HorzJoinRecESaIS2_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS2_S4_EEmRKS2_ at Base 6.2.1
(optional=templinst)_ZNSt6vectorIPN10ClipperLib5TEdgeESaIS2_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS2_S4_EERKS2_ at Base 6.2.1
(optional=templinst)_ZNSt6vectorIPN10ClipperLib6OutRecESaIS2_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS2_S4_EERKS2_ at Base 6.2.1
+ (optional=templinst)_ZNSt6vectorIPN10ClipperLib6OutRecESaIS2_EED1Ev at Base 6.2.1
+ (optional=templinst)_ZNSt6vectorIPN10ClipperLib6OutRecESaIS2_EED2Ev at Base 6.2.1
(optional=templinst)_ZNSt6vectorIPN10ClipperLib7JoinRecESaIS2_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS2_S4_EERKS2_ at Base 6.2.1
- (optional=templinst)_ZNSt6vectorIPN10ClipperLib7JoinRecESaIS2_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS2_S4_EEmRKS2_ at Base 6.2.1
- (optional=templinst)_ZNSt6vectorIPN10ClipperLib7JoinRecESaIS2_EED1Ev at Base 6.2.1
- (optional=templinst)_ZNSt6vectorIPN10ClipperLib7JoinRecESaIS2_EED2Ev at Base 6.2.1
- (optional=templinst)_ZNSt6vectorIS_IN10ClipperLib8IntPointESaIS1_EESaIS3_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS3_S5_EERKS3_ at Base 6.2.1
- (optional=templinst)_ZNSt6vectorIS_IN10ClipperLib8IntPointESaIS1_EESaIS3_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS3_S5_EEmRKS3_ at Base 6.2.1
- (optional=templinst)_ZNSt6vectorIS_IN10ClipperLib8IntPointESaIS1_EESaIS3_EE5clearEv at Base 6.2.1
- (optional=templinst)_ZNSt6vectorIS_IN10ClipperLib8IntPointESaIS1_EESaIS3_EEC1ERKS5_ at Base 6.2.1
- (optional=templinst)_ZNSt6vectorIS_IN10ClipperLib8IntPointESaIS1_EESaIS3_EEC2ERKS5_ at Base 6.2.1
+ (optional=templinst|arch=armel armhf i386 kfreebsd-i386 mips mipsel)_ZNSt6vectorIPN10ClipperLib7JoinRecESaIS2_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS2_S4_EEjRKS2_ at Base 6.2.1
+ (optional=templinst|arch=amd64 kfreebsd-amd64)_ZNSt6vectorIPN10ClipperLib7JoinRecESaIS2_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS2_S4_EEmRKS2_ at Base 6.2.1
+ (optional=templinst|arch=!ia64 !powerpc !s390 !s390x !sparc)_ZNSt6vectorIS_IN10ClipperLib8IntPointESaIS1_EESaIS3_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS3_S5_EERKS3_ at Base 6.2.1
+ (optional=templinst|arch=armel armhf i386 kfreebsd-i386 mips mipsel powerpc sparc)_ZNSt6vectorIS_IN10ClipperLib8IntPointESaIS1_EESaIS3_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS3_S5_EEjRKS3_ at Base 6.2.1
+ (optional=templinst|arch=amd64 ia64 kfreebsd-amd64 s390 s390x)_ZNSt6vectorIS_IN10ClipperLib8IntPointESaIS1_EESaIS3_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS3_S5_EEmRKS3_ at Base 6.2.1
(optional=templinst)_ZNSt6vectorIS_IN10ClipperLib8IntPointESaIS1_EESaIS3_EED1Ev at Base 6.2.1
(optional=templinst)_ZNSt6vectorIS_IN10ClipperLib8IntPointESaIS1_EESaIS3_EED2Ev at Base 6.2.1
(optional=templinst)_ZNSt6vectorIS_IN10ClipperLib8IntPointESaIS1_EESaIS3_EEaSERKS5_ at Base 6.2.1
--
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