[Git][debian-gis-team/qgis][master] 4 commits: Demote qt5-image-formats-plugin-pdf to Recommends, qtwebengine-opensource-src...

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / qgis


Commits:
19c2c509 by Bas Couwenberg at 2022-02-23T12:48:51+01:00
Demote qt5-image-formats-plugin-pdf to Recommends, qtwebengine-opensource-src not built on all architectures.

- - - - -
7286cca5 by Bas Couwenberg at 2022-02-23T18:34:15+01:00
Update spelling-errors.patch with issues in nlohmann code.

- - - - -
a90656e0 by Bas Couwenberg at 2022-02-23T19:47:38+01:00
Bump minimum GRASS build dependency version to 7.8.7.

- - - - -
cefca4d4 by Bas Couwenberg at 2022-02-23T19:49:31+01:00
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/patches/spelling-errors.patch
- debian/python3-qgis.lintian-overrides


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+qgis (3.22.4+dfsg-3) unstable; urgency=medium
+
+  * Demote qt5-image-formats-plugin-pdf to Recommends,
+    qtwebengine-opensource-src not built on all architectures.
+  * Update spelling-errors.patch with issues in nlohmann code.
+  * Bump minimum GRASS build dependency version to 7.8.7.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 23 Feb 2022 19:49:17 +0100
+
 qgis (3.22.4+dfsg-2) unstable; urgency=medium
 
   * Add missing dependencies.


=====================================
debian/control
=====================================
@@ -11,7 +11,7 @@ Build-Depends: bison,
                dh-python,
                flex,
                gdal-bin,
-               grass-dev (>= 7.8.6),
+               grass-dev (>= 7.8.7),
                libexiv2-dev,
                libexpat1-dev,
                libfcgi-dev,
@@ -410,9 +410,9 @@ Depends: qgis-providers-common (= ${source:Version}),
          libqca-qt5-2-plugins,
          libqt5sql5-sqlite,
          qt5-image-formats-plugins,
-         qt5-image-formats-plugin-pdf,
          ${shlibs:Depends},
          ${misc:Depends}
+Recommends: qt5-image-formats-plugin-pdf
 Breaks: qgis (<= 1.6)
 Replaces: qgis (<= 1.6)
 Description: collection of data providers to QGIS


=====================================
debian/patches/spelling-errors.patch
=====================================
@@ -491,3 +491,41 @@ Forwarded: not-needed
  # meaning of the keys.
  #
  # The syntax is that each entry has the form : 
+--- a/external/nlohmann/json.hpp
++++ b/external/nlohmann/json.hpp
+@@ -4280,7 +4280,7 @@ class basic_json
+     /*!
+     @brief wrapper to access iterator member functions in range-based for
+ 
+-    This function allows to access @ref iterator::key() and @ref
++    This function allows accessing @ref iterator::key() and @ref
+     iterator::value() during range-based for loops. In these loops, a
+     reference to the JSON values is returned, so there is no access to the
+     underlying iterator.
+@@ -4352,7 +4352,7 @@ class basic_json
+     /*!
+     @brief helper to access iterator member functions in range-based for
+ 
+-    This function allows to access @ref iterator::key() and @ref
++    This function allows accessing @ref iterator::key() and @ref
+     iterator::value() during range-based for loops. In these loops, a
+     reference to the JSON values is returned, so there is no access to the
+     underlying iterator.
+@@ -4385,7 +4385,7 @@ class basic_json
+     }
+     @endcode
+ 
+-    The `items()` function also allows to use
++    The `items()` function also allows using
+     [structured bindings](https://en.cppreference.com/w/cpp/language/structured_binding)
+     (C++17):
+ 
+@@ -4879,7 +4879,7 @@ class basic_json
+     /*!
+     @brief add an object to an object
+ 
+-    This function allows to use `push_back` with an initializer list. In case
++    This function allows using `push_back` with an initializer list. In case
+ 
+     1. the current value is an object,
+     2. the initializer list @a init contains only two elements, and


=====================================
debian/python3-qgis.lintian-overrides
=====================================
@@ -4,4 +4,5 @@ hardening-no-fortify-functions *
 
 # False positive, string not included in source
 spelling-error-in-binary usr/lib/python*/dist-packages/qgis/_core.*.so onself oneself
+spelling-error-in-binary usr/lib/python3/dist-packages/qgis/_core.*.so "allows to" "allows one to"
 



View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/compare/9391b027bf04809931b104cd105343ddc3bc62d2...cefca4d41ee1fd9703ea0b0a5e669ab10e00ed9c

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/compare/9391b027bf04809931b104cd105343ddc3bc62d2...cefca4d41ee1fd9703ea0b0a5e669ab10e00ed9c
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20220224/83f0bca0/attachment-0001.htm>