[qgis] 01/02: Merge tag 'debian/2.14.21+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 21a7bde399196aceb0e76c588cf1ab2ffaed0159
Merge: df00e24 01fa247
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Dec 16 10:54:35 2017 +0100

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

 CMakeLists.txt                                     |  2 +-
 ChangeLog                                          | 12 +++
 debian/changelog                                   | 48 +++++++++++-
 debian/control                                     | 71 +++++++-----------
 ....20.install => libqgis-analysis2.14.21.install} |  0
 ....20.symbols => libqgis-analysis2.14.21.symbols} |  8 +-
 ...p2.14.20.install => libqgis-app2.14.21.install} |  0
 ...p2.14.20.symbols => libqgis-app2.14.21.symbols} |  6 +-
 ...2.14.20.install => libqgis-core2.14.21.install} |  0
 ...2.14.20.symbols => libqgis-core2.14.21.symbols} | 62 +++++++++++-----
 ...i2.14.20.install => libqgis-gui2.14.21.install} |  0
 ...i2.14.20.symbols => libqgis-gui2.14.21.symbols} | 44 +----------
 ...tall => libqgis-networkanalysis2.14.21.install} |  0
 ...bols => libqgis-networkanalysis2.14.21.symbols} |  2 +-
 ...14.20.install => libqgis-server2.14.21.install} |  0
 ...14.20.symbols => libqgis-server2.14.21.symbols} |  2 +-
 ...14.20.install => libqgisgrass7-2.14.21.install} |  0
 ...des => libqgisgrass7-2.14.21.lintian-overrides} |  2 +-
 ...14.20.symbols => libqgisgrass7-2.14.21.symbols} |  2 +-
 ....14.20.install => libqgispython2.14.21.install} |  0
 ....14.20.symbols => libqgispython2.14.21.symbols} |  2 +-
 debian/patches/grass72.patch                       | 15 ----
 debian/patches/grass74.patch                       | 14 ++++
 debian/patches/series                              |  2 +-
 debian/python-qgis.install                         |  4 +-
 debian/qgis-plugin-grass-common.lintian-overrides  |  4 +
 debian/rules                                       | 11 ++-
 src/server/qgswmsserver.cpp                        | 85 ++++++++++++++++------
 28 files changed, 234 insertions(+), 164 deletions(-)

diff --cc debian/changelog
index 417eb1b,74d9b3e..109e0e0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,45 +1,52 @@@
+ qgis (2.14.21+dfsg-1) unstable; urgency=medium
+ 
+   * Update symbols for amd64 & other architectures.
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 10 Dec 2017 14:25:15 +0100
+ 
+ qgis (2.14.21+dfsg-1~exp1) experimental; urgency=medium
+ 
+   [ Jürgen E. Fischer ]
+   * Release of 2.14.21
+ 
+   [ Bas Couwenberg ]
+   * New upstream release.
+   * Partially revert GRASS 7.4 changes to build with GRASS 7.2.
+   * Strip trailing whitespace from control file.
+   * Disable use of QtWebKit.
+     (closes: #882663)
+   * Don't install PyQt4 files, no longer built.
+   * Disable Breaks/Replaces on python-qt4,
+     python-qgis no longer includes PyQt4 files.
+   * Drop obsolete dbg package.
+   * Bump Standards-Version to 4.1.2, no changes.
+   * Add lintian override for
+     dependency-on-python-version-marked-for-end-of-life.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 08 Dec 2017 22:49:37 +0100
+ 
+ qgis (2.14.20+dfsg-2~exp2) experimental; urgency=medium
+ 
+   * Fix GRASS ABI dependency to include 'grass'.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 17 Nov 2017 18:02:31 +0100
+ 
+ qgis (2.14.20+dfsg-2~exp1) experimental; urgency=medium
+ 
+   * Override dh_gencontrol to set GRASS ABI dependency with substvars.
+   * Strip trailing whitespace from changelog.
+   * Update packing for GRASS 7.4.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 17 Nov 2017 12:35:39 +0100
+ 
 +qgis (2.14.20+dfsg-1~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +  * Change virtual GRASS ABI package dependency to grass720 for stretch.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sun, 05 Nov 2017 09:44:01 +0100
 +
  qgis (2.14.20+dfsg-1) unstable; urgency=medium
  
    * Update symbols for other architectures.
diff --cc debian/control
index 48ce88d,eb8e5a0..16b8532
--- 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.1
+ Standards-Version: 4.1.2
  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
  
diff --cc debian/rules
index f1408af,5acecc4..0fd6b95
--- a/debian/rules
+++ b/debian/rules
@@@ -113,7 -113,11 +113,11 @@@ ifneq (,$(findstring $(DISTRIBUTION),"s
  	CMAKE_OPTS += -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so
  endif
  
- ifneq (,$(findstring $(DISTRIBUTION),"sid stretch stretch-backports"))
+ ifneq (,$(findstring $(DISTRIBUTION),"sid"))
+ 	CMAKE_OPTS += -DWITH_QTWEBKIT=FALSE
+ endif
+ 
 -ifneq (,$(findstring $(DISTRIBUTION),"stretch"))
++ifneq (,$(findstring $(DISTRIBUTION),"stretch stretch-backports"))
  	CMAKE_OPTS += -DWITH_INTERNAL_WEBKIT_BINDINGS=TRUE
  endif
  

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