Import patches-unapplied version 2.39 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: bca9a9473772aa381dac14072a17806270cb1f23

New changelog entries:
  * Explicitely select the oem-config frontend to install on a
    per-project basis, to match the ubiquity in use (LP: #820514)
This commit is contained in:
Adam Conrad 2011-09-26 19:14:56 -06:00 committed by usd-importer
parent bca9a94737
commit 3b9da43910
2 changed files with 18 additions and 1 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.39) oneiric; urgency=low
* Explicitely select the oem-config frontend to install on a
per-project basis, to match the ubiquity in use (LP: #820514)
-- Adam Conrad <adconrad@ubuntu.com> Mon, 26 Sep 2011 19:14:56 -0600
livecd-rootfs (2.38) oneiric; urgency=low
* Add main, restricted, universe, and multiverse to the sources.list

View File

@ -77,7 +77,17 @@ case $IMAGEFORMAT in
COMPONENTS='main restricted universe multiverse'
;;
*)
add_package live jasper
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
;;
esac
;;