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

[Simon Quigley]

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

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

    Correct last upload by putting the conditional statement in the right spot.
---
 debian/changelog | 6 ++++++
 debian/rules     | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f5dfe39..8fea810 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qtmultimedia-opensource-src (5.9.3-0ubuntu3) bionic; urgency=medium
+
+  * Correct last upload by putting the conditional statement in the right spot.
+
+ -- Simon Quigley <tsimonq2 at ubuntu.com>  Sun, 10 Dec 2017 22:26:30 -0600
+
 qtmultimedia-opensource-src (5.9.3-0ubuntu2) bionic; urgency=medium
 
   * Disable tests on armhf because they're spotty.
diff --git a/debian/rules b/debian/rules
index c3a51dc..6884557 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,20 +20,20 @@ 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
 
 override_dh_auto_test-arch:
+ifeq ($(DEB_HOST_ARCH), armhf)
+# Don't run the tests on armhf, they're spotty.
+else
 	$(MAKE) install -Csrc/imports INSTALL_ROOT=$(CURDIR)/test_root
 	QT_LOGGING_RULES="default.debug=true" \
 		xvfb-run -a -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" \
 		dh_auto_test -- -Ctests/auto/unit QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml
+endif
 
 # Do not attempt to run tests during indep build
 override_dh_auto_test-indep:

-- 
qtmultimedia packaging