From d43f1aeb9c4becad068fdd3e57739dc0ec26f63f Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 4 Mar 2015 12:04:22 +0100 Subject: [PATCH] Import patches-unapplied version 2.290 to ubuntu/vivid-proposed Imported using git-ubuntu import. Changelog parent: 9efe2723effb8ca149760a1c6ce23ad1d553ca79 New changelog entries: * touch: Explicitly uninstall systemd-sysv, to help apt to install upstart when the preferred "init" alternative is systemd-sysv. Also explicitly install packagekit to help the problem resolver. Thanks Colin Watson! (LP: #1428026) --- debian/changelog | 9 +++++++++ live-build/auto/config | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3c7f1ede..f5a2dcef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.290) vivid; urgency=medium + + * touch: Explicitly uninstall systemd-sysv, to help apt to install upstart + when the preferred "init" alternative is systemd-sysv. Also explicitly + install packagekit to help the problem resolver. Thanks Colin Watson! + (LP: #1428026) + + -- Martin Pitt Wed, 04 Mar 2015 12:04:22 +0100 + livecd-rootfs (2.289) vivid; urgency=medium * add info about /var/log ownership so it ends up in the ubuntu-touch build diff --git a/live-build/auto/config b/live-build/auto/config index 62cdd2b0..428b8704 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 + add_package install ubuntu-minimal ubuntu-touch systemd-sysv- packagekit COMPONENTS='main restricted universe' BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu' export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg'