[SCM] qtsensors packaging branch, master, updated. debian/5.2.0+dfsg-2
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Fri Jan 31 23:23:43 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtsensors.git;a=commitdiff;h=3f22aed
The following commit has been merged in the master branch:
commit 3f22aedfde1af534ecae571d2ac4d2d7e208615d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Sun Dec 22 14:33:38 2013 +0400
Disable the failing testsuite on hurd (reported as QTBUG-34500).
---
debian/changelog | 1 +
debian/rules | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 0f3ea25..28a3556 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtsensors-opensource-src (5.2.0+dfsg-2) UNRELEASED; urgency=low
[ Dmitry Shachnev ]
* Fix typo in the previous changelog entry.
* Install libqtsensors_linuxsys.so only on Linux.
+ * Disable the failing testsuite on hurd (reported as QTBUG-34500).
[ Pino Toscano ]
* Do not install the private qmake stuff.
diff --git a/debian/rules b/debian/rules
index c06540b..922cefb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
#export DH_VERBOSE=1
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
@@ -16,8 +17,11 @@ export QT_SELECT := qt5
override_dh_auto_configure:
qmake QT_BUILD_PARTS+=tests
+# See https://bugreports.qt-project.org/browse/QTBUG-34500
override_dh_auto_test:
+ifneq ($(DEB_HOST_ARCH_OS),hurd)
xvfb-run -a make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
+endif
override_dh_auto_install:
dh_auto_install
--
qtsensors packaging
More information about the pkg-kde-commits
mailing list