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

Proposed by Daniel Manrique on 2014-03-18
Status: Merged
Approved by: Zygmunt Krynicki on 2014-03-18
Approved revision: 69
Merged at revision: 68
Proposed branch: lp:~roadmr/checkbox/packaging-libqt5v8-dependency
Merge into: lp:~checkbox-dev/checkbox/checkbox-packaging
Diff against target: 99 lines (+10/-24)
3 files modified
debian/changelog (+7/-1)
debian/control (+3/-13)
debian/rules (+0/-10)
To merge this branch: bzr merge lp:~roadmr/checkbox/packaging-libqt5v8-dependency
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) 2014-03-18 Approve on 2014-03-18
Review via email: mp+211587@code.launchpad.net

This proposal supersedes a proposal from 2014-03-18.

Description of the change

* 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.

To post a comment you must log in.
Zygmunt Krynicki (zyga) wrote : Posted in a previous version of this proposal

wrong target branch

review: Resubmit
Zygmunt Krynicki (zyga) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-03-14 17:26:45 +0000
3+++ debian/changelog 2014-03-18 17:24:10 +0000
4@@ -1,6 +1,12 @@
5 checkbox (0.17.9) UNRELEASED; urgency=medium
6
7- * Open for development (remove this message before releasing)
8+ [ Dimitri John Ledkov ]
9+ * Drop GUI_ARCHES logic in debian/rules.
10+ * Drop arch-restriction from packages.
11+ * Drop libqt5v8-5-dev build-dependency. (LP: #1292801)
12+ * Remove arch restriction from checkbox. All dependencies are present
13+ now, and keeping things in dep-wait state is recommended cause it
14+ doesn't block anything and this upload would not be necessary.
15
16 -- Daniel Manrique <roadmr@ubuntu.com> Fri, 14 Mar 2014 13:25:25 -0400
17
18
19=== modified file 'debian/control'
20--- debian/control 2014-02-13 15:58:44 +0000
21+++ debian/control 2014-03-18 17:24:10 +0000
22@@ -8,13 +8,8 @@
23 Build-Depends: debhelper (>= 9.2),
24 dh-translations,
25 libnl-genl-3-dev,
26+ libqt5sql5-sqlite,
27 libqt4-dev,
28- libqt5qml-graphicaleffects [!arm64 !powerpc !ppc64el],
29- libqt5sql5-sqlite,
30- libqt5svg5-dev,
31- libqt5v8-5-dev [!arm64 !powerpc !ppc64el],
32- libqt5webkit5-dev [!arm64 !powerpc !ppc64el],
33- libqt5xmlpatterns5-dev,
34 po-debconf,
35 python,
36 python-distutils-extra,
37@@ -28,15 +23,10 @@
38 python3-requests ( >= 1.0),
39 python3-setuptools,
40 python3-sphinx,
41- qt3d5-dev [!arm64 !powerpc !ppc64el],
42 qt4-qmake,
43 qt5-default,
44 qtbase5-dev,
45- qtdeclarative5-dev [!arm64 !powerpc !ppc64el],
46- qtdeclarative5-dev-tools [!arm64 !powerpc !ppc64el],
47- qtlocation5-dev [!arm64 !powerpc !ppc64el],
48- qtscript5-dev,
49- qttools5-dev,
50+ qtdeclarative5-dev,
51 qttools5-dev-tools
52 Vcs-Bzr: https://code.launchpad.net/~checkbox-dev/checkbox/checkbox-packaging
53
54@@ -426,7 +416,7 @@
55 checkbox-certification-server
56
57 Package: checkbox-gui
58-Architecture: i386 armhf amd64
59+Architecture: any
60 Depends: checkbox-ng-service,
61 plainbox-provider-checkbox,
62 qtdeclarative5-localstorage-plugin,
63
64=== modified file 'debian/rules'
65--- debian/rules 2014-02-13 15:58:44 +0000
66+++ debian/rules 2014-03-18 17:24:10 +0000
67@@ -7,9 +7,6 @@
68
69 REL_NO := $(shell lsb_release -rs)
70 RELEASE_GTE_RARING := $(shell expr $(REL_NO) \>= 13.04)
71-# The checkbox-gui binary only makes sense to build for the following
72-# architectures.
73-GUI_ARCHS := amd64 armhf i386
74 %:
75 dh "$@" --with python3,sphinxdoc,translations
76
77@@ -37,12 +34,7 @@
78 echo "from unittest.mock import *" > $(CURDIR)/plainbox/plainbox/vendor/mock.py
79 dh_quilt_patch
80 endif
81-ifneq (,$(findstring $(DEB_BUILD_ARCH), $(GUI_ARCHS)))
82 cd $(CURDIR)/checkbox-gui && qmake PREFIX=/usr && make
83- $(warning NOTICE: Building GUI on supported architecture)
84-else
85- $(warning NOTICE: NOT building GUI on unsupported architecture)
86-endif
87 python3 setup.py build
88
89 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
90@@ -62,9 +54,7 @@
91 python3 setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
92 mkdir -p $(CURDIR)/debian/tmp/usr/lib/checkbox/bin/
93 cp -R $(CURDIR)/debian/tmp/usr/share/checkbox/scripts/* $(CURDIR)/debian/tmp/usr/lib/checkbox/bin/
94-ifneq (,$(findstring $(DEB_BUILD_ARCH), $(GUI_ARCHS)))
95 cd $(CURDIR)/checkbox-gui && make INSTALL_ROOT=$(CURDIR)/debian/tmp install
96-endif
97 dh_install
98
99 override_dh_installdocs:

Subscribers

People subscribed via source and target branches