[SCM] qtdeclarative packaging branch, ubuntu+1, updated. debian/5.9.0-beta3-2-158-g47d6008

[Simon Quigley]

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

The following commit has been merged in the ubuntu+1 branch:
commit 07b0964217f4b3ffc0ea0e6f1eb22ba42f418827
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Thu Jun 15 16:22:52 2017 -0500

    Drop the code in debian/rules disabling the tests for ppc64el on Xenial because this packaging won't be applied in that scenario again.
---
 debian/changelog | 1 +
 debian/rules     | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 68f4b5f..7e98558 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtdeclarative-opensource-src (5.9.0-1ubuntu1) UNRELEASED; urgency=medium
   * Merge from Debian Experimental in Git repo.
   * Dropped from the delta:
     - Support the gles packages.
+    - Disable tests for ppc64el on Xenial.
   * Disable or remove the following patches:
     - Fix-SignalSpy-with-QQmlPropertyMap-signals.patch
     - Fix-visibility-of-properties-in-value-types.patch
diff --git a/debian/rules b/debian/rules
index f489a3c..cc710df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,6 @@
 #export DH_VERBOSE=1
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_SERIES ?= $(shell lsb_release -c -s)
-PRIVATE_HEADERS = debian/qtdeclarative5-private-dev/usr/include/$(DEB_HOST_MULTIARCH)/qt5
 
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
@@ -58,7 +55,6 @@ override_dh_makeshlibs:
 	dh_makeshlibs -V
 
 override_dh_auto_test-arch:
-ifneq ("$(DEB_HOST_ARCH)$(DEB_HOST_SERIES)","ppc64elxenial")
 	$(MAKE) install -Csrc/imports INSTALL_ROOT=$(CURDIR)/test_root
 	mkdir -p $(CURDIR)/.local/share/QtProject/tst_qqmlengine
 	# Make the tests non-fatal, see the 5.7.1~20161021-2 changelog.
@@ -67,7 +63,6 @@ ifneq ("$(DEB_HOST_ARCH)$(DEB_HOST_SERIES)","ppc64elxenial")
 	         dh_auto_test --max-parallel=1 -- -k -Ctests/auto \
 	         QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml \
 	         HOME=$(CURDIR) LD_LIBRARY_PATH=$(CURDIR)/lib XDG_RUNTIME_DIR=$(CURDIR)
-endif
 
 override_dh_auto_test-indep:
 

-- 
qtdeclarative packaging