[qgis] 01/03: Merge tag 'debian/2.14.22+dfsg-2' 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 a747cdcc09f93313c30028b8f8505de0ae6c3c19
Merge: 2c8c755 2190334
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jan 31 07:33:11 2018 +0100

    Merge tag 'debian/2.14.22+dfsg-2' into stretch-backports

 CMakeLists.txt                                     |  2 +-
 ChangeLog                                          |  8 ++++
 debian/changelog                                   | 41 ++++++++++++++++++++
 debian/control                                     | 44 +++++++++++-----------
 debian/copyright                                   |  2 +-
 ....21.install => libqgis-analysis2.14.22.install} |  0
 ....21.symbols => libqgis-analysis2.14.22.symbols} |  8 ++--
 ...p2.14.21.install => libqgis-app2.14.22.install} |  0
 ...p2.14.21.symbols => libqgis-app2.14.22.symbols} |  6 +--
 ...2.14.21.install => libqgis-core2.14.22.install} |  0
 ...2.14.21.symbols => libqgis-core2.14.22.symbols} | 44 +++++++++++-----------
 ...i2.14.21.install => libqgis-gui2.14.22.install} |  0
 ...i2.14.21.symbols => libqgis-gui2.14.22.symbols} |  2 +-
 ...tall => libqgis-networkanalysis2.14.22.install} |  0
 ...bols => libqgis-networkanalysis2.14.22.symbols} |  2 +-
 ...14.21.install => libqgis-server2.14.22.install} |  0
 ...14.21.symbols => libqgis-server2.14.22.symbols} |  2 +-
 ...14.21.install => libqgisgrass7-2.14.22.install} |  0
 ...des => libqgisgrass7-2.14.22.lintian-overrides} |  2 +-
 ...14.21.symbols => libqgisgrass7-2.14.22.symbols} |  8 ++--
 ....14.21.install => libqgispython2.14.22.install} |  0
 ....14.21.symbols => libqgispython2.14.22.symbols} |  2 +-
 debian/qgis.sh                                     |  4 +-
 python/ext-libs/owslib/fes.py                      |  5 ++-
 python/plugins/MetaSearch/dialogs/maindialog.py    |  5 ++-
 25 files changed, 121 insertions(+), 66 deletions(-)

diff --cc debian/changelog
index c385542,50f10be..5fa7bdd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,44 +1,51 @@@
+ qgis (2.14.22+dfsg-2) unstable; urgency=medium
+ 
+   * Update packaging for GRASS 7.4.0.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 26 Jan 2018 11:44:46 +0100
+ 
+ qgis (2.14.22+dfsg-1) unstable; urgency=medium
+ 
+   * Update copyright-format URL to use HTTPS.
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 23 Jan 2018 18:15:36 +0100
+ 
+ qgis (2.14.22+dfsg-1~exp1) experimental; urgency=medium
+ 
+   [ Jürgen E. Fischer ]
+   * Release of 2.14.22
+ 
+   [ Bas Couwenberg ]
+   * New upstream release.
+   * Update version specific symbols.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 20 Jan 2018 09:01:38 +0100
+ 
+ qgis (2.14.21+dfsg-3) unstable; urgency=medium
+ 
+   * Replace libqca2-plugin-ossl transitional package with libqca2-plugins.
+     (closes: #886681)
+   * Update symbols for other architectures.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 09 Jan 2018 07:26:27 +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>  Wed, 03 Jan 2018 08:20:24 +0100
+ 
 +qgis (2.14.21+dfsg-1~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +  * Re-enable QtWebKit, still available in stretch.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sat, 16 Dec 2017 10:57:12 +0100
 +
  qgis (2.14.21+dfsg-1) unstable; urgency=medium
  
    * Update symbols for amd64 & other architectures.
diff --cc debian/control
index dccf485,30338d5..b477de4
--- 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 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