merge lp:~jr/livecd-rootfs/kubuntu-quantal

This commit is contained in:
Colin Watson 2012-06-11 12:49:54 +01:00
commit 8237b75b1f
2 changed files with 8 additions and 0 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.66) UNRELEASED; urgency=low
[ Jonathan Riddell ]
* Build Kubuntu from universe.
-- Colin Watson <cjwatson@ubuntu.com> Mon, 11 Jun 2012 12:49:27 +0100
livecd-rootfs (2.65) precise; urgency=low
* Add (extra-)override parsing to the preinstalled pool to make sure

View File

@ -132,6 +132,7 @@ case $PROJECT in
kubuntu|kubuntu-dvd)
add_task install minimal standard kubuntu-desktop
LIVE_TASK='kubuntu-live'
COMPONENTS='main restricted universe'
;;
kubuntu-active)