Switch from spacefun back to the generic (klowner) boot image.

This Closes: #650979 because the syslinux menu is given more room on
the screen. I also added a warning to avoid that bug being re-introduced.

build/boot/common/pics/spacefun.README

@@ -1,2 +0,0 @@
-Based on http://svn.debianart.org/themes/spacefun/ rev 64
-Copyright (C) Valessio S Brito  - Licensed in GPLv2

build/boot/x86/dtmenu.cfg

@@ -1,9 +1,9 @@
-menu hshift 11
+menu hshift 9
 menu width 58
 
 menu begin desktop
     include ${SYSDIR}stdmenu.cfg
-    menu hshift 15
+    menu hshift 13
     menu width 49
     menu label Alternative desktop environments
     menu title Desktop environment menu

build/boot/x86/menu.cfg

@@ -1,4 +1,4 @@
-menu hshift 9
+menu hshift 13
 menu width 60
 
 menu title Debian GNU/Linux installer boot menu${BEEP}

build/boot/x86/stdmenu.cfg

@@ -5,7 +5,10 @@ menu color sel		* #ffffffff #76a1d0ff *
 menu color hotsel	1;7;37;40 #ffffffff #76a1d0ff *
 menu color tabmsg	* #ffffffff #00000000 *
 menu color help		37;40 #ffdddd00 #00000000 none
-menu vshift 17
+# XXX When adjusting vshift, take care that rows is set to a small
+# enough value so any possible menu will fit on the screen,
+# rather than falling off the bottom.
+menu vshift 12
 menu rows 10
 menu helpmsgrow 15
 # The command line must be at least one line from the bottom.

build/config/hurd.cfg

@@ -20,7 +20,7 @@ define genext2fs
 endef
 
 # The image to use for a syslinux splash screen.
-SPLASH_PNG=boot/common/pics/spacefun-grub.png
+SPLASH_PNG=boot/hurd/pics/klowner-hurd.png
 
 # The font to load in GRUB
 GRUB_FONT=/usr/share/grub/ascii.pf2

build/config/kfreebsd.cfg

@@ -2,7 +2,7 @@
 INITRD_FS = ufs1
 
 # The image to use for a syslinux splash screen.
-SPLASH_PNG=boot/common/pics/spacefun-grub.png
+SPLASH_PNG=boot/kfreebsd/pics/klowner-kbsd.png
 
 # The font to load in GRUB
 GRUB_FONT=/usr/share/grub/ascii.pf2

build/config/x86.cfg

@@ -11,7 +11,7 @@ DOS_VOLUME_ID = deb00001
 DOS_VOLUME_LABEL = "Debian Inst"
 
 # The image to use for a syslinux splash screen.
-SPLASH_PNG=boot/common/pics/spacefun-isolinux.png
+SPLASH_PNG=boot/x86/pics/klowner.png
 
 # The directory boot screens for syslinux will go in.
 BOOT_SCREEN_DIR = 

debian/changelog

@@ -154,6 +154,8 @@ debian-installer (2011xxxx) UNRELEASED; urgency=low
 
   [ Joey Hess ]
   * Add SHA256SUMS file like MD5SUMS file. (See #622941)
+  * Switch from spacefun back to the generic (klowner) boot image.
+    Closes: #650979
 
   [ Robert Millan ]
   * Enable gtk in kfreebsd-amd64 cdrom builds.