Merge lp:~timo-jyrinki/ubuntu-seeds/ubuntu-touch.trusty.add_contenthub_and_onlineaccounts into lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.saucy

[Timo Jyrinki]

Add qtdeclarative5-online-accounts-client0.1 and qtdeclarative5-ubuntu-content0.1

Add qtdeclarative5-online-accounts-client0.1 and qtdeclarative5-ubuntu-content0.1

Requested by mhall119

Unmerged revisions

135. By Timo Jyrinki on 2013-11-08

Add qtdeclarative5-online-accounts-client0.1 and qtdeclarative5-ubuntu-content0.1

134. By Michael Terry on 2013-10-30

Drop qtaudioengine for realz

133. By Didier Roche-Tolomelli on 2013-10-30

reverting, will be ready tomorrow

132. By Michael Terry on 2013-10-29

Drop QtAudioEngine plugin from sdk-libs, it is currently unused and will pull a lot of stuff into main

131. By Oliver Grawert on 2013-10-25

revert commit 129 again, this had no approval from anyone of the landing team and changes API backwards compatibility without discussion

130. By Dimitri John Ledkov on 2013-10-24

Seed android-copyright into touch (AOSP copyrights), legal copyrights text.

129. By Michael Terry on 2013-10-24

Drop QtAudioEngine plugin from sdk-libs, it is currently unused and will pull a lot of stuff into main

128. By Colin Watson on 2013-10-18

platform.saucy -> platform.trusty

=== modified file 'STRUCTURE'
--- STRUCTURE	2013-09-20 13:16:17 +0000
+++ STRUCTURE	2013-11-08 09:35:34 +0000
@@ -1,4 +1,4 @@
-include platform.saucy
+include platform.trusty
 sdk-libs: minimal
 sdk-libs-dev: sdk-libs minimal
 sdk: sdk-libs-dev

=== modified file 'sdk-libs'
--- sdk-libs	2013-10-16 18:27:28 +0000
+++ sdk-libs	2013-11-08 09:35:34 +0000
@@ -17,8 +17,8 @@
  * qtdeclarative5-folderlistmodel-plugin
  * qtdeclarative5-friends0.2
  * qtdeclarative5-localstorage-plugin
+ * qtdeclarative5-online-accounts-client0.1
  * qtdeclarative5-particles-plugin
- * qtdeclarative5-qtaudioengine-plugin
  * qtdeclarative5-qtmultimedia-plugin
  * qtdeclarative5-qtquick2-plugin
  * qtdeclarative5-qtsensors-plugin
@@ -26,6 +26,7 @@
  * qtdeclarative5-xmllistmodel-plugin
  * qtdeclarative5-qtlocation-plugin
  * qtdeclarative5-poppler1.0
+ * qtdeclarative5-ubuntu-content0.1
  * qtdeclarative5-usermetrics0.1
  * qtdeclarative5-qtorganizer-plugin
 

=== modified file 'touch'
--- touch	2013-10-15 14:43:23 +0000
+++ touch	2013-11-08 09:35:34 +0000
@@ -10,6 +10,8 @@
  * libhybris
  * libhybris-test
  * libhybris-utils
+# Copyrights of the AOSP portion of the image
+ * android-copyright
  * isc-dhcp-client
  * net-tools
  * network-manager