diff -Naurp desktop-base.orig/debian/changelog desktop-base/debian/changelog
--- desktop-base.orig/debian/changelog	2009-02-27 07:45:13.000000000 +0000
+++ desktop-base/debian/changelog	2010-07-30 04:58:05.035942540 +0000
@@ -1,3 +1,11 @@
+desktop-base (5.0.5+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Not failing if update-grub2 returns non-zero, this unbreaks
+    usage for debian-live (Closes: #467620).
+
+ -- Daniel Baumann <user@debian>  Fri, 30 Jul 2010 04:46:32 +0200
+
 desktop-base (5.0.5) unstable; urgency=low
 
   * debian/{preinst,postinst}: remove deprecated, unshipped alternatives.
diff -Naurp desktop-base.orig/debian/postinst desktop-base/debian/postinst
--- desktop-base.orig/debian/postinst	2009-02-27 07:44:50.000000000 +0000
+++ desktop-base/debian/postinst	2010-07-30 04:38:57.528010178 +0000
@@ -53,7 +53,7 @@ if [ "$1" = "configure" -o "$1" = "abort
 
     # GRUB background
     if which update-grub2 > /dev/null ; then
-        update-grub2
+        update-grub2 || true
     fi
 
     if [ -x /sbin/splashy_config ] && [ -w /etc/splashy/config.xml ]; then
diff -Naurp desktop-base.orig/debian/postrm desktop-base/debian/postrm
--- desktop-base.orig/debian/postrm	2008-10-23 22:30:27.000000000 +0000
+++ desktop-base/debian/postrm	2010-07-30 04:39:03.012941172 +0000
@@ -4,7 +4,7 @@
 
 if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
     if which update-grub2 > /dev/null ; then
-        update-grub2
+        update-grub2 || true
     fi
 fi
 
