From b477837c3120d904a5fd724a12e55e0b153826f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Mon, 10 Oct 2016 14:41:46 +0200 Subject: [PATCH] Import patches-unapplied version 2.435 to ubuntu/yakkety-proposed Imported using git-ubuntu import. Changelog parent: 77baa7fa7a35db867fca466add82b1cfd85410d1 New changelog entries: * Update the ubuntu-touch hints to try installing ubuntu-system-settings instead of ubuntu-system-settings-online-accounts as this makes the dep resolver more happy on amd64/i386 systems. This should fix the current image build failure for yakkety i386 images. --- debian/changelog | 9 +++++++++ live-build/auto/config | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a617034d..d7e050fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.435) yakkety; urgency=medium + + * Update the ubuntu-touch hints to try installing ubuntu-system-settings + instead of ubuntu-system-settings-online-accounts as this makes the dep + resolver more happy on amd64/i386 systems. This should fix the current + image build failure for yakkety i386 images. + + -- Łukasz 'sil2100' Zemczak Mon, 10 Oct 2016 14:41:46 +0200 + livecd-rootfs (2.434) yakkety; urgency=medium * Update the 00-uid-gid-fix.chroot_early hook for touch to include the new diff --git a/live-build/auto/config b/live-build/auto/config index ee0431de..5ce1339a 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -418,7 +418,7 @@ case $PROJECT in ;; ubuntu-touch|ubuntu-touch-custom) - HINTS="packagekit ubuntu-system-settings-online-accounts" + HINTS="packagekit ubuntu-system-settings" case $ARCH in amd64|i386) HINTS="$HINTS qml-module-ubuntu-components-gles unity8"