[SCM] debian-live/live-initramfs branch, master, updated. 1.110.7-1-19-gbab3bf7

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 34d1064f9cbbe6147b976be67ab02e24bcd21122
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Feb 26 12:23:49 2008 +0100

    Merging casper 1.114.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 9b80ec8..499113e 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,13 @@
+casper (1.114) hardy; urgency=low
+
+  * casper-md5check: Close md5_file before exiting.
+  * Disable tracker-applet as well as trackerd, otherwise the former starts
+    the latter.
+  * casper-snapshot: Fix argument parsing (thanks, Tormod Volden;
+    LP: #179411).
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Tue, 15 Jan 2008 18:25:21 +0000
+
 casper (1.113) hardy; urgency=low
 
   [ Tollef Fog Heen ]
diff --git a/scripts/live-bottom/36disable_trackerd b/scripts/live-bottom/36disable_trackerd
index 24a43d8..62ad1df 100755
--- a/scripts/live-bottom/36disable_trackerd
+++ b/scripts/live-bottom/36disable_trackerd
@@ -31,7 +31,8 @@ log_begin_msg "Disabling trackerd..."
 
 # live-initramfs script
 
-rm -f /root/etc/xdg/autostart/trackerd.desktop \
-      /root/usr/share/autostart/trackerd.desktop
+rm -f /root/etc/xdg/autostart/tracker-applet.desktop \
+	/root/etc/xdg/autostart/trackerd.desktop \
+	/root/usr/share/autostart/trackerd.desktop
 
 log_end_msg

-- 
debian-live/live-initramfs