Merge lp:~ken-vandine/ubuntu-ui-extras/friends0.2 into lp:~ubuntu-sdk-team/ubuntu-ui-extras/trunk

Proposed by Ken VanDine on 2013-08-29
Status: Merged
Approved by: Günter Schwann on 2013-08-29
Approved revision: 52
Merged at revision: 52
Proposed branch: lp:~ken-vandine/ubuntu-ui-extras/friends0.2
Merge into: lp:~ubuntu-sdk-team/ubuntu-ui-extras/trunk
Diff against target: 33 lines (+3/-3)
2 files modified
debian/control (+2/-2)
modules/Ubuntu/Components/Extras/Share.qml (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-ui-extras/friends0.2
Reviewer Review Type Date Requested Status
Günter Schwann (community) 2013-08-29 Approve on 2013-08-29
PS Jenkins bot continuous-integration Approve on 2013-08-29
Review via email: mp+182895@code.launchpad.net

Commit message

Updated for qtdeclarative5-friends0.2

Description of the change

Updated for qtdeclarative5-friends0.2

To post a comment you must log in.

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 2013-08-21 08:38:08 +0000
3+++ debian/control 2013-08-29 13:15:25 +0000
4@@ -18,7 +18,7 @@
5 qtdeclarative5-test-plugin,
6 qtdeclarative5-ubuntu-ui-toolkit-plugin,
7 qtdeclarative5-accounts-plugin,
8- qtdeclarative5-friends-plugin,
9+ qtdeclarative5-friends0.2,
10 Standards-Version: 3.9.4
11 Homepage: https://launchpad.net/ubuntu-ui-extras
12 # If you aren't a member of ~ubuntu-sdk-team but need to upload packaging
13@@ -36,7 +36,7 @@
14 qtdeclarative5-qtquick2-plugin,
15 qtdeclarative5-ubuntu-ui-toolkit-plugin,
16 qtdeclarative5-accounts-plugin,
17- qtdeclarative5-friends-plugin,
18+ qtdeclarative5-friends0.2,
19 qtdeclarative5-window-plugin,
20 libaccounts-qt5-1,
21 Description: Ubuntu UI Extra Components
22
23=== modified file 'modules/Ubuntu/Components/Extras/Share.qml'
24--- modules/Ubuntu/Components/Extras/Share.qml 2013-08-19 13:18:25 +0000
25+++ modules/Ubuntu/Components/Extras/Share.qml 2013-08-29 13:15:25 +0000
26@@ -17,7 +17,7 @@
27 import QtQuick 2.0
28 import QtQuick.Window 2.0
29 import Ubuntu.Components 0.1
30-import Friends 0.1
31+import Friends 0.2
32 import Ubuntu.OnlineAccounts 0.1
33 import Ubuntu.Components.Extras 0.1
34

Subscribers

People subscribed via source and target branches

to all changes: