[SCM] qtmultimedia packaging branch, ubuntu+1, updated. ubuntu/5.9.2-1ubuntu1-5-gd8a8b2b

Simon Quigley tsimonq2-guest at moszumanska.debian.org
Mon Dec 11 04:18:53 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtmultimedia.git;a=commitdiff;h=d8a8b2b

The following commit has been merged in the ubuntu+1 branch:
commit d8a8b2b71e6f36e9ed298ee12d5b414a45db474c
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Sun Dec 10 22:16:00 2017 -0600

    Disable tests on armhf because they're spotty.
---
 debian/changelog | 6 ++++++
 debian/rules     | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0846d06..f5dfe39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qtmultimedia-opensource-src (5.9.3-0ubuntu2) bionic; urgency=medium
+
+  * Disable tests on armhf because they're spotty.
+
+ -- Simon Quigley <tsimonq2 at ubuntu.com>  Sun, 10 Dec 2017 22:15:25 -0600
+
 qtmultimedia-opensource-src (5.9.3-0ubuntu1) bionic; urgency=medium
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index 906b661..c3a51dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,11 @@ pkgs_with_arch = $(patsubst debian/%.install-$(DEB_HOST_ARCH),%,$(wildcard debia
 	dh $@ --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
+ifeq ($(DEB_HOST_ARCH), armhf)
+# Don't run the tests on armhf, they're spotty.
+else
 	qmake QT_BUILD_PARTS+=tests
+endif
 
 override_dh_auto_build-indep:
 	dh_auto_build -Smakefile -- docs

-- 
qtmultimedia packaging



More information about the pkg-kde-commits mailing list