diff --git a/debian/changelog b/debian/changelog index c267a56d..607f17ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ livecd-rootfs (2.208.4) UNRELEASED; urgency=medium * Revert lubuntu to using tasks for minimal and standard, since their unique snowflake apt --no-install-recommends setup breaks switching * Add XUBUNTU_HWE_HINTS and populate to work around task->meta change + * Add UBUNTUGNOME_HWE_HINTS and populate it skip using unity packages + * Add LUBUNTU_HWE_HINTS and populate to work around task->meta change -- Adam Conrad Wed, 04 Feb 2015 04:42:54 -0700 diff --git a/live-build/auto/config b/live-build/auto/config index b53c2d5e..452f9303 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -197,7 +197,9 @@ SIGNED_KERNEL_PACKAGE="linux-signed-generic-lts-utopic" UNITY_HWE_HINTS="unity-settings-daemon notify-osd libqt4-sql-sqlite unity" KUBUNTU_HWE_HINTS="pinentry-qt4 kde-baseapps-bin" EDUBUNTU_HWE_HINTS="gnome-session gnome-terminal" -XUBUNTU_HWE_HINTS="lightdm-gtk-greeter unity-settings-daemon-" +XUBUNTU_HWE_HINTS="lightdm-gtk-greeter unity-settings-daemon- notification-daemon-" +LUBUNTU_HWE_HINTS="xterm notification-daemon-" +UBUNTUGNOME_HWE_HINTS="unity-settings-daemon- unity-control-center- libaccount-plugin-1.0-0-" case $PROJECT in ubuntu|ubuntu-dvd) @@ -299,7 +301,7 @@ case $PROJECT in lubuntu) add_task install minimal standard - add_package install lubuntu-desktop + add_package install lubuntu-desktop $LUBUNTU_HWE_HINTS add_package install $HWE_X_PACKAGES LIVE_TASK='lubuntu-live' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' @@ -314,7 +316,7 @@ case $PROJECT in ;; ubuntu-gnome) - add_package install ubuntu-minimal ubuntu-standard ubuntu-gnome-desktop + add_package install ubuntu-minimal ubuntu-standard ubuntu-gnome-desktop $UBUNTUGNOME_HWE_HINTS add_package install $HWE_X_PACKAGES LIVE_TASK='ubuntu-gnome-live' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'