Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-22 02:41:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix oem-config-remove on ac100

Browse Source
This commit is contained in:
Adam Conrad 2011-09-28 15:29:01 -06:00
parent be43abb06f
commit 7ba25854b4
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.40) oneiric; urgency=low
* Revert the previous change and apply it for all $PREINSTALLED
targets instead of just ext2|ext3|ext4, so ac100 gets the fix.
-- Adam Conrad <adconrad@ubuntu.com> Wed, 28 Sep 2011 15:20:38 -0600
livecd-rootfs (2.39) oneiric; urgency=low
* Explicitely select the oem-config frontend to install on a

28
live-build/auto/config
View File

@ -77,17 +77,7 @@ case $IMAGEFORMAT in
COMPONENTS='main restricted universe multiverse'
;;
*)
case $PROJECT in
kubuntu*)
add_package live jasper oem-config-kde
;;
ubuntu-server)
add_package live jasper oem-config-debconf
;;
*)
add_package live jasper oem-config-gtk
;;
esac
add_package live jasper
;;
esac
;;
@ -102,6 +92,22 @@ case $IMAGEFORMAT in
;;
esac
if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
case $PROJECT in
kubuntu*)
add_package live oem-config-kde
;;
ubuntu-server)
add_package live oem-config-debconf
;;
ubuntu-core|base)
;;
*)
add_package live oem-config-gtk
;;
esac
fi
case $BINARYFORMAT in
iso*|usb*)
BINARY_IMAGES="$BINARYFORMAT"