[med-svn] [Git][med-team/clustalx][master] 3 commits: Fix FTCBFS: Let dh_auto_configure pass cross flags to qmake

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / clustalx


Commits:
8d12de23 by Andreas Tille at 2019-02-24T19:03:09Z
Fix FTCBFS: Let dh_auto_configure pass cross flags to qmake

- - - - -
a0d3dcd3 by Andreas Tille at 2019-02-24T19:04:34Z
Standards-Version: 4.3.0

- - - - -
21d68c16 by Andreas Tille at 2019-02-24T19:10:21Z
Upload to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,16 @@
-clustalx (2.1+lgpl-8) UNRELEASED; urgency=medium
+clustalx (2.1+lgpl-8) unstable; urgency=medium
 
+  [ Jelmer Vernooij ]
   * Trim trailing whitespace.
 
- -- Jelmer Vernooij <jelmer at debian.org>  Sat, 20 Oct 2018 13:51:49 +0000
+  [ Helmut Grohne ]
+  * Fix FTCBFS: Let dh_auto_configure pass cross flags to qmake.
+    Closes: #923120
+
+  [ Andreas Tille ]
+  * Standards-Version: 4.3.0
+
+ -- Andreas Tille <tille at debian.org>  Sun, 24 Feb 2019 20:04:40 +0100
 
 clustalx (2.1+lgpl-7) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 11~),
                qtbase5-dev,
                qtbase5-dev-tools,
                qttools5-dev-tools
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/med-team/clustalx
 Vcs-Git: https://salsa.debian.org/med-team/clustalx.git
 Homepage: http://www.clustal.org/clustal2/


=====================================
debian/rules
=====================================
@@ -8,7 +8,7 @@ export QT_SELECT=qt5
 	dh $@
 
 override_dh_auto_configure:
-	qmake
+	dh_auto_configure
 	# did not found a better way to push hardening flags into Makefile
 	sed -i -e "s:CFLAGS *= .*:& $(CFLAGS):" \
 	       -e "s:CXXFLAGS *= .*:& $(CXXFLAGS):" \



View it on GitLab: https://salsa.debian.org/med-team/clustalx/compare/89cbe4d4792f212e84d2b32362e0da6916907cf0...21d68c168223ee414629fc1df30cea73f2877ce7

-- 
View it on GitLab: https://salsa.debian.org/med-team/clustalx/compare/89cbe4d4792f212e84d2b32362e0da6916907cf0...21d68c168223ee414629fc1df30cea73f2877ce7
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/debian-med-commit/attachments/20190224/068ab3bb/attachment-0001.html>