[Git][debian-gis-team/qgis][experimental] 6 commits: Add patches by Dmitry Shachnev to fix sip5 support.

[Bas Couwenberg]

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


Commits:
89973f43 by Bas Couwenberg at 2020-09-21T16:37:23+02:00
Add patches by Dmitry Shachnev to fix sip5 support.

- - - - -
ede060d6 by Bas Couwenberg at 2020-10-05T09:23:53+02:00
Bump minimum GRASS build dependency version to 7.8.4.

- - - - -
4f8c7317 by Bas Couwenberg at 2020-10-05T09:24:10+02:00
Set distribution to unstable.

- - - - -
990d74e6 by Bas Couwenberg at 2020-10-05T13:38:22+02:00
Merge branch 'master' into experimental

- - - - -
3b8b48c9 by Bas Couwenberg at 2020-10-05T13:38:41+02:00
Merge changes from qgis (3.10.10+dfsg-2).

- - - - -
f387e9be by Bas Couwenberg at 2020-10-05T13:38:58+02:00
Set distribution to experimental.

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/patches/pr37842.patch
- debian/patches/pr37901.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+qgis (3.10.10+dfsg-3~exp1) experimental; urgency=medium
+
+  * Merge changes from qgis (3.10.10+dfsg-2).
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 05 Oct 2020 13:38:45 +0200
+
+qgis (3.10.10+dfsg-2) unstable; urgency=medium
+
+  * Add patches by Dmitry Shachnev to fix sip5 support.
+  * Bump minimum GRASS build dependency version to 7.8.4.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 05 Oct 2020 09:23:56 +0200
+
 qgis (3.10.10+dfsg-2~exp1) experimental; urgency=medium
 
   * Merge changes from qgis (3.10.10+dfsg-1).


=====================================
debian/control
=====================================
@@ -11,7 +11,7 @@ Build-Depends: bison,
                dh-python,
                flex,
                gdal-bin,
-               grass-dev (>= 7.8.3),
+               grass-dev (>= 7.8.4),
                libexiv2-dev,
                libexpat1-dev,
                libfcgi-dev,


=====================================
debian/patches/pr37842.patch
=====================================
@@ -1,13 +1,8 @@
-From 33192f38bc7db93ffe201110cab19fe082851f5f Mon Sep 17 00:00:00 2001
-From: Dmitry Shachnev <mitya57 at gmail.com>
-Date: Wed, 15 Jul 2020 21:29:37 +0300
-Subject: [PATCH 1/3] Replace deprecated sipMappedType with sipTypeDef
-
----
- .../geometry/qgsgeometry.sip.in               | 12 ++---
- python/core/conversions.sip                   | 44 +++++++++----------
- src/core/geometry/qgsgeometry.h               | 12 ++---
- 3 files changed, 34 insertions(+), 34 deletions(-)
+Description: Get rid of SIP deprecated functions
+Author: Dmitry Shachnev <mitya57 at gmail.com>
+Origin: https://github.com/qgis/QGIS/pull/37842
+Bug: https://github.com/qgis/QGIS/issues/37542
+Bug-Debian: https://bugs.debian.org/964132
 
 --- a/python/core/auto_generated/geometry/qgsgeometry.sip.in
 +++ b/python/core/auto_generated/geometry/qgsgeometry.sip.in


=====================================
debian/patches/pr37901.patch
=====================================
@@ -1,11 +1,8 @@
-From 33b58dd7e8d813425624d302b88a8c158c47eac3 Mon Sep 17 00:00:00 2001
-From: Dmitry Shachnev <mitya57 at gmail.com>
-Date: Wed, 15 Jul 2020 19:56:02 +0300
-Subject: [PATCH 1/5] Make FindSIP.py compatible with SIP v5
-
----
- cmake/FindSIP.py | 40 +++++++++++++++++++++++++++-------------
- 1 file changed, 27 insertions(+), 13 deletions(-)
+Description: Add support for SIP v5 to the build system
+Author: Dmitry Shachnev <mitya57 at gmail.com>
+Origin: https://github.com/qgis/QGIS/pull/37901
+Bug: https://github.com/qgis/QGIS/issues/37542
+Bug-Debian: https://bugs.debian.org/964132
 
 --- a/cmake/FindSIP.py
 +++ b/cmake/FindSIP.py



View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/compare/57a6cfa9027f7c486ced86e116c7c79f5e165a1b...f387e9bec6801e2f4f0d3b06fa96b0e801e9b5ea

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/compare/57a6cfa9027f7c486ced86e116c7c79f5e165a1b...f387e9bec6801e2f4f0d3b06fa96b0e801e9b5ea
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/20201005/8d6a7ce4/attachment-0001.html>