[qgis] 02/07: Merge tag 'upstream/2.8.6+dfsg'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository qgis.

commit 7aae50171abb1c53d19682c25c7ceff4543275eb
Merge: aa9f10b 2d55ac1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jan 19 06:55:04 2016 +0100

    Merge tag 'upstream/2.8.6+dfsg'
    
    Upstream version 2.8.6+dfsg
    
    Conflicts:
    	debian/changelog
    	debian/control.in

 CMakeLists.txt                                     |  2 +-
 ChangeLog                                          | 37 ++++++++++++++++++++++
 debian/changelog                                   |  6 ++++
 .../editorwidgets/core/qgseditorwidgetwrapper.sip  |  9 ++++++
 python/gui/qgsfieldvalidator.sip                   |  2 +-
 src/core/qgsmaplayer.cpp                           |  6 ++++
 .../editorwidgets/core/qgseditorwidgetwrapper.cpp  |  6 ++++
 .../editorwidgets/core/qgseditorwidgetwrapper.h    |  9 ++++++
 src/gui/editorwidgets/qgstexteditwrapper.cpp       | 17 ++++++++--
 src/gui/qgsfieldvalidator.cpp                      | 16 ++++++----
 src/gui/qgsfieldvalidator.h                        |  3 +-
 src/providers/postgres/qgspostgresprovider.cpp     |  8 ++---
 12 files changed, 105 insertions(+), 16 deletions(-)

diff --cc debian/changelog
index ae5e2fe,90650d7..947fddd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,41 -1,23 +1,47 @@@
+ qgis (2.8.6) UNRELEASED; urgency=medium
+ 
+   * Release of 2.8.6
+ 
+  -- Jürgen E. Fischer <jef at norbit.de>  Fri, 15 Jan 2016 13:00:09 +0100
+ 
 -qgis (2.8.5) unstable; urgency=medium
 +qgis (2.8.5+dfsg-1~exp2) UNRELEASED; urgency=medium
  
 +  * Add dependency on openscenegraph-plugin-osgearth to qgis-plugin-globe.
 +    QGIS crashes when using the Globe plugin if this package is not installed.
 +    (closes: #808817)
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Wed, 23 Dec 2015 16:57:29 +0100
 +
 +qgis (2.8.5+dfsg-1~exp1) experimental; urgency=medium
 +
 +  [ Jürgen E. Fischer ]
    * Release of 2.8.5
  
 - -- Jürgen E. Fischer <jef at norbit.de>  Fri, 15 Jan 2016 13:00:09 +0100
 +  [ Bas Couwenberg ]
 +  * New upstream release.
 +  * Refresh patches.
 +  * Update symbols for amd64.
 +  * Add patches for 'occurred' & 'browser' typos.
  
 -qgis (2.8.4) unstable; urgency=medium
 + -- Bas Couwenberg <sebastic at debian.org>  Mon, 21 Dec 2015 11:48:03 +0100
  
 -  * Release of 2.8.4
 +qgis (2.8.4+dfsg-1) unstable; urgency=medium
 +
 +  * Update symbols for other architectures.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Tue, 08 Dec 2015 18:01:50 +0100
  
 - -- Jürgen E. Fischer <jef at norbit.de>  Fri, 18 Dec 2015 14:18:20 +0100
 +qgis (2.8.4+dfsg-1~exp2) unstable; urgency=medium
  
 -qgis (2.8.3-1) unstable; urgency=medium
 +  * Update symbols for other architectures.
 +  * Move from experimental to unstable.
  
 + -- Bas Couwenberg <sebastic at debian.org>  Mon, 07 Dec 2015 14:23:35 +0100
 +
 +qgis (2.8.4+dfsg-1~exp1) experimental; urgency=medium
 +
 +  [ Jürgen E. Fischer ]
 +  * Release of 2.8.4
    * split grass provider off into a separate package.
    * disable grass plugin on sid (because of GRASS7)
    * add ubuntu wily

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