From: Joachim Wiedorn <ad_debian@joonet.de>
Date: Sun, 2 Jan 2011 23:32:04 +0000 (+0100)
Subject: Update of debconf files for use of new menu bitmaps
X-Git-Tag: debian/23.1-1~14
X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=e82a349fd810b84c91d6c5adb339285d08d50824;p=rrq%2Fmaintain_lilo.git

Update of debconf files for use of new menu bitmaps
---

diff --git a/debian/lilo.postinst b/debian/lilo.postinst
index 11a899f..497398b 100644
--- a/debian/lilo.postinst
+++ b/debian/lilo.postinst
@@ -44,6 +44,7 @@ case "$1" in
 		ln -s debian.bmp /boot/${i}.bmp
 	done
 
+	# remove scripts of old lilo 22.8 if still exist
 	if test -f /etc/kernel/postinst.d/zz-lilo; then
 		rm -f /etc/kernel/postinst.d/zz-lilo; fi
 	if test -f /etc/kernel/postrm.d/zz-lilo; then
diff --git a/debian/lilo.templates b/debian/lilo.templates
index cb6ed22..d4f7159 100644
--- a/debian/lilo.templates
+++ b/debian/lilo.templates
@@ -99,7 +99,7 @@ _Description: WARNING!
 
 Template: liloconfig/select_bitmap
 Type: select
-Choices: /boot/tuxlogo.bmp, /boot/inside.bmp, /boot/debianlilo.bmp, /boot/coffee.bmp, /boot/onlyblue.bmp
+Choices: /boot/tuxlogo.bmp, /boot/inside.bmp, /boot/debian.bmp, /boot/debian-de.bmp, /boot/debianlilo.bmp, /boot/coffee.bmp, /boot/onlyblue.bmp
 Default: /boot/debian.bmp
 _Description: The following is the list of the available bitmaps
 
diff --git a/debian/scripts/liloconfig b/debian/scripts/liloconfig
index 59a6234..ab470bd 100644
--- a/debian/scripts/liloconfig
+++ b/debian/scripts/liloconfig
@@ -299,11 +299,15 @@ sub get_bitmap
     go();
     ($ret,$val) = get("liloconfig/select_bitmap");
     
+	# each line with: [ filename,bmp-color,bmp-table,bmp-timer ]
     @bitmaps = (
-		   [ "/boot/sarge.bmp","1,,0,2,,0","120p,173p,1,15,17","254p,432p,1,0,0" ],
-		   [ "/boot/sid.bmp","1,,0,2,,0","120p,173p,1,15,17","254p,432p,1,0,0" ],
+		   [ "/boot/tuxlogo.bmp","6,9,0;15,9,0","59,5;1,23,","66,28;6,8,0" ],
+		   [ "/boot/inside.bmp","14,11,,15,9,0","21,284p,2,7,175p,4","73,29,12,8,0" ],
+		   [ "/boot/debian.bmp","10,0,,7,0,","16,12,1,12,16","34,28,13,0," ],
+		   [ "/boot/debian-de.bmp","10,0,,7,0,","16,12,1,12,16","34,28,13,0," ],
+		   [ "/boot/debianlilo.bmp","1,,0,9,,0","106p,144p,2,9,144p","514p,144p,6,8,0" ]
 		   [ "/boot/coffee.bmp","12,,11,15,,8","385p,100p,1,10","38,2,13,1" ],
-		   [ "/boot/debianlilo.bmp","1,,0;9,,0","106p,144p,2,9,144p","514p,144p,6,8,0" ]
+		   [ "/boot/onlyblue.bmp","7,,0,15,,0","3,4,4,26,19,1","37,2,7,4,0" ],
 		   );
 
     $counter = 0;