[mapserver] 02/03: Merge tag 'debian/7.0.2-1' into ubuntu/xenial

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch ubuntu/xenial
in repository mapserver.

commit d26ea8b6a95a5e906388a1b5266f8dbef39e279d
Merge: cc06b99 0778053
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Sep 26 23:17:03 2016 +0200

    Merge tag 'debian/7.0.2-1' into ubuntu/xenial
    
    Conflicts:
    	debian/changelog

 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 8def7ee,758ffc0..bc65db7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,20 +1,26 @@@
+ 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~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.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git