From 19245e5f5fc20927ca3913964dfef7629c9bcdcc Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 9 Mar 2011 13:51:11 +0100
Subject: [PATCH] Import patches-unapplied version 1.161 to ubuntu/natty
Imported using git-ubuntu import.
Changelog parent: 78d0c0677b9dc7b3ba521288bed42fcef100f103
New changelog entries:
* add ubuntu-headless as allowed flavour to BuildLiveCD
---
BuildLiveCD | 2 +-
debian/changelog | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/BuildLiveCD b/BuildLiveCD
index 9e6db297..fbb9a275 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -82,7 +82,7 @@ esac
for arg in "$@"; do
case "$arg" in
- *ubuntu|*ubuntu-dvd|kubuntu-mobile|kubuntu-netbook|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook|ubuntu-moblin-remix|mythbuntu|base|tocd) ;;
+ *ubuntu|*ubuntu-dvd|kubuntu-mobile|kubuntu-netbook|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook|ubuntu-moblin-remix|mythbuntu|base|tocd|ubuntu-headless) ;;
*)
echo "bad project: $arg" >&2
exit 2
diff --git a/debian/changelog b/debian/changelog
index 0e0d9dd3..88915bef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (1.161) natty; urgency=low
+
+ * add ubuntu-headless as allowed flavour to BuildLiveCD
+
+ -- Oliver Grawert <ogra@ubuntu.com> Wed, 09 Mar 2011 13:51:11 +0100
+
livecd-rootfs (1.160) natty; urgency=critical
* Emergency hack to remove ubiquity-slideshow-* on armel due to python-webkit