include NMU from Daniel Baumann

debian/changelog

@@ -1,10 +1,18 @@
-desktop-base (5.0.6) UNRELEASED; urgency=low
+desktop-base (5.0.7) UNRELEASED; urgency=low
 
   * debian/control:
     - update kde suggest to kde-standards.                      closes: #548244
 
  -- Yves-Alexis Perez <corsac@debian.org>  Thu, 24 Sep 2009 23:24:03 +0200
 
+desktop-base (5.0.6) unstable; urgency=low
+
+  * Non-maintainer upload with ok from Gustavo.
+  * Not failing if update-grub2 returns non-zero, this unbreaks
+    usage for debian-live (Closes: #467620).
+
+ -- Daniel Baumann <daniel@debian.org>  Fri, 30 Jul 2010 04:46:32 +0200
+
 desktop-base (5.0.5) unstable; urgency=low
 
   * debian/{preinst,postinst}: remove deprecated, unshipped alternatives.

debian/postinst

@@ -53,7 +53,7 @@ if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then
 
     # 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

debian/postrm

@@ -4,7 +4,7 @@
 
 if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
     if which update-grub2 > /dev/null ; then
-        update-grub2
+        update-grub2 || true
     fi
 fi