From b7ccefc67f2cdaf0b80d0785a2a1de2fd0128075 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 15 Jan 2013 17:28:43 +0000 Subject: [PATCH] * live-build/auto/config: - Add some manual hints to work around slightly different dependency resolution for metapackages vs. tasks. --- debian/changelog | 8 ++++++++ live-build/auto/config | 10 ++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c8c20f3b..3d2edc6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.65.8) UNRELEASED; urgency=low + + * live-build/auto/config: + - Add some manual hints to work around slightly different dependency + resolution for metapackages vs. tasks. + + -- Colin Watson Tue, 15 Jan 2013 17:27:59 +0000 + livecd-rootfs (2.65.7) precise; urgency=low * live-build/auto/config: Build Ubuntu and Edubuntu images with X diff --git a/live-build/auto/config b/live-build/auto/config index 1eb49acc..0f78b6b9 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -130,7 +130,10 @@ case $PROJECT in # We have to use metapackages rather than # tasks, so that the X enablement stack can # be used rather than the normal stack. - add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop + # This changes dependency resolution + # sufficiently that some manual hints are + # needed. + add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop libqt4-sql-sqlite notify-osd add_package install xserver-xorg-lts-quantal ;; *) @@ -169,7 +172,10 @@ case $PROJECT in # We have to use metapackages rather than # tasks, so that the X enablement stack can # be used rather than the normal stack. - add_package install ubuntu-minimal ubuntu-standard edubuntu-desktop + # This changes dependency resolution + # sufficiently that some manual hints are + # needed. + add_package install ubuntu-minimal ubuntu-standard edubuntu-desktop libqt4-sql-sqlite notify-osd add_package install xserver-xorg-lts-quantal ;; *)