This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch ubuntu/trusty in repository mapserver.
commit b79276972b48b1d1f824178d8f56e0e8e9bf6238 Merge: e76b30a 0778053 Author: Bas Couwenberg <[email protected]> Date: Mon Sep 26 22:48:18 2016 +0200 Merge tag 'debian/7.0.2-1' into ubuntu/trusty Conflicts: debian/changelog debian/libmapserver2.symbols debian/patches/series CMakeLists.txt | 2 +- HISTORY.TXT | 4 +- debian/changelog | 17 + debian/control | 2 +- debian/libmapscript-java.lintian-overrides | 2 - debian/libmapserver2.symbols | 77 +- debian/patches/didnt-typo.patch | 34 - debian/patches/series | 1 - hittest.c | 11 + kerneldensity.c | 1 + mapcairo.c | 5 +- mapchart.c | 7 +- mapcluster.c | 57 +- mapcopy.c | 15 +- mapdraw.c | 60 +- mapdrawgdal.c | 9 + mapfile.c | 164 +++- mapgraticule.c | 23 +- maplabel.c | 9 +- maplegend.c | 12 +- maplibxml2.c | 7 +- mapmssql2008.c | 111 ++- mapogcfilter.c | 103 ++- mapogcfilter.h | 1 + mapogcfiltercommon.c | 29 +- mapogcsld.c | 1 + mapogcsos.c | 2 +- mapogr.cpp | 1303 +++++++++++++++++++++------ mapogroutput.c | 35 +- mapowscommon.c | 56 +- mappostgis.c | 76 +- mapprimitive.c | 12 +- mapquery.c | 53 +- mapraster.c | 36 +- maprasterquery.c | 10 +- mapscript/csharp/CMakeLists.txt | 8 +- mapscript/csharp/Makefile.vc | 3 +- mapscript/csharp/csmodule.i | 26 +- mapscript/csharp/examples/drawmapGDIPlus.cs | 97 ++ mapscript/csharp/examples/drawmapWPF.cs | 109 +++ mapscript/csharp/swig_csharp_extensions.i | 50 + mapscript/php/layer.c | 100 +- mapscript/swiginc/class.i | 9 +- mapscript/swiginc/color.i | 2 +- mapserver.h | 2 +- mapsymbol.c | 6 + maputfgrid.cpp | 58 +- mapwcs20.c | 21 +- mapwfs.c | 7 +- mapwfs11.c | 20 +- mapwfs20.c | 6 +- 51 files changed, 2155 insertions(+), 716 deletions(-) diff --cc debian/changelog index 173652e,758ffc0..cca7844 --- a/debian/changelog +++ b/debian/changelog @@@ -1,16 -1,20 +1,33 @@@ + mapserver (7.0.2-1) unstable; urgency=medium + + * Update symbols for other architectures. + * Move from experimental to unstable. + + -- Bas Couwenberg <[email protected]> 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 <[email protected]> Wed, 21 Sep 2016 21:26:23 +0200 + +mapserver (7.0.1-4~trusty2) trusty; urgency=medium + + * Enabled PHP support. + + -- Angelos Tzotsos <[email protected]> Tue, 19 Jul 2016 23:00:00 +0200 + +mapserver (7.0.1-4~trusty0) trusty; urgency=medium + + * Rebuild for GDAL 2.1.0. + * Added CMake Ruby patch. + + -- Angelos Tzotsos <[email protected]> Sun, 03 Jul 2016 14:00:00 +0200 + mapserver (7.0.1-3) unstable; urgency=medium * Disable PHP mapscript, extension doesn't support PHP 7 yet. diff --cc debian/patches/series index 0b911f3,78cc1a1..26c4b28 --- a/debian/patches/series +++ b/debian/patches/series @@@ -2,5 -2,3 +2,4 @@@ hardening.patc perl-mapscript-install.patch ruby-mapscript-install.patch java-hardening.patch - didnt-typo.patch +cmake-ruby2.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
