Import patches-unapplied version 2.214 to ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: 095562b3972275e8627033f2f8c475acf9a7f802

New changelog entries:
  * ubuntu-desktop-next: Use the Task fields that the archive now has for this
    project.
This commit is contained in:
Iain Lane 2014-05-28 10:37:36 +01:00 committed by usd-importer
parent 095562b397
commit b62151eae7
2 changed files with 9 additions and 3 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.214) utopic; urgency=medium
* ubuntu-desktop-next: Use the Task fields that the archive now has for this
project.
-- Iain Lane <iain.lane@canonical.com> Wed, 28 May 2014 10:37:36 +0100
livecd-rootfs (2.213) utopic; urgency=medium
* The EXTRA_ARCHIVES environment variable defined in 2.212 doesn't quite

View File

@ -193,10 +193,9 @@ case $PROJECT in
;;
ubuntu-desktop-next)
add_task install minimal standard
add_package install ubuntu-desktop-next
add_task install minimal standard ubuntu-desktop-next ubuntu-sdk-libs
COMPONENTS='main restricted universe'
LIVE_TASK='ubuntu-live'
LIVE_TASK='ubuntu-touch-live'
;;
kubuntu|kubuntu-dvd)