Merge lp:~bzoltan/ubuntu/utopic/ubuntu-touch-meta/remove_friends_from_sdk_libs into lp:ubuntu/utopic/ubuntu-touch-meta

[Zoltan Balogh]

Remove qtdeclarative5-friends0.2 from the SDK libraries (LP: #1340869)

Remove qtdeclarative5-friends0.2 from the SDK libraries (LP: #1340869)

[Colin Watson (cjwatson)]

Steve Langasek is already working on a more refined version of this (http://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.utopic/revision/217), in the correct place (i.e. not patching generated files directly). This merge proposal does not match his seed changes.

review: Disapprove

Unmerged revisions

161. By Zoltan Balogh on 2014-07-14

Remove qtdeclarative5-friends0.2 from the SDK libraries (LP: #1340869)

=== modified file 'sdk-libs-amd64'
--- sdk-libs-amd64	2014-06-27 12:09:56 +0000
+++ sdk-libs-amd64	2014-07-14 08:24:42 +0000
@@ -11,7 +11,6 @@
 qtchooser
 qtdeclarative5-accounts-plugin
 qtdeclarative5-folderlistmodel-plugin
-qtdeclarative5-friends0.2
 qtdeclarative5-localstorage-plugin
 qtdeclarative5-online-accounts-client0.1
 qtdeclarative5-particles-plugin

=== modified file 'sdk-libs-armhf'
--- sdk-libs-armhf	2014-06-27 12:09:56 +0000
+++ sdk-libs-armhf	2014-07-14 08:24:42 +0000
@@ -11,7 +11,6 @@
 qtchooser
 qtdeclarative5-accounts-plugin
 qtdeclarative5-folderlistmodel-plugin
-qtdeclarative5-friends0.2
 qtdeclarative5-localstorage-plugin
 qtdeclarative5-online-accounts-client0.1
 qtdeclarative5-particles-plugin

=== modified file 'sdk-libs-i386'
--- sdk-libs-i386	2014-06-27 12:09:56 +0000
+++ sdk-libs-i386	2014-07-14 08:24:42 +0000
@@ -11,7 +11,6 @@
 qtchooser
 qtdeclarative5-accounts-plugin
 qtdeclarative5-folderlistmodel-plugin
-qtdeclarative5-friends0.2
 qtdeclarative5-localstorage-plugin
 qtdeclarative5-online-accounts-client0.1
 qtdeclarative5-particles-plugin