Merge lp:~osomon/webbrowser-app/revert-workaround-1585942 into lp:webbrowser-app

[Olivier Tilloy]

Revert the workaround for bug #1585942 now that the bug has been properly fixed.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1514
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/593/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1148/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1148
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1035
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1035
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1035
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1024/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1024
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1024/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1024/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1024
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1024/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1024
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1024/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1024/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1024
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1024/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1024
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1024/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1024
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1024/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/593/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2016-07-11 15:19:23 +0000
+++ debian/control	2016-08-08 08:58:57 +0000
@@ -9,7 +9,6 @@
                debhelper (>= 9),
                dh-apparmor,
                dh-translations,
-               dpkg-dev,
                libapparmor-dev,
                libevdev-dev,
                liboxideqt-qmlplugin (>= 1.15),

=== modified file 'debian/rules'
--- debian/rules	2016-07-11 15:19:23 +0000
+++ debian/rules	2016-08-08 08:58:57 +0000
@@ -6,10 +6,6 @@
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-# Temporarily skip tests on arm64 to unblock package build without oxide.
-testskip_architectures := arm64
-
 BUILDHOME=/tmp/home
 
 %:
@@ -45,10 +41,6 @@
 	rm -rf $(BUILDHOME)
 
 override_dh_auto_test:
-ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))
 	mkdir -p $(BUILDHOME)
 	HOME=$(BUILDHOME) dh_auto_test
-else
-	echo "Temporarily skipping tests on $(DEB_HOST_ARCH)."
-endif