From 373fd4c2cca46a8774dd186298202bcbc5bc0029 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 25 Mar 2015 10:26:40 +0100 Subject: [PATCH] Import patches-unapplied version 2.295 to ubuntu/vivid-proposed Imported using git-ubuntu import. Changelog parent: 79e9de67c471089392813f15fd745d8feacfbedc New changelog entries: * forcefully add ubuntu-system-settings-online-accounts to ubuntu-touch builds to make sure the dependency is fulfilled in advance --- debian/changelog | 7 +++++++ live-build/auto/config | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8a35e707..76a3b296 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.295) vivid; urgency=medium + + * forcefully add ubuntu-system-settings-online-accounts to ubuntu-touch + builds to make sure the dependency is fulfilled in advance + + -- Oliver Grawert Wed, 25 Mar 2015 10:26:40 +0100 + livecd-rootfs (2.294) vivid; urgency=medium * add more verbosity to the copy command for android fragments in diff --git a/live-build/auto/config b/live-build/auto/config index 428b8704..e65678f3 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -410,7 +410,7 @@ case $PROJECT in ;; ubuntu-touch) - add_package install ubuntu-minimal ubuntu-touch systemd-sysv- packagekit + add_package install ubuntu-minimal ubuntu-touch systemd-sysv- packagekit ubuntu-system-settings-online-accounts COMPONENTS='main restricted universe' BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu' export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg'