Merge lp:~dobey/ubuntuone-credentials/rename-qml-module into lp:ubuntuone-credentials

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 218
Merged at revision: 216
Proposed branch: lp:~dobey/ubuntuone-credentials/rename-qml-module
Merge into: lp:ubuntuone-credentials
Diff against target: 66 lines (+15/-7)
2 files modified
debian/changelog (+6/-0)
debian/control (+9/-7)
To merge this branch: bzr merge lp:~dobey/ubuntuone-credentials/rename-qml-module
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot continuous-integration Approve
Ubuntu One hackers Pending
Review via email: mp+277626@code.launchpad.net

Commit message

Rename QML module package to follow new naming scheme.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) :
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 2015-07-31 20:39:15 +0000
3+++ debian/changelog 2015-11-17 21:29:13 +0000
4@@ -1,3 +1,9 @@
5+ubuntuone-credentials (15.11+16.04.20151117) UNRELEASED; urgency=medium
6+
7+ * Rename the QML module package to match newer naming scheme.
8+
9+ -- Rodney Dawes <rodney.dawes@ubuntu.com> Tue, 17 Nov 2015 16:07:05 -0500
10+
11 ubuntuone-credentials (15.10+15.10.20150713ubuntu1~gcc5.1) wily; urgency=medium
12
13 * No-change test rebuild for g++5 ABI transition
14
15=== modified file 'debian/control'
16--- debian/control 2015-07-31 20:39:15 +0000
17+++ debian/control 2015-11-17 21:29:13 +0000
18@@ -49,11 +49,11 @@
19 python3-autopilot,
20 python3-fixtures,
21 python3-testtools,
22- qtdeclarative5-online-accounts-client0.1,
23- qtdeclarative5-qtquick2-plugin,
24- qtdeclarative5-test-plugin,
25+ qml-module-qtquick2,
26+ qml-module-qttest,
27+ qml-module-ubuntuone,
28+ qml-module-ubuntu-onlineaccounts,
29 qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
30- qtdeclarative5-ubuntuone1.0,
31 qttestability-autopilot | libautopilot-qt,
32 ubuntu-keyboard-autopilot,
33 ubuntu-ui-toolkit-autopilot,
34@@ -109,7 +109,7 @@
35 This package includes the development files for the Ubuntu One authentication
36 library.
37
38-Package: qtdeclarative5-ubuntuone1.0
39+Package: qml-module-ubuntuone
40 Architecture: any
41 Multi-Arch: same
42 Pre-Depends:
43@@ -122,9 +122,11 @@
44 ${shlibs:Depends},
45 Breaks:
46 qtdeclarative5-ubuntuone-credentials-plugin,
47+ qtdeclarative5-ubuntuone1.0,
48 Replaces:
49 qtdeclarative5-ubuntuone-credentials-plugin,
50-Description: Ubuntu One authentication library - Qt declarative plug-in
51+ qtdeclarative5-ubuntuone1.0,
52+Description: Ubuntu One authentication library - QML Module
53 A library for native applications to log into the Ubuntu One services,
54 to synchronize data, purchase music and software, or access data stored
55 remotely on the Ubuntu One servers.
56@@ -156,7 +158,7 @@
57 ${misc:Pre-Depends},
58 Depends:
59 libubuntuoneauth-2.0-0 (= ${binary:Version}),
60- qtdeclarative5-ubuntuone1.0 (= ${binary:Version}),
61+ qml-module-ubuntuone (= ${binary:Version}),
62 ubuntu-system-settings-online-accounts,
63 ${misc:Depends},
64 ${shlibs:Depends},
65
66=== renamed file 'debian/qtdeclarative5-ubuntuone1.0.install' => 'debian/qml-module-ubuntuone.install'

Subscribers

People subscribed via source and target branches

to all changes: