Disable background stuff untill desktop-base is fixed.

diff --git a/debian/changelog b/debian/changelog
index 2e29e06e5c699601c9dc8cebae09c9dcc2a877a8..3c078adecb881dbba03d02194ea618930f7c19d6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,6 @@ grub2 (1.95+20080114-1) unstable; urgency=low
     it is found, of course).
   * control: Reorganize a bit, including a complete rewrite of the
     package descriptions.
-  * grub.d/05_debian_theme: Start using the new background provided by
-    desktop-base.
 
  -- Robert Millan <rmh@aybabtu.com>  Mon, 14 Jan 2008 13:12:16 +0100
 

diff --git a/debian/control b/debian/control
index 90022da3a9218cb9ec5d787ad7f44f9c82e6674f..e99ca13620972dd3d6e65a8cc8bd79e9c9584d63 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, base-files (>= 4.0.1), debconf
 Provides: grub
 Replaces: pupa, grub, grub2 (<< ${Source-Version})
 Conflicts: pupa, grub
-Suggests: desktop-base (>= 4.0.5)
 Description: GRand Unified Bootloader, version 2 (PC/BIOS version)
  GRUB is a portable, powerful bootloader.  This version of GRUB is based on a
  cleaner design than its predecessors, and provides the following new features:

diff --git a/debian/grub.d/05_debian_theme b/debian/grub.d/05_debian_theme
index 60885bfe4915e18c1f403e620292a6d41865b479..a79f5434cce52e1800536aa4607b436937a5f0c5 100644 (file)
--- a/debian/grub.d/05_debian_theme
+++ b/debian/grub.d/05_debian_theme
@@ -3,19 +3,20 @@
 # for convert_system_path_to_grub_path()
 source /usr/lib/grub/update-grub_lib
 
-if [ "$GRUB_TERMINAL" = "gfxterm" ] \
-    && bg=`convert_system_path_to_grub_path /usr/share/images/desktop-base/debian-blueish-wallpaper-640x480.tga` ; then
-  echo "Found Debian background: `basename ${bg}`" >&2
-  cat << EOF
-insmod tga
-background_image ${bg}
-set color_normal=black/black
-set color_highlight=magenta/black
-EOF
-else
+# Disabled due to bug in desktop-base 4.0.5 - pending to reenable
+#if [ "$GRUB_TERMINAL" = "gfxterm" ] \
+#    && bg=`convert_system_path_to_grub_path /usr/share/images/desktop-base/debian-blueish-wallpaper-640x480.tga` ; then
+#  echo "Found Debian background: `basename ${bg}`" >&2
+#  cat << EOF
+#insmod tga
+#background_image ${bg}
+#set color_normal=black/black
+#set color_highlight=magenta/black
+#EOF
+#else
   # set the traditional Debian blue theme
   cat << EOF
 set menu_color_normal=cyan/blue
 set menu_color_highlight=white/blue
 EOF
-fi
+#fi