Merge lp:~dobey/ubuntuone-credentials/uoa-int-deps into lp:ubuntuone-credentials/packaging-dailies

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 11
Merged at revision: 11
Proposed branch: lp:~dobey/ubuntuone-credentials/uoa-int-deps
Merge into: lp:ubuntuone-credentials/packaging-dailies
Diff against target: 20 lines (+3/-1)
2 files modified
control (+2/-1)
libubuntuoneauth-2.0-0.install (+1/-0)
To merge this branch: bzr merge lp:~dobey/ubuntuone-credentials/uoa-int-deps
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+181359@code.launchpad.net

Commit message

Add new deps to build properly.
Include the online-accounts data files in the library package.

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'control'
2--- control 2013-08-14 15:28:09 +0000
3+++ control 2013-08-21 17:44:11 +0000
4@@ -5,7 +5,8 @@
5 cmake,
6 debhelper (>= 9),
7 liboauth-dev,
8- libsecret-1-dev,
9+ libaccounts-qt5-dev,
10+ libsignon-qt5-dev,
11 qtbase5-dev,
12 qtdeclarative5-dev,
13 qtdeclarative5-ubuntu-ui-toolkit-plugin,
14
15=== modified file 'libubuntuoneauth-2.0-0.install'
16--- libubuntuoneauth-2.0-0.install 2013-03-28 17:33:54 +0000
17+++ libubuntuoneauth-2.0-0.install 2013-08-21 17:44:11 +0000
18@@ -1,2 +1,3 @@
19 usr/lib/*/libubuntuoneauth-2.0.so.0*
20+usr/share/accounts/*
21

Subscribers

People subscribed via source and target branches

to all changes: