[qgis] 02/02: Merge branch 'master' into experimental

[Bas Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository qgis.

commit b2e3577da319c06152cd1d5cea4c51701cc01687
Merge: edbb1bc fba9218
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jan 3 11:03:02 2018 +0100

    Merge branch 'master' into experimental

 debian/changelog                       | 11 +++++++++--
 debian/control                         |  2 +-
 debian/libqgis-analysis2.14.21.symbols |  6 +++---
 debian/libqgis-app2.14.21.symbols      |  4 ++--
 debian/libqgis-core2.14.21.symbols     |  6 +++---
 debian/libqgisgrass7-2.14.21.symbols   |  6 +++---
 6 files changed, 21 insertions(+), 14 deletions(-)

diff --cc debian/changelog
index 5d81c24,364e40c..32f51c3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,17 @@@
- qgis (2.14.21+dfsg-2) UNRELEASED; urgency=medium
++qgis (2.14.21+dfsg-3) UNRELEASED; urgency=medium
 +
 +  * Update packaging for GRASS 7.4.
++
++ -- Bas Couwenberg <sebastic at debian.org>  Sun, 10 Dec 2017 16:30:08 +0100
++
+ qgis (2.14.21+dfsg-2) unstable; urgency=medium
+ 
    * Update build dependency for libqscintilla2-dev.
      (closes: #886194)
+   * Update symbols for other architectures.
+   * Bump Standards-Version to 4.1.3, no changes.
  
-  -- Bas Couwenberg <sebastic at debian.org>  Sun, 10 Dec 2017 16:30:08 +0100
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 03 Jan 2018 08:20:24 +0100
  
  qgis (2.14.21+dfsg-1) unstable; urgency=medium
  
diff --cc debian/control
index beb5b3a,fd4f1e2..4f8f04c
--- a/debian/control
+++ b/debian/control
@@@ -65,9 -65,9 +65,9 @@@ Build-Depends: bison
                 pkg-kde-tools
  Build-Conflicts: libqgis-dev,
                   qgis-dev
- Standards-Version: 4.1.2
+ Standards-Version: 4.1.3
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/qgis.git
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/qgis.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/qgis.git -b experimental
  Homepage: https://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