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

[Bas Couwenberg]

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

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

commit 00157835ca65a295e90af2cc76d85176554158f3
Merge: f0d01b7 f29f4bb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Nov 5 09:42:19 2017 +0100

    Merge tag 'debian/2.14.20+dfsg-1' into stretch-backports

 CMakeLists.txt                                     |  2 +-
 ChangeLog                                          | 24 ++++++++++
 debian/changelog                                   | 25 ++++++++++
 debian/control                                     | 55 +++++++++++-----------
 ....19.install => libqgis-analysis2.14.20.install} |  0
 ....19.symbols => libqgis-analysis2.14.20.symbols} |  2 +-
 ...p2.14.19.install => libqgis-app2.14.20.install} |  0
 ...p2.14.19.symbols => libqgis-app2.14.20.symbols} |  2 +-
 ...2.14.19.install => libqgis-core2.14.20.install} |  0
 ...2.14.19.symbols => libqgis-core2.14.20.symbols} | 38 +++++++--------
 ...i2.14.19.install => libqgis-gui2.14.20.install} |  0
 ...i2.14.19.symbols => libqgis-gui2.14.20.symbols} |  7 ++-
 ...tall => libqgis-networkanalysis2.14.20.install} |  0
 ...bols => libqgis-networkanalysis2.14.20.symbols} |  2 +-
 ...14.19.install => libqgis-server2.14.20.install} |  0
 ...14.19.symbols => libqgis-server2.14.20.symbols} |  2 +-
 ...14.19.install => libqgisgrass7-2.14.20.install} |  0
 ...des => libqgisgrass7-2.14.20.lintian-overrides} |  2 +-
 ...14.19.symbols => libqgisgrass7-2.14.20.symbols} |  2 +-
 ....14.19.install => libqgispython2.14.20.install} |  0
 ....14.19.symbols => libqgispython2.14.20.symbols} |  2 +-
 debian/rules                                       |  1 +
 debian/source.lintian-overrides                    |  1 -
 python/core/qgscoordinatetransform.sip             |  3 ++
 24 files changed, 111 insertions(+), 59 deletions(-)

diff --cc debian/changelog
index a9ea584,3e4be81..bcf5211
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,28 +1,34 @@@
+ qgis (2.14.20+dfsg-1) unstable; urgency=medium
+ 
+   * Update symbols for other architectures.
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 30 Oct 2017 19:25:05 +0100
+ 
+ qgis (2.14.20+dfsg-1~exp1) experimental; urgency=medium
+ 
+   [ Jürgen E. Fischer ]
+   * Release of 2.14.20
+ 
+   [ Bas Couwenberg ]
+   * New upstream release.
+   * Drop unused override for python-foo-but-no-python3-foo.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 28 Oct 2017 10:05:54 +0200
+ 
+ qgis (2.14.19+dfsg-2) UNRELEASED; urgency=medium
+ 
+   * Add virtual GRASS ABI package to qgis-plugin-grass dependencies.
+   * Bump Standards-Version to 4.1.1, no changes.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 27 Sep 2017 19:51:54 +0200
+ 
 +qgis (2.14.19+dfsg-1~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sat, 30 Sep 2017 09:36:01 +0200
 +
  qgis (2.14.19+dfsg-1) unstable; urgency=medium
  
    * Update symbols for other architectures.
diff --cc debian/control
index ac3fb2b,c181651..761285c
--- 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.0
+ Standards-Version: 4.1.1
  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 stretch-backports
  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