[mapserver] 04/09: Merge tag 'debian/7.0.4-1' into osgeo/10.5
Bas Couwenberg
sebastic at debian.org
Mon Jan 16 22:40:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch osgeo/10.5
in repository mapserver.
commit 4ca0d0f046e39584fd1e05e00066e1329da9612c
Merge: 129f1ec fb25df8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Jan 16 20:50:13 2017 +0100
Merge tag 'debian/7.0.4-1' into osgeo/10.5
Conflicts:
debian/changelog
debian/control
CMakeLists.txt | 4 +-
HISTORY.TXT | 4 +-
README | 3 +-
README.WIN32 | 129 +-
cmake/FindICONV.cmake | 2 +-
cmake/FindPHP5.cmake | 29 +-
debian/cgi-mapserver.lintian-overrides | 2 -
debian/changelog | 45 +-
debian/control | 3 +-
debian/copyright | 3 +-
debian/libmapscript-java.lintian-overrides | 2 -
debian/libmapserver2.symbols | 93 +-
debian/mapserver-bin.lintian-overrides | 2 -
debian/patches/didnt-typo.patch | 34 -
debian/patches/series | 1 -
debian/rules | 5 +-
fontcache.c | 6 +
hittest.c | 11 +
kerneldensity.c | 1 +
mapcairo.c | 5 +-
mapchart.c | 7 +-
mapcluster.c | 67 +-
mapcopy.c | 15 +-
mapdraw.c | 60 +-
mapdrawgdal.c | 33 +-
mapfile.c | 164 +-
mapgraticule.c | 23 +-
maplabel.c | 9 +-
maplayer.c | 29 +-
maplegend.c | 79 +-
maplexer.c | 2387 ++++++++++++++-------------
maplexer.l | 2 +-
maplibxml2.c | 7 +-
mapmssql2008.c | 263 ++-
mapogcfilter.c | 166 +-
mapogcfilter.h | 3 +
mapogcfiltercommon.c | 73 +-
mapogcsld.c | 1 +
mapogcsos.c | 2 +-
mapogr.cpp | 1783 ++++++++++++++++----
mapogroutput.c | 35 +-
mapowscommon.c | 56 +-
mappostgis.c | 86 +-
mapprimitive.c | 12 +-
mapquery.c | 55 +-
mapraster.c | 94 +-
maprasterquery.c | 10 +-
mapresample.c | 101 ++
mapscript/csharp/CMakeLists.txt | 8 +-
mapscript/csharp/Makefile.vc | 3 +-
mapscript/csharp/csmodule.i | 32 +-
mapscript/csharp/examples/drawmapGDIPlus.cs | 97 ++
mapscript/csharp/examples/drawmapWPF.cs | 109 ++
mapscript/csharp/swig_csharp_extensions.i | 50 +
mapscript/php/CMakeLists.txt | 10 +-
mapscript/php/README.WIN32 | 96 +-
mapscript/php/error.c | 11 +
mapscript/php/layer.c | 100 +-
mapscript/php/owsrequest.c | 5 +-
mapscript/swiginc/class.i | 9 +-
mapscript/swiginc/color.i | 2 +-
mapserv.c | 2 +
mapserver.h | 12 +-
mapstring.c | 5 +-
mapsymbol.c | 6 +
maputfgrid.cpp | 66 +-
mapwcs20.c | 21 +-
mapwfs.c | 21 +-
mapwfs11.c | 20 +-
mapwfs20.c | 49 +-
70 files changed, 4597 insertions(+), 2143 deletions(-)
diff --cc debian/changelog
index 9ddb3d2,a22f5c7..4cc4a23
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,46 +1,70 @@@
- mapserver (7.0.1-4~xenial3) UNRELEASED; urgency=medium
++mapserver (7.0.4-1~xenial1) UNRELEASED; urgency=medium
+
+ * Update branch in gbp.conf & Vcs-Git URL.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 16 Jan 2017 20:43:54 +0100
+
+ mapserver (7.0.4-1) unstable; urgency=high
+
+ * New upstream release.
+ - Security release.
+ * Add Open Source Geospatial Foundation to copyright holders.
+ * Update symbols for amd64.
+ * Add dh-python to build dependencies.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 16 Jan 2017 19:38:29 +0100
+
+ mapserver (7.0.3-1) unstable; urgency=high
+
+ * New upstream release.
+ - Fixes CVE-2016-9839
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 05 Dec 2016 21:44:37 +0100
+
+ mapserver (7.0.2-2) unstable; urgency=medium
+
+ * Enable pie hardening flags.
+ (closes: #844892)
+ * Drop unused overrides for hardening-no-pie.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 19 Nov 2016 10:39:25 +0100
+
+ mapserver (7.0.2-1) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 23 Sep 2016 14:13:34 +0200
+
+ mapserver (7.0.2-1~exp1) experimental; 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.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 21 Sep 2016 21:26:23 +0200
+
+mapserver (7.0.1-4~xenial2~php5.6) xenial; urgency=medium
+
+ * Rebuild for GDAL 2.1.2.
+
+ -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Wed, 21 Dec 2016 22:00:00 +0200
+
+mapserver (7.0.1-4~xenial1~php5.6) xenial; urgency=medium
+
+ * Re-enabled PHP support, specifically for OSGeoLive.
+
+ -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Sun, 05 Jun 2016 16:48:00 +0200
+
+mapserver (7.0.1-4~xenial0) xenial; urgency=medium
+
+ * Rebuild for GDAL 2.1.0.
+
+ -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Mon, 10 May 2016 01:48:00 +0200
+
mapserver (7.0.1-3) unstable; urgency=medium
* Disable PHP mapscript, extension doesn't support PHP 7 yet.
diff --cc debian/control
index ee19132,cbd2aae..7cb274b
--- a/debian/control
+++ b/debian/control
@@@ -6,7 -6,8 +6,8 @@@ Uploaders: Francesco Paolo Lovergine <f
Section: devel
Priority: optional
Build-Depends: debhelper (>= 9),
-# dh-php,
+ dh-php,
+ dh-python,
dpkg-dev (>= 1.16.1.1),
cmake (>= 2.8.12.1-1.2),
chrpath,
@@@ -44,9 -45,9 +45,9 @@@
docbook-xml,
xsltproc
Build-Conflicts: libcurl3-openssl-dev
- Standards-Version: 3.9.7
+ Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/mapserver.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mapserver.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mapserver.git -b osgeo/10.5
Homepage: http://www.mapserver.org
XS-Ruby-Versions: all
--
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