From a9ab5cb2f4f7ae5839ca8d05eecd886f705d3713 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 11 Oct 2013 18:27:58 +0200 Subject: [PATCH] Import patches-unapplied version 2.195 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: eaa83595efbbdf3b85424a8feadace47d5207f35 New changelog entries: * fix the prefixing of click packages in manifest files --- debian/changelog | 6 ++++++ live-build/auto/build | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0d4c6826..ba9a8a97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.195) saucy; urgency=low + + * fix the prefixing of click packages in manifest files + + -- Oliver Grawert Fri, 11 Oct 2013 18:27:58 +0200 + livecd-rootfs (2.194) saucy; urgency=low * prefix click packages in the manifest file with "click:" diff --git a/live-build/auto/build b/live-build/auto/build index 38468e4b..88133d05 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -419,9 +419,9 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then lb chroot_devpts install "$@" if [ -e "$PREFIX.manifest" ]; then - for line in read; do + Chroot chroot "click list" | while read line; do echo "click:$line" >>"$PREFIX.manifest" - done <"$(Chroot chroot "click list")" + done fi if [ -e chroot/etc/resolv.conf ]; then