[Pkg-kbd-devel] Switching d-i to kbd for squeeze?

[Colin Watson]

On Wed, Jan 28, 2009 at 01:59:59PM -0200, Otavio Salvador wrote:
> Colin Watson <cjwatson at debian.org> writes:
> > If there's consensus, I can commit the relevant fixes.
> 
> It would be great if you could send the patches to mailing list to
> people have a look on them before pushing but the concept is logical
> and has really good basis to work.

Index: localechooser/finish-install
===================================================================
--- localechooser/finish-install	(revision 57427)
+++ localechooser/finish-install	(working copy)
@@ -40,28 +40,8 @@
 case "$consoletype" in
     kbd)
 	consolefont=$(echo $RET | sed -e 's/^kbd=//')
-	if apt-install console-tools; then
-		ctconfig=/target/etc/console-tools/config
-		acm=$(echo $consolefont | sed -e 's/.*(//' -e 's/).*//')
-		[ "$acm" = utf8 ] && acm=
-		# A few workarounds of console-tools limitations below
-		# APP_CHARSET_MAP and console fonts are not set
-		# for all consoles. These workarounds should probably
-		# be removed when we switch to kbd
-		# FIXME: why 1-6 for APP_CHARSET_MAP but 2-6 for SCREEN_FONT?
-		if [ -n "$acm" ]; then
-			echo "APP_CHARSET_MAP=$acm" >>$ctconfig
-			for i in 1 2 3 4 5 6; do
-				echo "APP_CHARSET_MAP_vc$i=$acm" >>$ctconfig
-			done
-		fi
+	if apt-install kbd; then
 		consolefont=$(echo $consolefont | sed -e 's/(.*//')
-		if [ -n "$consolefont" ]; then
-			echo "SCREEN_FONT=$consolefont" >>$ctconfig
-			for i in 2 3 4 5 6; do
-				echo "SCREEN_FONT_vc$i=$consolefont" >>$ctconfig
-			done
-		fi
 		if echo "$consolefont" | grep -q "Terminus"; then
 			apt-install console-terminus || true
 		fi
Index: kbd-chooser/debian/post-base-installer
===================================================================
--- kbd-chooser/debian/post-base-installer	(revision 57427)
+++ kbd-chooser/debian/post-base-installer	(working copy)
@@ -13,7 +13,7 @@
 echo "console-data console-data/keymap/policy select Don't touch keymap" | \
 	LANG=C chroot /target debconf-set-selections
 
-apt-install console-tools console-data console-common || true
+apt-install kbd console-data console-common || true
 
 db_get debian-installer/keymap
 KEYMAP=$RET

-- 
Colin Watson                                       [cjwatson at debian.org]