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.
This commit is contained in:
Łukasz 'sil2100' Zemczak 2016-10-10 14:41:46 +02:00 committed by usd-importer
parent 77baa7fa7a
commit b477837c31
2 changed files with 10 additions and 1 deletions

9
debian/changelog vendored
View File

@ -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 <lukasz.zemczak@ubuntu.com> 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

View File

@ -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"