Merge lp:~sergiusens/ubuntu-seeds/ciborium into lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.trusty

[Sergio Schvezov]

Unmerged revisions

235. By Sergio Schvezov on 2014-08-06

Adding ciborium

234. By Steve Langasek on 2014-08-04

Pull in only the Qt5 bits of autopilot-qt, allowing us to drop qt4 from the images

233. By Martin Pitt on 2014-08-01

Replace fonts-arphic-ukai with fonts-wqy-microhei for Chinese

232. By Colin Watson on 2014-07-30

Add a touch-tests seed containing all the *-autopilot packages from touch, useful for RTM branching.

231. By Oliver Grawert on 2014-07-30

move the qtmir-android package properly to touch-android, so desktop-next does not try to pull it in

230. By Ricardo Salveti on 2014-07-29

Adding qtmir-android to touch

229. By Ricardo Salveti on 2014-07-29

Adding account-polld (push client account notification)

228. By Steve Langasek on 2014-07-29

Revert previous change, which pulls in wrong packages on ubuntu-desktop-next and didn't even help on the phone.

227. By Steve Langasek on 2014-07-28

Force libmirclientplatform-android, libmirplatformgraphics-android into touch-core for the moment to unbreak phone builds (will break ubuntu-desktop-next in return until we get this properly sorted)

226. By Ricardo Salveti on 2014-07-28

Adding udisks2 for sdcard support

=== modified file 'STRUCTURE'
--- STRUCTURE	2013-11-21 11:44:04 +0000
+++ STRUCTURE	2014-08-06 00:46:28 +0000
@@ -1,7 +1,13 @@
-include platform.trusty
+include platform.utopic
 feature no-follow-recommends
 sdk-libs: minimal
 sdk-libs-dev: sdk-libs minimal
 sdk: sdk-libs-dev
-touch: minimal sdk-libs
-supported: touch
+touch-android: minimal
+touch-core: minimal sdk-libs
+touch: touch-android touch-core
+touch-tests: touch
+desktop: touch-core
+live: desktop live-common
+ship-live: boot live
+supported: touch desktop ship-live
 
=== added file 'desktop'
--- desktop	1970-01-01 00:00:00 +0000
+++ desktop	2014-08-06 00:46:28 +0000
@@ -0,0 +1,113 @@
+Task-Per-Derivative: 1
+Task-Section: user
+Task-Description: Ubuntu Desktop Next
+Task-Extended-Description: This task provides a desktop environment with Unity 8
+Task-Key: ubuntu-desktop-next
+Task-Name: ubuntu-desktop-next
+Task-Metapackage: ubuntu-desktop-next
+Task-Seeds: touch-core
+
+== Core ==
+
+ * ttf-ubuntu-font-family
+ * fonts-freefont-ttf
+ * fonts-dejavu-extra
+ * fonts-wqy-microhei
+ * fonts-nanum
+ * ubuntu-keyboard-english
+ * ubuntu-keyboard-arabic
+ * ubuntu-keyboard-chinese-pinyin
+ * ubuntu-keyboard-czech
+ * ubuntu-keyboard-danish
+ * ubuntu-keyboard-dutch
+ * ubuntu-keyboard-finnish
+ * ubuntu-keyboard-french
+ * ubuntu-keyboard-german
+ * ubuntu-keyboard-hebrew
+ * ubuntu-keyboard-hungarian
+ * ubuntu-keyboard-italian
+ * ubuntu-keyboard-polish
+ * ubuntu-keyboard-portuguese
+ * ubuntu-keyboard-russian
+ * ubuntu-keyboard-spanish
+ * ubuntu-keyboard-swedish
+ * account-plugin-tools
+ * account-plugin-twitter
+ * account-plugin-facebook
+ * account-plugin-evernote
+ * suru-icon-theme
+ * account-plugin-ubuntuone
+ * account-plugin-google
+
+To provide a way to log in; as thing stand this will install X11
+ * lightdm
+ * unity-greeter
+
+== Shell ==
+
+ * unity8
+ * unity8-desktop-session-mir
+ * indicator-bluetooth
+ * indicator-datetime
+ * indicator-location
+ * indicator-messages
+ * indicator-network
+ * indicator-power
+ * indicator-sound
+ * unity-scope-scopes
+ * unity-scope-click
+ * unity-scope-mediascanner2
+ * url-dispatcher
+ * thumbnailer-service
+
+== Apps ==
+
+ * hud
+ * webbrowser-app
+ * webapp-container # container
+ * messaging-app
+ * address-book-app
+ * mediaplayer-app
+ * camera-app
+ * gallery-app
+ * notes-app
+ * syncevolution
+ * sync-monitor-uoa
+ * ubuntu-touch-settings
+ * ubuntu-system-settings
+ * ubuntu-system-settings-online-accounts
+
+Modifies some policykit policies to ensure that actions work the way we want
+them.
+
+ * policykit-desktop-privileges
+ * qtorganizer5-eds
+ * unity-webapps-qml
+
+Sets many GSettings defaults
+
+ * ubuntu-settings
+
+== Themes and artwork ==
+
+ * light-themes # Needed for the installer and GTK applications
+ * dmz-cursor-theme
+ * ubuntu-touch-sounds
+ * ubuntu-artwork
+
+== Testing ==
+
+# Spell out actual autopilot packages needed & used
+ * python-autopilot # to execute python2 based autopilot tests
+ * python-evdev # to execute python2 based autopilot tests
+
+== language support ==
+# we use the -gnome-*-base packages here for indicator translations
+# other base packs get pulled in through dependencies
+
+ * language-pack-gnome-en-base
+ * language-pack-gnome-de-base
+ * language-pack-gnome-es-base
+ * language-pack-gnome-fr-base
+ * language-pack-gnome-pt-base
+ * language-pack-gnome-zh-hans-base
 
=== added file 'live'
--- live	1970-01-01 00:00:00 +0000
+++ live	2014-08-06 00:46:28 +0000
@@ -0,0 +1,37 @@
+Task-Per-Derivative: 1
+Task-Section: user
+Task-Description: Ubuntu live CD
+Task-Extended-Description: This task provides the extra packages installed on the Ubuntu live CD. It is neither useful nor recommended to install this task in other environments.
+Task-Relevance: 2
+Task-Key: ubiquity-frontend-gtk
+Task-Test-new-install: skip show
+Task-Seeds: live-common
+
+ * Languages: en
+ * language-pack-${Languages}
+ * language-pack-gnome-${Languages}
+
+# subset of English language support which we want by default:
+ * libreoffice-help-en-us [i386 amd64]
+ * hunspell-en-us
+ * wamerican
+
+ * Languages: es zh-hans
+ * language-pack-${Languages}
+ * language-pack-gnome-${Languages}
+
+Enough room on i386/powerpc, not enough on amd64:
+ * Languages: pt de
+ * language-pack-${Languages} [i386 powerpc]
+ * language-pack-gnome-${Languages} [i386 powerpc]
+
+ * gparted
+ * cifs-utils # Needed by casper for CIFS root=
+
+== Ubiquity components ==
+
+These packages make up the Ubiquity live installer.
+
+ * ubiquity-frontend-gtk
+ * ubiquity-ubuntu-artwork
+ * ubiquity-slideshow-ubuntu
 
=== modified file 'sdk'
--- sdk	2014-04-04 10:52:41 +0000
+++ sdk	2014-08-06 00:46:28 +0000
@@ -15,6 +15,7 @@
  * qtscript5-doc
  * qtsvg5-doc
  * qttools5-doc
+ * libcontent-hub-doc
 
 = Ubuntu UI Toolkit =
 
 
=== modified file 'sdk-libs'
--- sdk-libs	2014-04-04 10:52:41 +0000
+++ sdk-libs	2014-08-06 00:46:28 +0000
@@ -6,31 +6,45 @@
 Task-Name: ubuntu-sdk-libs
 Task-Metapackage: ubuntu-sdk-libs
 
+ * Feature: no-follow-recommends
+
 = Qt 5 APIs =
 
- * libqt5qml-graphicaleffects
+ * libqt5keychain0
+ * qml-module-qtgraphicaleffects
  * libqt5sql5-sqlite
- * libqt5webkit5-qmlwebkitplugin
+ * qml-module-qtwebkit
  * libqt5script5
  * libqt5multimedia5-plugins
  * qtdeclarative5-u1db1.0
  * qtdeclarative5-accounts-plugin
  * qtdeclarative5-folderlistmodel-plugin
- * qtdeclarative5-friends0.2
  * qtdeclarative5-localstorage-plugin
  * qtdeclarative5-online-accounts-client0.1
  * qtdeclarative5-particles-plugin
- * qtdeclarative5-qtmultimedia-plugin
+ * qml-module-qtquick-layouts
+ * qml-module-qtmultimedia
  * qtdeclarative5-qtpositioning-plugin
  * qtdeclarative5-qtquick2-plugin
- * qtdeclarative5-qtsensors-plugin
+ * qml-module-qtsensors
  * qtdeclarative5-window-plugin
  * qtdeclarative5-xmllistmodel-plugin
  * qtdeclarative5-qtlocation-plugin
  * qtdeclarative5-poppler1.0
+ * libcontent-hub0
  * qtdeclarative5-ubuntu-content0.1
  * qtdeclarative5-usermetrics0.1
  * qtdeclarative5-qtorganizer-plugin
+ * qtdeclarative5-ubuntu-download-manager0.1
+ * qtdeclarative5-ubuntu-mediascanner0.1
+ * qtdeclarative5-ubuntu-syncmonitor0.1
+ * qtdeclarative5-ubuntu-telephony-phonenumber0.1
+
+= Multimedia =
+
+Preferred set of codecs for oxide.
+
+ * oxideqt-codecs-extra
 
 = Ubuntu UI Toolkit =
 
@@ -39,7 +53,6 @@
 
 = HTML5 Toolkit =
 
- * cordova-ubuntu-2.8
  * ubuntu-html5-theme
  * ubuntu-html5-container
 
 
=== modified file 'sdk-libs-dev'
--- sdk-libs-dev	2014-04-04 10:52:41 +0000
+++ sdk-libs-dev	2014-08-06 00:46:28 +0000
@@ -8,6 +8,7 @@
 
 = Qt 5 APIs =
 
+ * libqt5sensors5-dev
  * libqt5svg5-dev
  * libqt5webkit5-dev
  * libqt5xmlpatterns5-dev
@@ -18,8 +19,8 @@
  * qtdeclarative5-dev-tools
  * qtlocation5-dev
  * qtmultimedia5-dev
+ * libcontent-hub-dev
  * qtscript5-dev
- * qtsensors5-dev
  * qttools5-dev
  * qttools5-dev-tools
  * cmake
 
=== added file 'ship-live'
--- ship-live	1970-01-01 00:00:00 +0000
+++ ship-live	2014-08-06 00:46:28 +0000
@@ -0,0 +1,35 @@
+The ship-live seed will be added to the live CD as an ordinary package
+archive. Here belongs anything that somebody might need to install after
+installing the contents of the live CD in order to get online and fetch more
+packages.
+
+== Hardware & Network Access ==
+
+ * pptp-linux             # client for Microsoft-compatible VPN's, needed for some ISPs
+ * sl-modem-daemon	# needed for some Winmodems (see OutoftheboxWinmodem)
+
+ * libatm1	# suggested by ppp for PPP-over-ATM
+ * setserial	# needed by folks with nonstandard serial ports
+ * mouseemu	# needed on Macs with single-button mice
+ * ps3pf-utils [powerpc] # small utilities for PlayStation 3 systems
+ * elfspe2 [powerpc] # SPE access for Cell systems
+ * b43-fwcutter
+ * bcmwl-kernel-source #since we no longer have LRM
+ * wvdial       # network-manager should replace this functionality ASAP
+
+== Installer ==
+
+ * grub # needed for dmraid et al
+ * grub-efi [amd64]
+ * grub-efi-amd64-signed [amd64]
+ * shim-signed [amd64]
+ * oem-config-gtk
+ * oem-config-slideshow-ubuntu
+ * lupin-support [amd64 i386] # installer-for-windows
+ * uboot-mkimage [armel] # needed on dove for uboot
+
+== Blacklist ==
+
+libavcodec cannot be shipped on CDs (c.f. Ubuntu technical board resolution 2007-01-02).
+
+ * !libavcodec*
 
=== modified file 'touch'
--- touch	2014-04-28 10:39:23 +0000
+++ touch	2014-08-06 00:46:28 +0000
@@ -5,29 +5,19 @@
 Task-Key: ubuntu-touch
 Task-Name: ubuntu-touch
 Task-Metapackage: ubuntu-touch
+Task-Seeds: touch-android touch-core
+
+ * Feature: no-follow-recommends
 
  * Feature: no-follow-recommends
 
 == Core ==
 
- * libhybris
- * libhybris-test
- * libhybris-utils
-# Copyrights of the AOSP portion of the image
- * android-copyright
- * isc-dhcp-client
- * net-tools
- * network-manager
- * bluez
- * ca-certificates
- * alsa-base
- * alsa-utils
  * ttf-ubuntu-font-family
  * fonts-freefont-ttf
  * fonts-dejavu-extra
- * fonts-arphic-ukai
- * ubuntu-touch-session
- * powerd
+ * fonts-wqy-microhei
+ * fonts-nanum
  * ubuntu-keyboard-english
  * ubuntu-keyboard-arabic
  * ubuntu-keyboard-chinese-pinyin
@@ -45,83 +35,17 @@
  * ubuntu-keyboard-russian
  * ubuntu-keyboard-spanish
  * ubuntu-keyboard-swedish
- * friends
- * friends-facebook
- * friends-twitter
- * telepathy-gabble
- * libmessaging-menu0
- * signon-plugin-oauth2
- * python3-gi
- * python3-pkg-resources
- * python3-oauthlib
- * gir1.2-accounts-1.0
  * account-plugin-tools
  * account-plugin-twitter
  * account-plugin-facebook
  * account-plugin-evernote
  * suru-icon-theme
- * software-properties-common
- * mobile-broadband-provider-info
- * system-image-cli
- * click
- * packagekit
- * packagekit-plugin-click
- * click-apparmor
- * ufw
- * wget
- * bluetooth-touch
- * ubuntu-touch-customization-hooks
- * pulseaudio
- * pulseaudio-module-bluetooth
- * rtkit
- * content-hub
- * libubuntu-location-service0
- * ubuntu-location-service-bin
-# music-app is using mediascanner 1 and grilo. So seeding them for now
- * mediascanner
- * grilo-plugins-0.2-mediascanner
- * mtp-server
  * account-plugin-ubuntuone
  * account-plugin-google
-# A QtMultimedia camera plugin that talks to Android by using hybris
- * cameraplugin-aal
-# Plugin for showing camera viewfinder in Qt as well as the video surface in 
-# the media-player
- * qtvideonode-plugin
-# Library that coordinates qtvideo-node, qtubuntu-camera and qtubuntu-media
-# across thread contexts.
- * libqtubuntu-media-signals1
- # can take advantage to fine-tune removals; also useful for debugging
- * upstart-app-launch-tools
- * usensord
- * libtinyxml2-0.0.0           # camera/gallery
- * libzen0                     # camera/gallery
-# Touch uses the android-based mir platform backend by default
- * libmirclientplatform-android
- * libmirplatformgraphics-android
- * ubuntu-push-client
-
-== Multimedia ==
-
- * gstreamer1.0-pulseaudio
- * gstreamer1.0-fluendo-mp3    # MP3 support
- * gstreamer1.0-plugins-good
- * gstreamer0.10-plugins-good  # camera/gallery
- * gstreamer1.0-plugins-bad-faad # for h264parse/faad / streaming
- * gstreamer1.0-plugins-bad-videoparsers # for h264parse/faad / streaming
- * gstreamer1.0-hybris
- * libqgsttools-p1-touch
- * libqt5multimedia5-touch
- * libqt5multimedia5-touch-plugins
- * libqt5multimediaquick-p5-touch
- * qtdeclarative5-qtmultimedia-touch-plugin
- * libexiv2-12                 # camera/gallery
- * libmediainfo0               # camera/gallery
- * libqtubuntu-media-signals1  # camera/gallery
- * oxideqt-codecs-extra        # for oxide-qt
 
 == Shell ==
 
+ * ubuntu-touch-session
  * unity8
  * indicator-bluetooth
  * indicator-datetime
@@ -130,6 +54,8 @@
  * indicator-network
  * indicator-power
  * indicator-sound
+ * indicator-transfer
+ * ubuntu-system-settings-wizard
  * unity-scope-scopes
  * unity-scope-click
  * unity-scope-mediascanner2
@@ -139,14 +65,12 @@
 == Apps ==
 
  * hud
- * qtubuntu-android
  * webbrowser-app
  * webapp-container # container
  * dialer-app
  * messaging-app
  * address-book-app
  * mediaplayer-app
- * friends-app
  * syncevolution
  * sync-monitor-uoa
  * ubuntu-touch-settings
@@ -162,43 +86,21 @@
 
  * ubuntu-touch-sounds
 
-== Debug ==
-
- * nano
- * wireless-tools
- * openssh-server
-
-== Utils ==
-
- * ofono-scripts
- * mir-utils	# screencast
-
-== Testing ==
-
- * autopilot-touch
- * mir-test-tools
-
-== Container Related ==
-
- * initramfs-tools-ubuntu-touch
- * ubuntu-touch-generic-initrd [armhf]
- * android-tools-adbd
- * lxc-android-config
-
-== Error Reporting ==
-
- * whoopsie
- * apport
- * apport-noui
-
 == language support ==
-# we use the -gnome-*-base packages here for indicator translations
-# other base packs get pulled in through dependencies
-
- * language-pack-gnome-en-base
- * language-pack-gnome-de-base
- * language-pack-gnome-es-base
- * language-pack-gnome-fr-base
- * language-pack-gnome-pt-base
- * language-pack-gnome-zh-hans-base
-
+# these are trimmed for the touch seeds and only get built if they have at
+# least 70% coverage, so we want them all
+
+ * /^language-pack-touch-/
+
+== X86 Emulator ==
+
+ * libqt5gui5-gles [amd64 i386]
+ * libqt5opengl5-gles [amd64 i386]
+ * libqt5quick5-gles [amd64 i386]
+ * libqt5quickparticles5-gles [amd64 i386]
+ * libqt53d5-gles [amd64 i386]
+ * libqt5multimediawidgets5-gles [amd64 i386]
+ * libqt5location5-gles [amd64 i386]
+ * qtdeclarative5-qtlocation-plugin-gles [amd64 i386]
+ * qtdeclarative5-ubuntu-ui-toolkit-plugin-gles [amd64 i386]
+ * qml-module-qtmultimedia-gles [amd64 i386]
 
=== added file 'touch-android'
--- touch-android	1970-01-01 00:00:00 +0000
+++ touch-android	2014-08-06 00:46:28 +0000
@@ -0,0 +1,45 @@
+The touch-android seed exists to allow sharing a common touch-core between
+touch and desktop-next without pulling Android-specific bits into desktop-next.
+It does not have an associated metapackage as it is not expected to be
+installable on its own.
+
+ * Feature: no-follow-recommends
+
+== Core Device Specific ==
+
+# Here we list _preferred_ alternatives. These must be specified
+# first, otherwise packages that depend on alternatives can pull in
+# the wrong one (e.g. X11 or mesa based ones)
+
+# Touch uses the android-based mir platform backends by default
+ * libmirclientplatform-android
+ * libmirplatformgraphics-android
+ * qtmir-android
+
+== Core ==
+
+ * libhybris
+ * libhybris-test
+ * libhybris-utils
+# Copyrights of the AOSP portion of the image
+ * android-copyright
+
+== Multimedia ==
+
+# A QtMultimedia camera plugin that talks to Android by using hybris
+ * cameraplugin-aal
+ * gstreamer1.0-hybris
+ * pulseaudio-module-droid
+
+== Apps ==
+
+ * qtubuntu-android
+
+== Container Related ==
+
+ * initramfs-tools-ubuntu-touch
+ * ubuntu-touch-generic-initrd [armhf]
+ * android-tools-adbd
+ * lxc-android-config
+ * dbus-property-service
+
 
=== added file 'touch-core'
--- touch-core	1970-01-01 00:00:00 +0000
+++ touch-core	2014-08-06 00:46:28 +0000
@@ -0,0 +1,130 @@
+Task-Per-Derivative: 1
+Task-Section: user
+Task-Description: Ubuntu touch core
+Task-Extended-Description: This task provides the core Ubuntu touch environment.
+Task-Key: ubuntu-touch-core
+Task-Name: ubuntu-touch-core
+Task-Metapackage: ubuntu-touch-core
+
+ * Feature: no-follow-recommends
+
+== Core ==
+
+ * isc-dhcp-client
+ * net-tools
+ * network-manager
+ * bluez
+ * ca-certificates
+ * alsa-base
+ * alsa-utils
+ * powerd
+ * urfkill
+ * qtdeclarative5-friends0.2
+ * friends-facebook
+ * friends-twitter
+ * telepathy-gabble
+ * libmessaging-menu0
+ * signon-plugin-oauth2
+ * python3-gi
+ * python3-pkg-resources
+ * python3-oauthlib
+ * gir1.2-accounts-1.0
+ * software-properties-common
+ * mobile-broadband-provider-info
+ * system-image-cli
+ * click
+ * packagekit
+ * packagekit-plugin-click
+ * click-apparmor
+ * ufw
+ * wget
+ * bluetooth-touch
+ * ubuntu-touch-customization-hooks
+ * pulseaudio
+ * pulseaudio-module-bluetooth
+ * rtkit
+ * content-hub
+ * ubuntu-location-service-bin
+ * mtp-server
+# Plugin for showing camera viewfinder in Qt as well as the video surface in 
+# the media-player
+ * qtvideonode-plugin
+# Library that coordinates qtvideo-node, qtubuntu-camera and qtubuntu-media
+# across thread contexts.
+ * libqtubuntu-media-signals1
+ # can take advantage to fine-tune removals; also useful for debugging
+ * ubuntu-app-launch-tools
+ * usensord
+ * libtinyxml2-2               # camera/gallery
+ * libzen0                     # camera/gallery
+ * ubuntu-push-client
+ * account-polld               # ubuntu-push-client account notifications
+# MMS support
+ * nuntium
+ * libnss-extrausers
+ * udisks2
+ * ciborium
+
+== Multimedia ==
+
+ * gstreamer1.0-pulseaudio
+ * gstreamer1.0-fluendo-mp3    # MP3 support
+ * gstreamer1.0-plugins-good
+ * gstreamer0.10-plugins-good  # camera/gallery
+ * gstreamer1.0-plugins-bad-faad # for h264parse/faad / streaming
+ * gstreamer1.0-plugins-bad-videoparsers # for h264parse/faad / streaming
+ * media-hub                   # centralized media playback
+ * qtubuntu-media              # for media-hub
+ * libmediainfo0               # camera/gallery
+ * libqtubuntu-media-signals1  # camera/gallery
+
+== Apps ==
+
+ * pay-service
+
+== Debug ==
+
+ * nano
+ * wireless-tools
+ * openssh-server
+ * smemstat
+ * forkstat
+ * cpustat
+ * eventstat
+ * powerstat
+ * health-check
+# Tools added for debugging which should be removed in non-developer builds
+ * strace
+ * lsof
+ * ltrace
+ * tcptraceroute
+
+== Utils ==
+
+ * ofono-scripts
+ * mir-utils	# screencast
+ * packagekit-tools
+ * pulseaudio-utils # pactl
+
+== Testing ==
+
+# Spell out actual autopilot packages needed & used
+ * autopilot-touch # for a single apparmor click.rules files
+ * autopilot-qt5
+ * qttestability-autopilot
+ * python3-autopilot # to execute python3 based autopilot tests
+ * python3-evdev # to execute python3 based autopilot tests
+ * fbset # to dynamically detect framebuffer / screen size
+
+# Mir testing utils
+ * mir-test-tools
+
+# Platform API testing utils (sensors, gps, etc)
+ * ubuntu-application-api2-examples
+
+== Error Reporting ==
+
+ * whoopsie
+ * apport
+ * apport-noui
+
 
=== added file 'touch-tests'
--- touch-tests	1970-01-01 00:00:00 +0000
+++ touch-tests	2014-08-06 00:46:28 +0000
@@ -0,0 +1,1 @@
+ * Extra-Include: *-autopilot