[mapserver] 01/02: Merge tag 'debian/7.0.4-1' into ubuntu/trusty

[Bas Couwenberg]

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

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

commit ed34513b3e8a14e2095e2a915683233163cac0ac
Merge: 883295d fb25df8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jan 16 19:51:54 2017 +0100

    Merge tag 'debian/7.0.4-1' into ubuntu/trusty
    
    Conflicts:
    	debian/changelog
    	debian/control

 CMakeLists.txt               |   2 +-
 README                       |   2 +-
 README.WIN32                 | 127 +++++++++++++++++++++++++++-------------
 debian/changelog             |  10 ++++
 debian/control               |   1 +
 debian/copyright             |   3 +-
 debian/libmapserver2.symbols |  43 +++++++-------
 mapcluster.c                 |  12 +++-
 mapdrawgdal.c                |  24 +++++++-
 maplegend.c                  |  67 +++++++++++++++++++++-
 mapogcfilter.c               |   4 +-
 mapogcfiltercommon.c         |   2 +
 mapogr.cpp                   | 134 +++++++++++++++++++++++++++++++++++--------
 mapraster.c                  |  58 +++++++++++++------
 mapresample.c                | 101 ++++++++++++++++++++++++++++++++
 mapscript/php/README.WIN32   |  96 +++++++++++--------------------
 mapserver.h                  |   1 +
 mapstring.c                  |   5 +-
 mapwfs.c                     |   2 +-
 mapwfs20.c                   |  43 +++++++++++---
 20 files changed, 549 insertions(+), 188 deletions(-)

diff --cc debian/changelog
index 5afd358,a22f5c7..003cfb9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,19 @@@
+ 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~trusty1) trusty; urgency=medium
 +
 +  * Rebuild for trusty.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Mon, 05 Dec 2016 22:22:09 +0100
 +
  mapserver (7.0.3-1) unstable; urgency=high
  
    * New upstream release.
diff --cc debian/control
index f4258d3,cbd2aae..259e053
--- a/debian/control
+++ b/debian/control
@@@ -6,6 -6,8 +6,7 @@@ Uploaders: Francesco Paolo Lovergine <f
  Section: devel
  Priority: optional
  Build-Depends: debhelper (>= 9),
 -#               dh-php,
+                dh-python,
                 dpkg-dev (>= 1.16.1.1),
                 cmake (>= 2.8.12.1-1.2),
                 chrpath,

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