[merkaartor] 01/05: Fix FTCBFS: (Closes: #889756)

Bas Couwenberg sebastic at debian.org
Tue Feb 6 20:57:05 UTC 2018


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository merkaartor.

commit dec8e0a9a89f6f8df507653f83f4e8440799a774
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Feb 6 21:24:11 2018 +0100

    Fix FTCBFS: (Closes: #889756)
    
    Fix FTCBFS: (Closes: #889756)
    + Fix missing build dependency qt5-qmake:native for running lrelease.
    + Let dh_auto_configure pass the cross flags to qmake.
---
 debian/changelog | 6 ++++++
 debian/control   | 1 +
 debian/rules     | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e1862c0..ab6790d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
 merkaartor (0.18.3+ds-3) UNRELEASED; urgency=medium
 
+  [ Bas Couwenberg ]
   * Change priority from extra to optional.
   * Bump Standards-Version to 4.1.2, changes: priority.
   * Strip trailing whitespace from changelog.
   * Update copyright-format URL to use HTTPS.
 
+  [ Helmut Grohne ]
+  * Fix FTCBFS: (Closes: #889756)
+    + Fix missing build dependency qt5-qmake:native for running lrelease.
+    + Let dh_auto_configure pass the cross flags to qmake.
+
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 23 Sep 2017 00:15:35 +0200
 
 merkaartor (0.18.3+ds-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 64928d8..570984f 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Build-Depends: debhelper (>= 9),
                libxml2-dev,
                libxslt1-dev,
                qt5-qmake,
+               qt5-qmake:native,
                qtbase5-dev,
                qttools5-dev-tools,
                sharutils,
diff --git a/debian/rules b/debian/rules
index 430beab..7de80d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ override_dh_clean:
 
 override_dh_auto_configure:
 	cd translations && make release
-	qmake Merkaartor.pro \
+	dh_auto_configure -- Merkaartor.pro \
 		TRANSDIR_SYSTEM="/usr/share/qt5/translations/" \
 		PREFIX=/usr \
 		GDAL=1 \

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



More information about the Pkg-grass-devel mailing list