[Pkg-kbd-commit] r246 - kbd/trunk/debian

[Anton Zinoviev]

Author: zinoviev
Date: 2007-05-10 11:07:40 +0000 (Thu, 10 May 2007)
New Revision: 246

Modified:
   kbd/trunk/debian/changelog
   kbd/trunk/debian/console-screen.kbd.sh
Log:
kbd(console-screen.kbd.sh): load ACM


Modified: kbd/trunk/debian/changelog
===================================================================
--- kbd/trunk/debian/changelog	2007-05-10 10:29:16 UTC (rev 245)
+++ kbd/trunk/debian/changelog	2007-05-10 11:07:40 UTC (rev 246)
@@ -9,6 +9,7 @@
   * Run unicode_{start,stop} before setfont in the init.d script.  Give a
     font argument to unicode_start so the font doesn't change twice.
     Thanks to Mattia, closes: #421390.
+  * (Re)enable the ACM load in the init.d script.
 
  -- Anton Zinoviev <zinoviev at debian.org>  Thu, 10 May 2007 11:21:53 +0300
 

Modified: kbd/trunk/debian/console-screen.kbd.sh
===================================================================
--- kbd/trunk/debian/console-screen.kbd.sh	2007-05-10 10:29:16 UTC (rev 245)
+++ kbd/trunk/debian/console-screen.kbd.sh	2007-05-10 11:07:40 UTC (rev 246)
@@ -153,28 +153,28 @@
     fi
 
 
-#    # Global ACM
-#    [ "${APP_CHARSET_MAP}" ] && ${CHARSET} G0 ${APP_CHARSET_MAP}
-#
-#
-#    # Per-VC ACMs
-#    PERVC_ACMS="`set | grep "^APP_CHARSET_MAP_vc[0-9]*="  | tr -d \' `"
-#    if [ "${PERVC_ACMS}" ]; then
-#        [ "$VERBOSE" != "no" ] && log_action_begin_msg "Setting up per-VC ACM's"
-#        for acm in ${PERVC_ACMS}
-#        do
-#            # extract VC and FONTNAME info from variable setting
-#            vc=`echo $acm | cut -b19- | cut -d= -f1`
-#            eval acm=\$APP_CHARSET_MAP_vc$vc
-#            if ! ${CHARSET} --tty="${DEVICE_PREFIX}$vc" G0 "$acm"; then
-#                [ "$VERBOSE" != "no" ] && log_action_end_msg 1
-#                break
-#            fi
-#        done
-#        [ "$VERBOSE" != "no" ] && log_action_end_msg 0
-#    fi
+    # Global ACM
+    [ "${APP_CHARSET_MAP}" ] && setfont -m ${APP_CHARSET_MAP}
 
 
+    # Per-VC ACMs
+    PERVC_ACMS="`set | grep "^APP_CHARSET_MAP_vc[0-9]*="  | tr -d \' `"
+    if [ "${PERVC_ACMS}" ]; then
+        [ "$VERBOSE" != "no" ] && log_action_begin_msg "Setting up per-VC ACM's"
+        for acm in ${PERVC_ACMS}
+        do
+            # extract VC and FONTNAME info from variable setting
+            vc=`echo $acm | cut -b19- | cut -d= -f1`
+            eval acm=\$APP_CHARSET_MAP_vc$vc
+            if ! setfont -C "${DEVICE_PREFIX}$vc" -m "$acm"; then
+                [ "$VERBOSE" != "no" ] && log_action_end_msg 1
+                break
+            fi
+        done
+        [ "$VERBOSE" != "no" ] && log_action_end_msg 0
+    fi
+
+
     # screensaver stuff
     setterm_args=""
     if [ "$BLANK_TIME" ]; then