From 7fd846a27f960f308d8446ddb03edcf6aab33790 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 27 Feb 2008 06:54:12 +0000
Subject: [PATCH] Import patches-unapplied version 0.54 to ubuntu/hardy

Imported using git-ubuntu import.

Changelog parent: 549bfa3fe6ce8620ed14daf7d469a971ab76f6a2

New changelog entries:
  * Run /etc/cron.daily/mlocate rather than /etc/cron.daily/slocate.
---
 debian/changelog   |  6 ++++++
 livecd-rootfs.diff | 50 ----------------------------------------------
 livecd.sh          |  2 +-
 3 files changed, 7 insertions(+), 51 deletions(-)
 delete mode 100644 livecd-rootfs.diff

diff --git a/debian/changelog b/debian/changelog
index bbdfcf4a..55310caa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (0.54) hardy; urgency=low
+
+  * Run /etc/cron.daily/mlocate rather than /etc/cron.daily/slocate.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 27 Feb 2008 06:54:12 +0000
+
 livecd-rootfs (0.53) hardy; urgency=low
 
   * Set kubuntu-kde4 to universe
diff --git a/livecd-rootfs.diff b/livecd-rootfs.diff
deleted file mode 100644
index 91a946a7..00000000
--- a/livecd-rootfs.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-=== modified file 'BuildLiveCD'
---- BuildLiveCD	2007-08-03 14:10:49 +0000
-+++ BuildLiveCD	2008-02-13 14:26:41 +0000
-@@ -55,9 +55,9 @@
-     echo "No valid suites to build for" >&2 && exit 1
- fi
- if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
--    set -- ubuntu kubuntu edubuntu xubuntu base
-+    set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu base
-     if [ "$ARCH" = "i386" ]; then
--        set -- ubuntu ubuntu-lpia kubuntu edubuntu xubuntu base
-+        set -- ubuntu ubuntu-lpia kubuntu kubuntu-kde4 edubuntu xubuntu base
-     fi
- fi
- 
-
-=== modified file 'livecd.sh'
---- livecd.sh	2008-01-31 17:22:01 +0000
-+++ livecd.sh	2008-02-13 14:30:01 +0000
-@@ -129,15 +129,15 @@
- shift $((OPTIND-1))
- 
- if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
--    set -- ubuntu kubuntu edubuntu xubuntu gobuntu base
-+    set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu gobuntu base
-     if [ "$ARCH" = "i386" ]; then
--        set -- ubuntu ubuntu-lpia kubuntu edubuntu xubuntu gobuntu base
-+        set -- ubuntu ubuntu-lpia kubuntu kubuntu-kde4 edubuntu xubuntu gobuntu base
-     fi
- fi
- 
- for arg in "$@"; do
-     case "$arg" in
--	ubuntu|ubuntu-lpia|edubuntu|kubuntu|xubuntu|gobuntu|base|tocd)
-+	ubuntu|ubuntu-lpia|edubuntu|kubuntu|kubuntu-kde4|xubuntu|gobuntu|base|tocd)
- 	    ;;
- 	*)
- 	    echo bad name >&2;
-@@ -177,6 +177,10 @@
- 	    LIST="$LIST minimal^ standard^ kubuntu-desktop^"
- 	    LIVELIST="kubuntu-live^ xresprobe laptop-detect casper lupin-casper"
- 	    ;;
-+	kubuntu-kde4)
-+	    LIST="$LIST minimal^ standard^ kubuntu-kde4-desktop^"
-+	    LIVELIST="kubuntu-kde4-live^ xresprobe laptop-detect casper lupin-casper"
-+	    ;;
- 	edubuntu)
- 	    LIST="$LIST minimal^ standard^ edubuntu-desktop^"
- 	    LIVELIST="edubuntu-live^ xresprobe laptop-detect casper lupin-casper"
-
diff --git a/livecd.sh b/livecd.sh
index bdba8024..d7622bff 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -335,7 +335,7 @@ link_in_boot = $link_in_boot
 	> livecd.${FSS}.manifest
     kill_users
 
-    chroot $ROOT /etc/cron.daily/slocate || true
+    chroot $ROOT /etc/cron.daily/mlocate || true
     chroot $ROOT /etc/cron.daily/man-db	|| true
 
     # remove our diversions