From 219d69bc3dc366deb01f24c4ba8f38f03cf30852 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 22 Jul 2012 23:45:21 +0100 Subject: [PATCH] Import patches-unapplied version 2.70 to ubuntu/quantal Imported using git-ubuntu import. Changelog parent: 47a714ebc2ce98f13b4ab6f378f2c2111684b697 New changelog entries: * live-build/auto/config: Don't install lupin-casper on ubuntu-server images. --- debian/changelog | 7 +++++++ live-build/auto/config | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2dd9630c..1709a72e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.70) quantal; urgency=low + + * live-build/auto/config: Don't install lupin-casper on ubuntu-server + images. + + -- Colin Watson Sun, 22 Jul 2012 23:45:21 +0100 + livecd-rootfs (2.69) quantal; urgency=low * live-build/auto/config: Add server task to ubuntu-server images. diff --git a/live-build/auto/config b/live-build/auto/config index fb15754c..8cf7ef87 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -90,7 +90,9 @@ case $IMAGEFORMAT in ;; *) - add_package live lupin-casper + if [ "$PROJECT" != ubuntu-server ]; then + add_package live lupin-casper + fi ;; esac