Merge lp:~sergiusens/ubuntu-seeds/fan into lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu.vivid

[Sergio Schvezov]

Unmerged revisions

2345. By Sergio Schvezov on 2015-06-23

Adding ubuntu-fan to ubuntu-core

2344. By Jamie Strandboge on 2015-06-22

system-image: move click-apparmor after ubuntu-core-security-apparmor to
avoid pulling in apparmor-easyprof-ubuntu (LP: #1464030)

2343. By Scott Moser on 2015-06-19

cloud-image: add cloud-initramfs-dyn-netconf and cloud-initramfs-copymods

These packages are tiny, inert by default, useful, and used in the maas
image. I'm adding them here in an effort to over time reduce
the delta between maas image and cloud image.

2342. By Robert Ancell on 2015-06-12

Explicitly depend on Zeitgeist for desktop since it will not be automatically pulled in with the Zeitgeist dependencies being fixed

2341. By Scott Moser on 2015-05-05

cloud-image: remove landscape-client from image

landscape-client can be installed with apt-get or by providing
user-data that has 'landscape-client' data.

fixes LP: #1427275 (for landscape-client)

2340. By Adam Conrad on 2015-05-04

platform.vivid -> platform.wily

=== modified file 'STRUCTURE'
--- STRUCTURE	2014-10-23 20:07:08 +0000
+++ STRUCTURE	2015-06-23 14:53:30 +0000
@@ -1,4 +1,4 @@
-include platform.vivid
+include platform.wily
 desktop: desktop-common
 dns-server: standard
 lamp-server: standard

=== modified file 'cloud-image'
--- cloud-image	2015-03-03 14:27:20 +0000
+++ cloud-image	2015-06-23 14:53:30 +0000
@@ -10,7 +10,6 @@
  * at
  * byobu
  * curl
- * landscape-client
  * openssh-server
  * overlayroot
  * patch
@@ -46,3 +45,5 @@
  * sosreport # LP: #1311274
  * systemd # not supported yet, but working on enablement
  * bcache-tools
+ * cloud-initramfs-dyn-netconf
+ * cloud-initramfs-copymods

=== modified file 'desktop'
--- desktop	2015-03-16 10:44:15 +0000
+++ desktop	2015-06-23 14:53:30 +0000
@@ -176,6 +176,8 @@
  * notify-osd           # backend for libnotify
  * (sni-qt)
  * (activity-log-manager)
+ * (zeitgeist-core) 
+ * (zeitgeist-datahub)
  * (xul-ext-unity)
  * (unity-webapps-common)
  * (xul-ext-webaccounts)

=== modified file 'system-image'
--- system-image	2015-06-22 19:18:37 +0000
+++ system-image	2015-06-23 14:53:30 +0000
@@ -38,3 +38,4 @@
  * resolvconf
  * dosfstools
  * python # temporrarily seeded for walinuxagent
+ * ubuntu-fan