Import patches-unapplied version 2.48 to ubuntu/precise

Imported using git-ubuntu import.

Changelog parent: 4e1df5e183e64968dc473138373ad34dcd1961fc

New changelog entries:
  * Fix sense of live/preinstalled change in 2.46; add the live task for
    non-preinstalled images, rather than only for preinstalled images.
This commit is contained in:
Colin Watson 2012-01-10 12:41:36 +00:00 committed by usd-importer
parent 4e1df5e183
commit ca831414fd
2 changed files with 8 additions and 1 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.48) precise; urgency=low
* Fix sense of live/preinstalled change in 2.46; add the live task for
non-preinstalled images, rather than only for preinstalled images.
-- Colin Watson <cjwatson@ubuntu.com> Tue, 10 Jan 2012 12:41:36 +0000
livecd-rootfs (2.47) precise; urgency=low
* put ti-omap4-ppa into omap4 images

View File

@ -187,7 +187,7 @@ case $PROJECT in
;;
esac
if [ "$PREINSTALLED" = "true" ]; then
if [ "$PREINSTALLED" != "true" ]; then
add_task live "$LIVE_TASK"
fi