[Git][debian-gis-team/merkaartor][master] Debian patch 0.18.4+ds-5

[Jérôme Benoit]

Jérôme Benoit pushed to branch master at Debian GIS Project / merkaartor


Commits:
4d634c9b by Jerome Benoit at 2020-11-11T22:00:27+01:00
Debian patch 0.18.4+ds-5

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/patches/series
- + debian/patches/upstream-Qt5_15-fix.patch
- debian/source/lintian-overrides


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+merkaartor (0.18.4+ds-5) unstable; urgency=medium
+
+  * FTBFS fix version: apply upstream fix for building against
+      recent version of Qt (Closes: #974104).
+  * Debianization:
+    - d/p/upstream-Qt5_15-fix.patch, introduce.
+    - d/control:
+      -  debhelper, bump to 13;
+    - d/s/lintian-overrides:
+      - testsuite-autopkgtest-missing tag, discard.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Wed, 11 Nov 2020 20:53:53 +0000
+
 merkaartor (0.18.4+ds-4) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Jerome Benoit <calculus at rezozer.net>
 Section: science
 Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
                libboost-dev,
                libboost-math-dev,
                libboost-serialization-dev,


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
+upstream-Qt5_15-fix.patch
 upstream-gpsd-9+-fix_time.patch
 qmake-config-nostrip.patch
 no-git-version.patch


=====================================
debian/patches/upstream-Qt5_15-fix.patch
=====================================
@@ -0,0 +1,19 @@
+Description: Fix build with Qt 5.15 (missing QPainterPath include)
+ Apply upstream fix (commit e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c).
+Author: Jerome Benoit <calculus at rezozer.net>
+Forwarded: not-needed
+
+--- a/src/Features/Feature.h
++++ b/src/Features/Feature.h
+@@ -8,8 +8,10 @@
+ #include "MapView.h"
+ #include "FeaturePainter.h"
+ 
+-#include <QtCore/QString>
+ #include <QList>
++#include <QPainter>
++#include <QPainterPath>
++#include <QString>
+ 
+ #define CAST_FEATURE(x) (dynamic_cast<Feature*>(x))
+ #define CAST_NODE(x) (dynamic_cast<Node*>(x))


=====================================
debian/source/lintian-overrides
=====================================
@@ -1,8 +1,5 @@
 # GitHub source ball
 debian-watch-does-not-check-gpg-signature
 
-# interface software
-testsuite-autopkgtest-missing
-
 # third party examples
 package-does-not-install-examples



View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/-/commit/4d634c9ba6825d0eadb39196e5ce1317fd6fa306

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/-/commit/4d634c9ba6825d0eadb39196e5ce1317fd6fa306
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/20201111/06a45e44/attachment-0001.html>