Merge lp:~pitti/ubuntu-purchase-service/fix-ftbfs into lp:ubuntu-purchase-service

Proposed by Martin Pitt on 2014-05-13
Status: Merged
Approved by: dobey on 2014-05-13
Approved revision: 20
Merged at revision: 20
Proposed branch: lp:~pitti/ubuntu-purchase-service/fix-ftbfs
Merge into: lp:ubuntu-purchase-service
Diff against target: 27 lines (+2/-9)
2 files modified
debian/control (+1/-0)
debian/tests/control (+1/-9)
To merge this branch: bzr merge lp:~pitti/ubuntu-purchase-service/fix-ftbfs
Reviewer Review Type Date Requested Status
dobey (community) 2014-05-13 Approve on 2014-05-13
PS Jenkins bot continuous-integration Approve on 2014-05-13
Review via email: mp+219361@code.launchpad.net

Commit message

- Add missing pkg-config build dep to fix FTBFS
- Clean up debian/tests/control

Description of the change

This package currently FTBFSes, see
https://jenkins.qa.ubuntu.com/job/utopic-adt-ubuntu-purchase-service/14/ARCH=i386,label=adt/console

CMake Error at /usr/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake:108 (message):
  Could NOT find PkgConfig (missing: PKG_CONFIG_EXECUTABLE)

This MP fixes that and also removes some noise from debian/tests/control.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-01-14 18:24:16 +0000
3+++ debian/control 2014-05-13 12:48:02 +0000
4@@ -6,6 +6,7 @@
5 debhelper (>= 9),
6 libqt5webkit5-qmlwebkitplugin,
7 libubuntuoneauth-2.0-dev,
8+ pkg-config,
9 qtbase5-dev,
10 qtdeclarative5-dev,
11 qtdeclarative5-dev-tools,
12
13=== modified file 'debian/tests/control'
14--- debian/tests/control 2013-12-19 22:33:45 +0000
15+++ debian/tests/control 2014-05-13 12:48:02 +0000
16@@ -1,10 +1,2 @@
17 Tests: run-tests
18-Restrictions: rw-build-tree build-needed allow-stderr
19-Depends: @,
20- cmake,
21- debhelper (>= 9),
22- libubuntuoneauth-2.0-dev,
23- qtbase5-dev,
24- qtdeclarative5-dev,
25- qtdeclarative5-ubuntu-ui-toolkit-plugin,
26- xvfb
27+Restrictions: build-needed

Subscribers

People subscribed via source and target branches