* grub.d/05_debian_theme: Enable swirlish beauty.

diff --git a/debian/changelog b/debian/changelog
index 803d24030d0795de7dcb428aba678b5e649c9b3f..e025f9ae5eb6b29be8e4a198924e5f1853c24584 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 grub2 (1.95+20080116-2) unstable; urgency=low
 
+  * grub.d/05_debian_theme: Enable swirlish beauty.
   * rules: Obtain debian/legacy/update-grub dynamicaly from GRUB Legacy svn.
 
- -- Robert Millan <rmh@aybabtu.com>  Wed, 16 Jan 2008 16:42:00 +0100
+ -- Robert Millan <rmh@aybabtu.com>  Sat, 19 Jan 2008 13:16:18 +0100
 
 grub2 (1.95+20080116-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 50cfc631b8808804b755a3dc38e21180a07c840d..3bebdf635253302dddd4c40ba29f00a3c479012b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,8 @@ Architecture: i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}, base-files (>= 4.0.1), debconf
 Provides: grub
 Replaces: pupa, grub, grub2 (<< ${Source-Version})
-Conflicts: pupa, grub
+Conflicts: pupa, grub, desktop-base (= 4.0.5)
+Suggests: desktop-base (>= 4.0.6)
 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 a79f5434cce52e1800536aa4607b436937a5f0c5..47ca499d958fa14c3150a9f940c473e7e1ec6f55 100644 (file)
--- a/debian/grub.d/05_debian_theme
+++ b/debian/grub.d/05_debian_theme
@@ -4,19 +4,19 @@
 source /usr/lib/grub/update-grub_lib
 
 # 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
+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