Merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1342031 into lp:~online-accounts/ubuntu-system-settings-online-accounts/master

Proposed by Alberto Mardegan
Status: Merged
Merged at revision: 195
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/lp1342031
Merge into: lp:~online-accounts/ubuntu-system-settings-online-accounts/master
Diff against target: 47 lines (+13/-2)
2 files modified
.bzrignore (+2/-1)
debian/control (+11/-1)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1342031
Reviewer Review Type Date Requested Status
Timo Jyrinki (community) Approve
Online Accounts Pending
Alberto Mardegan Pending
Review via email: mp+237244@code.launchpad.net

Commit message

Rename QML package

Description of the change

Rename QML package

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Looks good, provided that the version is bumped to 0.5. I did a test build and checked the contents of the packages.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2014-09-17 14:39:07 +0000
3+++ .bzrignore 2014-10-06 11:50:55 +0000
4@@ -21,8 +21,9 @@
5 /debian/files
6 /debian/libonline-accounts-client-dev/
7 /debian/libonline-accounts-client1/
8+/debian/qml-module-ubuntu-onlineaccounts-client/
9+/debian/qml-module-ubuntu-onlineaccounts-client-doc/
10 /debian/qtdeclarative5-online-accounts-client0.1/
11-/debian/qtdeclarative5-online-accounts-client-doc/
12 /debian/tmp
13 /debian/ubuntu-system-settings-online-accounts/
14 /debian/ubuntu-system-settings-online-accounts-autopilot/
15
16=== modified file 'debian/control'
17--- debian/control 2014-09-04 12:17:05 +0000
18+++ debian/control 2014-10-06 11:50:55 +0000
19@@ -70,14 +70,24 @@
20
21 Package: qtdeclarative5-online-accounts-client0.1
22 Architecture: any
23+Section: oldlibs
24+Depends: qml-module-ubuntu-onlineaccounts-client, ${misc:Depends}
25+Description: transitional dummy package for Online Accounts QML clients
26+ This module offers an API for applications to invoke the Online Accounts panel
27+ in order to request the creation/configuration of accounts.
28+
29+Package: qml-module-ubuntu-onlineaccounts-client
30+Architecture: any
31 Depends: ${misc:Depends},
32 ${shlibs:Depends},
33 qtdeclarative5-qtquick2-plugin,
34+Breaks: qtdeclarative5-online-accounts-client0.1 (<< 0.5)
35+Replaces: qtdeclarative5-online-accounts-client0.1 (<< 0.5)
36 Description: Online Accounts panel library for QML applications
37 This module offers an API for applications to invoke the Online Accounts panel
38 in order to request the creation/configuration of accounts.
39
40-Package: qtdeclarative5-online-accounts-client-doc
41+Package: qml-module-ubuntu-onlineaccounts-client-doc
42 Section: doc
43 Architecture: all
44 Multi-Arch: foreign
45
46=== renamed file 'debian/qtdeclarative5-online-accounts-client-doc.install' => 'debian/qml-module-ubuntu-onlineaccounts-client-doc.install'
47=== renamed file 'debian/qtdeclarative5-online-accounts-client0.1.install' => 'debian/qml-module-ubuntu-onlineaccounts-client.install'

Subscribers

People subscribed via source and target branches