Merge lp:~roadmr/checkbox/packaging-libqt5v8-dependency into lp:~checkbox-dev/checkbox/checkbox-packaging

[Daniel Manrique]

* Reduced set of qt5 build-depends to minimum necessary
* Drop GUI_ARCHES logic in debian/rules.
* Drop arch-restriction from packages.
* Drop libqt5v8-5-dev build-dependency. (LP: #1292801)
* Remove arch restriction from checkbox. All dependencies are present
  now, and keeping things in dep-wait state is recommended cause it
  doesn't block anything and this upload would not be necessary.

[Zygmunt Krynicki (zyga)]

wrong target branch

review: Needs Resubmitting

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-14 17:26:45 +0000
+++ debian/changelog	2014-03-18 17:24:10 +0000
@@ -1,6 +1,12 @@
 checkbox (0.17.9) UNRELEASED; urgency=medium
 
-  * Open for development (remove this message before releasing)
+  [ Dimitri John Ledkov ]
+  * Drop GUI_ARCHES logic in debian/rules.
+  * Drop arch-restriction from packages.
+  * Drop libqt5v8-5-dev build-dependency. (LP: #1292801)
+  * Remove arch restriction from checkbox. All dependencies are present
+    now, and keeping things in dep-wait state is recommended cause it
+    doesn't block anything and this upload would not be necessary.
 
  -- Daniel Manrique <[e-mail]>  Fri, 14 Mar 2014 13:25:25 -0400
 
 
=== modified file 'debian/control'
--- debian/control	2014-02-13 15:58:44 +0000
+++ debian/control	2014-03-18 17:24:10 +0000
@@ -8,13 +8,8 @@
 Build-Depends: debhelper (>= 9.2),
                dh-translations,
                libnl-genl-3-dev,
+               libqt5sql5-sqlite,
                libqt4-dev,
-               libqt5qml-graphicaleffects [!arm64 !powerpc !ppc64el],
-               libqt5sql5-sqlite,
-               libqt5svg5-dev,
-               libqt5v8-5-dev [!arm64 !powerpc !ppc64el],
-               libqt5webkit5-dev [!arm64 !powerpc !ppc64el],
-               libqt5xmlpatterns5-dev,
                po-debconf,
                python,
                python-distutils-extra,
@@ -28,15 +23,10 @@
                python3-requests ( >= 1.0),
                python3-setuptools,
                python3-sphinx,
-               qt3d5-dev [!arm64 !powerpc !ppc64el],
                qt4-qmake,
                qt5-default,
                qtbase5-dev,
-               qtdeclarative5-dev [!arm64 !powerpc !ppc64el],
-               qtdeclarative5-dev-tools [!arm64 !powerpc !ppc64el],
-               qtlocation5-dev [!arm64 !powerpc !ppc64el],
-               qtscript5-dev,
-               qttools5-dev,
+               qtdeclarative5-dev,
                qttools5-dev-tools
 Vcs-Bzr: https://code.launchpad.net/~checkbox-dev/checkbox/checkbox-packaging
 
@@ -426,7 +416,7 @@
  checkbox-certification-server
 
 Package: checkbox-gui
-Architecture: i386 armhf amd64
+Architecture: any
 Depends: checkbox-ng-service,
          plainbox-provider-checkbox,
          qtdeclarative5-localstorage-plugin,
 
=== modified file 'debian/rules'
--- debian/rules	2014-02-13 15:58:44 +0000
+++ debian/rules	2014-03-18 17:24:10 +0000
@@ -7,9 +7,6 @@
 
 REL_NO	:= $(shell lsb_release -rs)
 RELEASE_GTE_RARING	:= $(shell expr $(REL_NO) \>= 13.04)
-# The checkbox-gui binary only makes sense to build for the following
-# architectures.
-GUI_ARCHS := amd64 armhf i386
 %:
 	dh "$@" --with python3,sphinxdoc,translations
 
@@ -37,12 +34,7 @@
 	echo "from unittest.mock import *" > $(CURDIR)/plainbox/plainbox/vendor/mock.py
 	dh_quilt_patch
 endif
-ifneq (,$(findstring $(DEB_BUILD_ARCH), $(GUI_ARCHS)))
 	cd $(CURDIR)/checkbox-gui && qmake PREFIX=/usr && make
-	$(warning NOTICE: Building GUI on supported architecture)
-else
-	$(warning NOTICE: NOT building GUI on unsupported architecture)
-endif
 	python3 setup.py build
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
@@ -62,9 +54,7 @@
 	python3 setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/checkbox/bin/
 	cp -R $(CURDIR)/debian/tmp/usr/share/checkbox/scripts/* $(CURDIR)/debian/tmp/usr/lib/checkbox/bin/
-ifneq (,$(findstring $(DEB_BUILD_ARCH), $(GUI_ARCHS)))
 	cd $(CURDIR)/checkbox-gui && make INSTALL_ROOT=$(CURDIR)/debian/tmp install
-endif
 	dh_install
 
 override_dh_installdocs: