Merge lp:~xnox/ubuntu-seeds/ubuntu-touch.saucy into lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.saucy

[Dimitri John Ledkov]

[Sergio Schvezov (sergiusens)]

Please add qtdeclarative5-qtgrilo0.1 which is needed by the music app

review: Needs Fixing

[lp:~xnox/ubuntu-seeds/ubuntu-touch.saucy]

103. By Dimitri John Ledkov on 2013-09-26

Merge from parent

[Dimitri John Ledkov (xnox)]

@ sergiusens
This branch doesn't introduce or change any packages that are actually seeded.
If you want to add qtdeclarative5-qtgrilo0.1, please make a separate seed change proposal into ~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.saucy, such that we have history of who proposed that addition and who approved it (since you are not in ~ubuntu-core-dev).

[lp:~xnox/ubuntu-seeds/ubuntu-touch.saucy]

104. By Dimitri John Ledkov on 2013-09-26

Revert seeding cordova on touch images. As per -r100.

[Sergio Schvezov (sergiusens)]

fair enough

review: Abstain

=== modified file 'STRUCTURE'
--- STRUCTURE	2013-04-25 14:50:39 +0000
+++ STRUCTURE	2013-09-26 09:03:27 +0000
@@ -1,4 +1,6 @@
 include platform.saucy
-touch: minimal
-sdk:
+sdk-libs: minimal
+sdk-libs-dev: sdk-libs minimal
+sdk: sdk-libs-dev
+touch: minimal sdk-libs
 supported: touch
 
=== modified file 'sdk'
--- sdk	2013-09-16 13:39:53 +0000
+++ sdk	2013-09-26 09:03:27 +0000
@@ -5,41 +5,6 @@
 Task-Key: ubuntu-touch
 Task-Metapackage: ubuntu-sdk
 
-= Qt 5 APIs =
-
- * libqt5qml-graphicaleffects
- * libqt5sql5-sqlite
- * libqt5svg5-dev
- * libqt5v8-5-dev
- * libqt5webkit5-dev
- * libqt5xmlpatterns5-dev
- * qt3d5-dev
- * qtbase5-dev
- * qtdeclarative5-dev
- * qtdeclarative5-dev-tools
- * qtlocation5-dev
- * qtmultimedia5-dev
- * qtscript5-dev
- * qtsensors5-dev
- * qttools5-dev
- * qttools5-dev-tools
-
- * (libqt5webkit5-qmlwebkitplugin)
- * (qtdeclarative5-accounts-plugin)
- * (qtdeclarative5-folderlistmodel-plugin)
- * (qtdeclarative5-friends-plugin)
- * (qtdeclarative5-localstorage-plugin)
- * (qtdeclarative5-particles-plugin)
- * (qtdeclarative5-qtaudioengine-plugin)
- * (qtdeclarative5-qtmultimedia-plugin)
- * (qtdeclarative5-qtquick2-plugin)
- * (qtdeclarative5-qtsensors-plugin)
- * (qtdeclarative5-window-plugin)
- * (qtdeclarative5-xmllistmodel-plugin)
-
- # forces Qt5 as the default; conflicts with Qt4 -- XXX should be a Recommends?
- * qt5-default
-
 = Documentation =
 
  * qtbase5-doc
@@ -52,11 +17,11 @@
 
 = Ubuntu UI Toolkit =
 
- * qtdeclarative5-ubuntu-ui-toolkit-plugin
  * ubuntu-ui-toolkit-doc
  * ubuntu-ui-toolkit-examples
- * ubuntu-ui-toolkit-theme
 
+# Should move to sdk-libs, once tests are passing
+# at the moment it was unseeded from touch in -r100.
 = HTML5 Toolkit =
 
  * cordova-ubuntu-2.8
@@ -68,4 +33,3 @@
  * qtcreator
  * qtcreator-plugin-ubuntu
  * qtcreator-plugin-ubuntu-cordova
-
 
=== added file 'sdk-libs'
--- sdk-libs	1970-01-01 00:00:00 +0000
+++ sdk-libs	2013-09-26 09:03:27 +0000
@@ -0,0 +1,37 @@
+Task-Per-Derivative: 1
+Task-Section: user
+Task-Description: Ubuntu SDK Libraries
+Task-Extended-Description: This task provides the Ubuntu SDK runtime libraries.
+Task-Key: ubuntu-touch
+Task-Metapackage: ubuntu-sdk-libs
+
+= Qt 5 APIs =
+
+ * libqt5qml-graphicaleffects
+ * libqt5sql5-sqlite
+ * libqt5webkit5-qmlwebkitplugin
+ * libqt5script5
+ * qtdeclarative5-u1db1.0
+ * qtdeclarative5-accounts-plugin
+ * qtdeclarative5-folderlistmodel-plugin
+ * qtdeclarative5-friends-plugin
+ * qtdeclarative5-localstorage-plugin
+ * qtdeclarative5-particles-plugin
+ * qtdeclarative5-qtaudioengine-plugin
+ * qtdeclarative5-qtmultimedia-plugin
+ * qtdeclarative5-qtquick2-plugin
+ * qtdeclarative5-qtsensors-plugin
+ * qtdeclarative5-window-plugin
+ * qtdeclarative5-xmllistmodel-plugin
+ * qtdeclarative5-qtlocation-plugin
+ * qtdeclarative5-poppler-qml-plugin
+
+= Ubuntu UI Toolkit =
+
+ * qtdeclarative5-ubuntu-ui-toolkit-plugin
+ * ubuntu-ui-toolkit-theme
+
+= Tools =
+
+ * qmlscene
+ * qtchooser
 
=== added file 'sdk-libs-dev'
--- sdk-libs-dev	1970-01-01 00:00:00 +0000
+++ sdk-libs-dev	2013-09-26 09:03:27 +0000
@@ -0,0 +1,26 @@
+Task-Per-Derivative: 1
+Task-Section: user
+Task-Description: Ubuntu SDK Development Headers
+Task-Extended-Description: This task provides the Ubuntu SDK development headers.
+Task-Key: ubuntu-touch
+Task-Metapackage: ubuntu-sdk-libs-dev
+
+= Qt 5 APIs =
+
+ * libqt5svg5-dev
+ * libqt5v8-5-dev
+ * libqt5webkit5-dev
+ * libqt5xmlpatterns5-dev
+ * qt3d5-dev
+ * qtbase5-dev
+ * qtdeclarative5-dev
+ * qtdeclarative5-dev-tools
+ * qtlocation5-dev
+ * qtmultimedia5-dev
+ * qtscript5-dev
+ * qtsensors5-dev
+ * qttools5-dev
+ * qttools5-dev-tools
+
+ # forces Qt5 as the default; conflicts with Qt4 -- XXX should be a Recommends?
+ * qt5-default
 
=== modified file 'touch'
--- touch	2013-09-25 17:21:04 +0000
+++ touch	2013-09-26 09:03:27 +0000
@@ -67,12 +67,9 @@
  * libubuntu-location-service0
  * ubuntu-location-service-examples
  * mediascanner
- * qtdeclarative5-qtlocation-plugin
- * qtdeclarative5-poppler-qml-plugin
  * mtp-server
  * account-plugin-ubuntuone
  * account-plugin-google
- * libqt5script5
  * click-update-manager
 
 == Shell ==
@@ -97,8 +94,6 @@
 
  * hud
  * qtubuntu-android
- * qtchooser
- * qtdeclarative5-ubuntu-ui-toolkit-plugin
  * webbrowser-app
  * camera-app
  * gallery-app
@@ -122,8 +117,6 @@
  * music-app
  * ubuntu-rssreader-app
  * qtorganizer5-eds
- * qtdeclarative5-u1db1.0
- * qtdeclarative5-friends-plugin
  * unity-webapps-qml
 
 == Debug ==