Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/qmlModule into lp:ubuntu-ui-toolkit/staging

Proposed by Christian Dywan
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 1883
Merged at revision: 1882
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/qmlModule
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 151 lines (+68/-18)
6 files modified
debian/control (+59/-9)
debian/qml-module-ubuntu-components.install (+0/-8)
debian/qml-module-ubuntu-components.lintian-overrides (+1/-1)
debian/qml-module-ubuntu-layouts.install (+3/-0)
debian/qml-module-ubuntu-performancemetrics.install (+4/-0)
debian/qml-module-ubuntu-test.install (+1/-0)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/qmlModule
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Timo Jyrinki Approve
Review via email: mp+287768@code.launchpad.net

Commit message

Rename qtdeclarative5-*-plugin to qml-module-*

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

Discussed on IRC, we might want to split the different QML plugins into:

qml-module-ubuntu-components
qml-module-ubuntu-layouts
qml-module-ubuntu-performancemetrics
qml-module-ubuntu-test

The same Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin to all of the new packages and dependency to the new packages from the transitional one.

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
1880. By Christian Dywan

Move to separate packages for all QML modules

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

- line 71 update to Performance Metrics plugin
- update the short decsriptions to differ (include the plugin name)
- the .install file names don't match the package names

review: Needs Fixing
1881. By Christian Dywan

Update short descriptions of the new packages

1882. By Christian Dywan

Rename .install files to add ubuntu- prefix

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

all of the new packages should have the Replaces since they're having files that are currently in qtdeclarative5-ubuntu-ui-toolkit-plugin

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
1883. By Christian Dywan

Add Replaces: to all new packages

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

The changes seem now good, hopefully we'll get this to 16.04!

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

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 2016-02-29 17:47:47 +0000
3+++ debian/control 2016-03-03 09:52:25 +0000
4@@ -61,7 +61,7 @@
5 # again.
6 Vcs-Bzr: https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk
7
8-Package: qtdeclarative5-ubuntu-ui-toolkit-plugin
9+Package: qml-module-ubuntu-components
10 Architecture: any
11 Multi-Arch: same
12 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
13@@ -72,6 +72,7 @@
14 qml-module-qtquick-layouts,
15 qml-module-qtfeedback,
16 qtdeclarative5-unity-action-plugin (>= 1.1.0),
17+ qml-module-ubuntu-performancemetrics,
18 suru-icon-theme,
19 ttf-ubuntu-font-family,
20 ubuntu-ui-toolkit-theme (= ${binary:Version}),
21@@ -80,14 +81,63 @@
22 ${misc:Depends},
23 ${shlibs:Depends},
24 Conflicts: qt-components-ubuntu
25-Replaces: qt-components-ubuntu
26+Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version})
27+Replaces: qt-components-ubuntu, qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version})
28 Provides: qt-components-ubuntu
29-Description: Qt Components for Ubuntu - QML plugin
30- Qt Components for Ubuntu offers a set of reusable user interface
31- components for Qt Quick 2 / QML.
32- .
33- This package contains the Ubuntu Components QML plugin.
34-
35+Description: Qt Components for Ubuntu - Components QML plugin
36+ Qt Components for Ubuntu offers a set of reusable user interface
37+ components for Qt Quick 2 / QML.
38+ .
39+ This package contains the Ubuntu Components QML plugin.
40+
41+Package: qml-module-ubuntu-layouts
42+Architecture: any
43+Multi-Arch: same
44+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
45+Depends: ${misc:Depends},
46+ ${shlibs:Depends},
47+Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version})
48+Description: Qt Components for Ubuntu - Layouts QML plugin
49+ Qt Components for Ubuntu offers a set of reusable user interface
50+ components for Qt Quick 2 / QML.
51+ .
52+ This package contains the Ubuntu Layouts QML plugin.
53+
54+Package: qml-module-ubuntu-test
55+Architecture: any
56+Multi-Arch: same
57+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
58+Depends: ${misc:Depends},
59+ ${shlibs:Depends},
60+ qml-module-qttest | qtdeclarative5-test-plugin,
61+ qml-module-ubuntu-components,
62+Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version})
63+Description: Qt Components for Ubuntu - Test QML plugin
64+ Qt Components for Ubuntu offers a set of reusable user interface
65+ components for Qt Quick 2 / QML.
66+ .
67+ This package contains the Ubuntu Test QML plugin.
68+
69+Package: qml-module-ubuntu-performancemetrics
70+Architecture: any
71+Multi-Arch: same
72+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
73+Depends: ${misc:Depends},
74+ ${shlibs:Depends},
75+Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version})
76+Description: Qt Components for Ubuntu - PerformanceMetrics QML plugin
77+ Qt Components for Ubuntu offers a set of reusable user interface
78+ components for Qt Quick 2 / QML.
79+ .
80+ This package contains the Ubuntu PerformanceMetrics QML plugin.
81+
82+
83+Package: qtdeclarative5-ubuntu-ui-toolkit-plugin
84+Architecture: any
85+Section: oldlibs
86+Depends: qml-module-ubuntu-components, ${misc:Depends}
87+Description: Transitional dummy package for Ubuntu UI Toolkit QML plugin
88+ This package contains the Ubuntu Components QML plugin.
89
90 Package: libubuntugestures5
91 Architecture: any
92@@ -223,7 +273,7 @@
93 ubuntu-ui-toolkit-examples (>= ${source:Version}),
94 upstart,
95 url-dispatcher-tools,
96- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= ${source:Version}) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
97+ qml-module-ubuntu-components (>= ${source:Version}) | qml-module-ubuntu-components-gles,
98 ubuntu-app-launch-profiler (>= ${source:Version}),
99 qml-module-qttest | qtdeclarative5-test-plugin,
100 Description: Test package for Ubuntu UI Toolkit
101
102=== renamed file 'debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install' => 'debian/qml-module-ubuntu-components.install'
103--- debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install 2015-09-22 05:58:02 +0000
104+++ debian/qml-module-ubuntu-components.install 2016-03-03 09:52:25 +0000
105@@ -1,10 +1,3 @@
106-usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/*.qml
107-usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/qmldir
108-usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/plugins.qmltypes
109-usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/libUbuntuPerformanceMetrics.so
110-usr/lib/*/qt5/qml/Ubuntu/Layouts/qmldir
111-usr/lib/*/qt5/qml/Ubuntu/Layouts/plugins.qmltypes
112-usr/lib/*/qt5/qml/Ubuntu/Layouts/libUbuntuLayouts.so
113 usr/lib/*/qt5/qml/Ubuntu/Components/1.0/*.qml
114 usr/lib/*/qt5/qml/Ubuntu/Components/1.1/*.qml
115 usr/lib/*/qt5/qml/Ubuntu/Components/1.2/*.qml
116@@ -29,5 +22,4 @@
117 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/1.2/*.qml
118 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/1.3/*.qml
119 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/qmldir
120-usr/lib/*/qt5/qml/Ubuntu/Test
121 usr/share/locale/*/LC_MESSAGES/ubuntu-ui-toolkit.mo
122
123=== renamed file 'debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.lintian-overrides' => 'debian/qml-module-ubuntu-components.lintian-overrides'
124--- debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.lintian-overrides 2013-02-26 07:55:20 +0000
125+++ debian/qml-module-ubuntu-components.lintian-overrides 2016-03-03 09:52:25 +0000
126@@ -1,1 +1,1 @@
127-qtdeclarative5-ubuntu-ui-toolkit-plugin: image-file-in-usr-lib
128+qml-module-ubuntu-ui-toolkit-plugin: image-file-in-usr-lib
129
130=== added file 'debian/qml-module-ubuntu-layouts.install'
131--- debian/qml-module-ubuntu-layouts.install 1970-01-01 00:00:00 +0000
132+++ debian/qml-module-ubuntu-layouts.install 2016-03-03 09:52:25 +0000
133@@ -0,0 +1,3 @@
134+usr/lib/*/qt5/qml/Ubuntu/Layouts/qmldir
135+usr/lib/*/qt5/qml/Ubuntu/Layouts/plugins.qmltypes
136+usr/lib/*/qt5/qml/Ubuntu/Layouts/libUbuntuLayouts.so
137
138=== added file 'debian/qml-module-ubuntu-performancemetrics.install'
139--- debian/qml-module-ubuntu-performancemetrics.install 1970-01-01 00:00:00 +0000
140+++ debian/qml-module-ubuntu-performancemetrics.install 2016-03-03 09:52:25 +0000
141@@ -0,0 +1,4 @@
142+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/*.qml
143+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/qmldir
144+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/plugins.qmltypes
145+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/libUbuntuPerformanceMetrics.so
146
147=== added file 'debian/qml-module-ubuntu-test.install'
148--- debian/qml-module-ubuntu-test.install 1970-01-01 00:00:00 +0000
149+++ debian/qml-module-ubuntu-test.install 2016-03-03 09:52:25 +0000
150@@ -0,0 +1,1 @@
151+usr/lib/*/qt5/qml/Ubuntu/Test

Subscribers

People subscribed via source and target branches