[qgis] 01/03: Merge tag 'debian/2.14.0+dfsg0-3' into qt5

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch qt5
in repository qgis.

commit 2c70a7fa8345f3763893781eb7a3382ce39288b3
Merge: 537a65a 0e1a8cd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Mar 11 17:48:12 2016 +0100

    Merge tag 'debian/2.14.0+dfsg0-3' into qt5
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   |   31 +-
 debian/control                                     |    4 +-
 debian/copyright                                   |    2 +-
 debian/libqgis-analysis2.14.0.symbols              |  322 +-
 debian/libqgis-app2.14.0.symbols                   |  102 +-
 debian/libqgis-core2.14.0.symbols                  | 3875 +-------------------
 debian/libqgis-gui2.14.0.symbols                   | 2513 +------------
 debian/libqgis-networkanalysis2.14.0.symbols       |   61 +-
 debian/libqgis-server2.14.0.symbols                |  827 +----
 debian/libqgisgrass7-2.14.0.symbols                |  856 ++++-
 debian/libqgispython2.14.0.symbols                 |   54 +-
 .../patches/developersmap-use-debian-package.patch |    2 +-
 debian/patches/disable-doxygen.patch               |    2 +-
 debian/patches/globe-adapt-to-osgearth-2.7.patch   |  102 +
 debian/patches/number-typo.patch                   |  483 +++
 debian/patches/python-env.patch                    |    2 +-
 debian/patches/series                              |    2 +
 debian/qgis.preinst                                |   20 +-
 debian/rules                                       |   21 +-
 debian/source.lintian-overrides                    |    4 -
 debian/upstream/metadata                           |    8 +-
 debian/watch                                       |    2 +-
 22 files changed, 1900 insertions(+), 7395 deletions(-)

diff --cc debian/changelog
index 84dc379,4a283c9..90fad84
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,32 +1,39 @@@
- qgis (2.14.0+dfsg0-1~exp2) UNRELEASED; urgency=medium
++qgis (2.14.0+dfsg0-4~exp1) UNRELEASED; urgency=medium
 +
 +  * Update branch in gbp.conf.
 +  * Switch from Qt4 to Qt5.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 08 May 2015 23:40:06 +0200
 +
+ qgis (2.14.0+dfsg0-3) unstable; urgency=medium
+ 
+   * Recreate symbols files, old ones failed to patch.
+   * Fix build with `dpkg-buildpackage -A`. Various files in architecture
+     independent packages are built in the -arch target.
+     (closes: #817811)
+   * Update various URLs to use HTTPS.
+   * Drop unused lintian override for binaries-have-file-conflict.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 10 Mar 2016 20:52:00 +0100
+ 
+ qgis (2.14.0+dfsg0-2) unstable; urgency=medium
+ 
+   * Restore use of pkgkde_symbolshelper by dh.
+   * Add patch for osgEarth 2.7 support, re-enable globe plugin.
+   * Fix removal of obsolete diversions for both the grass plugin & provider.
+     (closes: #817176)
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 09 Mar 2016 19:11:51 +0100
+ 
+ qgis (2.14.0+dfsg0-1) unstable; urgency=medium
+ 
+   * Disable globe plugin, fails to build with osgEarth 2.7.
+   * Add Breaks/Replaces to qgis for binaries moved from grass provider.
+   * Add patch to fix 'number' typo.
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 08 Mar 2016 07:12:13 +0100
+ 
  qgis (2.14.0+dfsg0-1~exp1) experimental; urgency=medium
  
    [ Jürgen E. Fischer ]

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