From 912a490c96760469de24c2d7337ad262463feb33 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Tue, 17 Feb 2015 14:14:44 -0700 Subject: [PATCH] * Rename XUBUNTU_HWE_HINTS to XFCE_HWE_HINTS, so it's more reusable and have MYTHBUNTU, XUBUNTU, and UBUNTUSTUDIO all make use of it. * Explicitly seed the correct notify option for every last flavour. --- debian/changelog | 3 +++ live-build/auto/config | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index ed887ef1..e15a27f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ livecd-rootfs (2.208.5) UNRELEASED; urgency=medium * Explicitly install the xserver-xorg-input-all-lts-utopic package + * Rename XUBUNTU_HWE_HINTS to XFCE_HWE_HINTS, so it's more reusable + and have MYTHBUNTU, XUBUNTU, and UBUNTUSTUDIO all make use of it. + * Explicitly seed the correct notify option for every last flavour. -- Adam Conrad Tue, 17 Feb 2015 13:57:51 -0700 diff --git a/live-build/auto/config b/live-build/auto/config index 630c9ed6..538ae30b 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -197,11 +197,12 @@ SIGNED_KERNEL_PACKAGE="linux-signed-generic-lts-utopic" UNITY_HWE_HINTS="unity-settings-daemon notify-osd libqt4-sql-sqlite unity gnome-terminal" KUBUNTU_HWE_HINTS="pinentry-qt4 kde-baseapps-bin" EDUBUNTU_HWE_HINTS="gnome-session gnome-terminal" -XUBUNTU_HWE_HINTS="lightdm-gtk-greeter unity-settings-daemon- unity-control-center- notification-daemon- libpanel-applet-4-0-" -LUBUNTU_HWE_HINTS="xterm notification-daemon-" +XFCE_HWE_HINTS="lightdm-gtk-greeter unity-settings-daemon- unity-control-center- notification-daemon- libpanel-applet-4-0-" +LUBUNTU_HWE_HINTS="xfce4-notifyd xterm notification-daemon-" UBUNTUGNOME_HWE_HINTS="unity-settings-daemon- unity-control-center- libaccount-plugin-1.0-0-" -MYTHBUNTU_HWE_HINTS="notify-osd $XUBUNTU_HWE_HINTS" -UBUNTUSTUDIO_HWE_HINTS="xfce4-notifyd $XUBUNTU_HWE_HINTS" +XUBUNTU_HWE_HINTS="xfce4-notifyd $XFCE_HWE_HINTS" +MYTHBUNTU_HWE_HINTS="notify-osd $XFCE_HWE_HINTS" +UBUNTUSTUDIO_HWE_HINTS="xfce4-notifyd $XFCE_HWE_HINTS" case $PROJECT in ubuntu|ubuntu-dvd) @@ -329,7 +330,7 @@ case $PROJECT in ;; ubuntustudio-dvd) - add_package install ubuntu-minimal ubuntu-standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-font-meta ubuntustudio-graphics ubuntustudio-video ubuntustudio-publishing ubuntustudio-photography $XUBUNTU_HWE_HINTS + add_package install ubuntu-minimal ubuntu-standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-font-meta ubuntustudio-graphics ubuntustudio-video ubuntustudio-publishing ubuntustudio-photography $UBUNTUSTUDIO_HWE_HINTS add_package install $HWE_X_PACKAGES COMPONENTS='main restricted universe multiverse' case $ARCH in