Import patches-unapplied version 2.61 to ubuntu/precise

Imported using git-ubuntu import.

Changelog parent: 8b2dd1fb8b465928387d1ab21e24ae46f8ba81a2

New changelog entries:
  [ Colin Watson ]
  * Use lowlatency for Ubuntu Studio amd64, since lowlatency-pae is
    i386-specific (LP: #959011).
  [ Julien Lavergne ]
  * Use generic (non-PAE) kernel for Lubuntu (LP: #958866).
This commit is contained in:
Colin Watson 2012-03-19 12:53:13 +00:00 committed by usd-importer
parent 8b2dd1fb8b
commit ad94ccd39b
2 changed files with 16 additions and 1 deletions

11
debian/changelog vendored
View File

@ -1,3 +1,14 @@
livecd-rootfs (2.61) precise; urgency=low
[ Colin Watson ]
* Use lowlatency for Ubuntu Studio amd64, since lowlatency-pae is
i386-specific (LP: #959011).
[ Julien Lavergne ]
* Use generic (non-PAE) kernel for Lubuntu (LP: #958866).
-- Colin Watson <cjwatson@ubuntu.com> Mon, 19 Mar 2012 12:53:13 +0000
livecd-rootfs (2.60) precise; urgency=low
* Use generic (non-PAE) kernel for Xubuntu (LP: #955009).

View File

@ -164,6 +164,7 @@ case $PROJECT in
add_task install minimal standard lubuntu-desktop
LIVE_TASK='lubuntu-live'
COMPONENTS='main restricted universe multiverse'
KERNEL_FLAVOURS=generic
# The Lubuntu STRUCTURE file has "feature
# no-follow-recommends". Mirror this.
@ -173,7 +174,10 @@ case $PROJECT in
ubuntustudio-dvd)
add_task install ubuntustudio-desktop ubuntustudio-generation ubuntustudio-recording ubuntustudio-font-meta ubuntustudio-graphics ubuntustudio-audio-plugins ubuntustudio-video
COMPONENTS='main restricted universe multiverse'
KERNEL_FLAVOURS=lowlatency-pae
case $ARCH in
i386) KERNEL_FLAVOURS=lowlatency-pae ;;
amd64) KERNEL_FLAVOURS=lowlatency ;;
esac
;;
base)