Merging casper 1.114.

grml · Feb 26, 2008 · dd7c11b · dd7c11b
1 parent 29cdb74
commit dd7c11b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git 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@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
@@ -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