[qgis] 01/02: Merge tag 'debian/2.8.6+dfsg-1' into jessie-backports

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch jessie-backports
in repository qgis.

commit 49e5fb7be7caaec426261b21984d3c5c4ead3c68
Merge: f7d0d6f b40fc2f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Feb 1 14:06:46 2016 +0100

    Merge tag 'debian/2.8.6+dfsg-1' into jessie-backports
    
    Conflicts:
    	debian/changelog
    	debian/control

 CMakeLists.txt                                     |    2 +-
 ChangeLog                                          |   94 +
 debian/changelog                                   |   43 +
 debian/compat.in                                   |    3 -
 debian/control                                     |   47 +-
 debian/control.in                                  |  431 -
 ...2.8.4.install => libqgis-analysis2.8.6.install} |    0
 ...2.8.4.symbols => libqgis-analysis2.8.6.symbols} |    2 +-
 ...core2.8.4.install => libqgis-core2.8.6.install} |    0
 ...core2.8.4.symbols => libqgis-core2.8.6.symbols} |  102 +-
 debian/libqgis-customwidgets.install.in            |    1 -
 ...s-gui2.8.4.install => libqgis-gui2.8.6.install} |    0
 ...s-gui2.8.4.symbols => libqgis-gui2.8.6.symbols} |   31 +-
 ...nstall => libqgis-networkanalysis2.8.6.install} |    0
 ...ymbols => libqgis-networkanalysis2.8.6.symbols} |    2 +-
 ...er2.8.4.install => libqgis-server2.8.6.install} |    0
 ...er2.8.4.symbols => libqgis-server2.8.6.symbols} |    5 +-
 ...rass2.8.4.install => libqgisgrass2.8.6.install} |    0
 ...errides => libqgisgrass2.8.6.lintian-overrides} |    2 +-
 ...rass2.8.4.symbols => libqgisgrass2.8.6.symbols} |   20 +-
 ...hon2.8.4.install => libqgispython2.8.6.install} |    0
 ...hon2.8.4.symbols => libqgispython2.8.6.symbols} |    2 +-
 debian/patches/allows-to-typo.patch                |   70 +-
 debian/patches/browser-typo.patch                  |  522 ++
 debian/patches/occurred-typo.patch                 | 8324 ++++++++++++++++++++
 debian/patches/occurrences-typo.patch              |   10 +-
 debian/patches/override.patch                      |  578 ++
 debian/patches/series                              |    4 +
 debian/patches/suppress-typo.patch                 |  522 ++
 debian/python-qgis.install.in                      |    9 -
 debian/qgis-provider-grass.install.in              |    4 -
 debian/rules                                       |   26 +-
 python/core/qgsfeature.sip                         |    2 +-
 .../editorwidgets/core/qgseditorwidgetwrapper.sip  |    9 +
 python/gui/qgsfieldvalidator.sip                   |    2 +-
 src/app/legend/qgsapplegendinterface.cpp           |   26 +-
 src/core/dxf/qgsdxfexport.cpp                      |    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 +-
 src/server/qgshttprequesthandler.cpp               |    1 +
 src/server/qgsserverprojectparser.cpp              |   42 +-
 src/server/qgswmsconfigparser.cpp                  |    2 +-
 47 files changed, 10362 insertions(+), 645 deletions(-)

diff --cc debian/changelog
index de15b80,4b77467..b2ac807
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,46 +1,52 @@@
+ qgis (2.8.6+dfsg-1) unstable; urgency=medium
+ 
+   * Update symbols for other architectures.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 25 Jan 2016 06:26:31 +0100
+ 
+ qgis (2.8.6+dfsg-1~exp2) unstable; urgency=medium
+ 
+   * Move from experimental to unstable.
+   * Add patches for 'override' & 'suppress' typos.
+   * Update Vcs-Git URL to use HTTPS.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 24 Jan 2016 13:51:55 +0100
+ 
+ qgis (2.8.6+dfsg-1~exp1) experimental; urgency=medium
+ 
+   [ Jürgen E. Fischer ]
+   * Release of 2.8.6
+ 
+   [ Bas Couwenberg ]
+   * New upstream release.
+   * 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)
+   * Refresh patches.
+   * Update symbols for amd64.
+   * Fix API documentation generation & installation.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 19 Jan 2016 19:53:02 +0100
+ 
+ qgis (2.8.5+dfsg-1~exp1) experimental; urgency=medium
+ 
+   [ Jürgen E. Fischer ]
+   * Release of 2.8.5
+ 
+   [ Bas Couwenberg ]
+   * New upstream release.
+   * Refresh patches.
+   * Update symbols for amd64.
+   * Add patches for 'occurred' & 'browser' typos.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 21 Dec 2015 11:48:03 +0100
+ 
 +qgis (2.8.4+dfsg-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sun, 13 Dec 2015 14:16:22 +0100
 +
  qgis (2.8.4+dfsg-1) unstable; urgency=medium
  
    * Update symbols for other architectures.
diff --cc debian/control
index ea22719,b622e72..3b131f8
--- a/debian/control
+++ b/debian/control
@@@ -57,7 -57,7 +57,7 @@@ Build-Conflicts: libqgis-dev
                   qgis-dev
  Standards-Version: 3.9.6
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/qgis.git
- Vcs-Git: git://anonscm.debian.org/pkg-grass/qgis.git -b jessie-backports
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/qgis.git
++Vcs-Git: https://anonscm.debian.org/git/pkg-grass/qgis.git -b jessie-backports
  Homepage: http://qgis.org/
  X-Python-Version: >= 2.7, << 2.8
  

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