From be4edfdb133694d00a0b80cf77184940dae2843f Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 15 Oct 2014 21:07:38 +0100 Subject: [PATCH] Import patches-unapplied version 2.257 to ubuntu/utopic-proposed Imported using git-ubuntu import. Changelog parent: 44705028bfe4995ae21b2a3a02829971f3e4a705 New changelog entries: * Drop the click packages moved in 2.255 from the rootfs, leaving them only in the custom tarball. --- debian/changelog | 7 +++++++ live-build/ubuntu-touch/hooks/60-install-click.chroot | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 05cfde04..6b3a64dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.257) utopic; urgency=medium + + * Drop the click packages moved in 2.255 from the rootfs, leaving them + only in the custom tarball. + + -- Colin Watson Wed, 15 Oct 2014 21:07:38 +0100 + livecd-rootfs (2.256) utopic; urgency=medium * Fix directory layout of custom tarball. diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot index d8be455b..f166eabd 100755 --- a/live-build/ubuntu-touch/hooks/60-install-click.chroot +++ b/live-build/ubuntu-touch/hooks/60-install-click.chroot @@ -41,7 +41,7 @@ do com.ubuntu.reminders_*|\ com.ubuntu.sudoku_*|\ com.ubuntu.terminal_*) - roots="$click_db $click_db_custom" + roots="$click_db_custom" ;; *) roots="$click_db"