Merge lp:~timo-jyrinki/ubuntu-seeds/ubuntu-touch.wily_add_two_qml_packages_already_in_vividoverlay_plus_rename_transitional_packages into lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.wily

Proposed by Timo Jyrinki
Status: Merged
Merged at revision: 292
Proposed branch: lp:~timo-jyrinki/ubuntu-seeds/ubuntu-touch.wily_add_two_qml_packages_already_in_vividoverlay_plus_rename_transitional_packages
Merge into: lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.wily
Diff against target: 38 lines (+10/-8)
1 file modified
sdk-libs (+10/-8)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu-seeds/ubuntu-touch.wily_add_two_qml_packages_already_in_vividoverlay_plus_rename_transitional_packages
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Review via email: mp+259767@code.launchpad.net

Commit message

Add qml-module-qtqml-models2 and qml-module-qtqml-statemachine, and use qml-module-* when applicable instead of the transitional packages qtdeclarative5-*

Description of the change

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Looking good, thanks Timo!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sdk-libs'
2--- sdk-libs 2015-03-13 10:05:45 +0000
3+++ sdk-libs 2015-05-21 13:25:30 +0000
4@@ -19,24 +19,26 @@
5 * libqt5multimedia5-plugins
6 * qtdeclarative5-u1db1.0
7 * qml-module-ubuntu-onlineaccounts
8- * qtdeclarative5-folderlistmodel-plugin
9- * qtdeclarative5-localstorage-plugin
10- * qtdeclarative5-online-accounts-client0.1
11- * qtdeclarative5-particles-plugin
12+ * qml-module-qt-labs-folderlistmodel
13+ * qml-module-qtquick-localstorage
14+ * qml-module-ubuntu-onlineaccounts-client
15+ * qml-module-qtquick-particles2
16 * qml-module-qtquick-layouts
17 * qml-module-qtmultimedia
18 * qml-module-qtpositioning
19- * qtdeclarative5-qtquick2-plugin
20+ * qml-module-qtqml-models2
21+ * qml-module-qtqml-statemachine
22+ * qml-module-qtquick2
23 * qml-module-qtsensors
24- * qtdeclarative5-window-plugin
25- * qtdeclarative5-xmllistmodel-plugin
26+ * qml-module-qtquick-window2
27+ * qml-module-qtquick-xmllistmodel
28 * qml-module-qtlocation
29 * qtdeclarative5-poppler1.0
30 * qml-module-qt-labs-settings
31 * libcontent-hub0
32 * qtdeclarative5-ubuntu-content1
33 * qtdeclarative5-usermetrics0.1
34- * qtdeclarative5-qtorganizer-plugin
35+ * qml-module-qtorganizer
36 * qtdeclarative5-ubuntu-download-manager0.1
37 * qtdeclarative5-ubuntu-mediascanner0.1
38 * qtdeclarative5-ubuntu-push-plugin

Subscribers

People subscribed via source and target branches