Merging casper 1.184.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 6ca09dc..b06678d 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,18 @@
+casper (1.184) karmic; urgency=low
+
+  [ Evan Dandrea ]
+  * Apply the Ubuntu release version to the installer menu entries as well
+    (LP: #406187).
+
+  [ Colin Watson ]
+  * Fix disabling of apt-check (LP: #406191).
+
+  [ Steve Kowalik ]
+  * Remove the UNR ubiquity .desktop hack in 10adduser.
+  * Set ubiquity as a UNR Favourite in 47unr-ubiquity.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Fri, 07 Aug 2009 23:11:58 +0100
+
 casper (1.183) karmic; urgency=low
 
   * Remove erroneous /root prefix on the ubiquity desktop files in

diff --git a/scripts/live-bottom/31disable_update_notifier b/scripts/live-bottom/31disable_update_notifier
index e363049..0edf189 100755 (executable)
--- a/scripts/live-bottom/31disable_update_notifier
+++ b/scripts/live-bottom/31disable_update_notifier
@@ -39,7 +39,7 @@ chroot /root dpkg-divert --add --rename --quiet \
 
 if [ -e /root/usr/lib/update-notifier/apt-check ]
 then
-       ln -s /bin/true /root/usr/lib/update-notifier/apt-check
+       ln -sf /bin/true /root/usr/lib/update-notifier/apt-check
 fi
 
 # For KDE, adept_notifier's only useful function at the moment is an