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

[Anton Zinoviev]

Author: zinoviev
Date: 2007-05-10 12:48:34 +0000 (Thu, 10 May 2007)
New Revision: 248

Modified:
   kbd/trunk/debian/changelog
   kbd/trunk/debian/console-screen.kbd.sh
Log:
kbd(console-screen.kbd.sh): use consisten variables in /etc/kbd/config


Modified: kbd/trunk/debian/changelog
===================================================================
--- kbd/trunk/debian/changelog	2007-05-10 12:33:40 UTC (rev 247)
+++ kbd/trunk/debian/changelog	2007-05-10 12:48:34 UTC (rev 248)
@@ -12,7 +12,9 @@
       closes: #421390;
     - fix the per-VC font load;
     - (re)enable the per-VC ACM load;
-    - do not run unicode_start for consoles with defined APP_CHARSET_MAP_vcN;
+    - for consistency use CONSOLE_MAP_vcN instead of APP_CHARSET_MAP_vcN
+      and FONT_MAP_vcN instead of CONSOLE_MAP_vcN;
+    - do not run unicode_start for consoles with defined CONSOLE_MAP_vcN;
     - do not use static paths such as /usr/bin/setfont.
   
  -- 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 12:33:40 UTC (rev 247)
+++ kbd/trunk/debian/console-screen.kbd.sh	2007-05-10 12:48:34 UTC (rev 248)
@@ -98,7 +98,7 @@
     CHARMAP=`LANG=$LANG LC_ALL=$LC_ALL LC_CTYPE=$LC_CTYPE locale charmap 2>/dev/null`
     for vc in $LIST_CONSOLES
     do
-        if [ "$CHARMAP" = "UTF-8" -a -z "$(eval echo \$APP_CHARSET_MAP_vc$vc)" ]; then
+        if [ "$CHARMAP" = "UTF-8" -a -z "$(eval echo \$CONSOLE_MAP_vc$vc)" ]; then
 	    action=unicode_start
 	else
 	    action=unicode_stop
@@ -138,7 +138,7 @@
             vc=`echo $font | cut -b16- | cut -d= -f1`
             eval font=\$CONSOLE_FONT_vc$vc
             # eventually find an associated SFM
-            eval sfm=\${CONSOLE_MAP_vc${vc}}
+            eval sfm=\${FONT_MAP_vc${vc}}
             [ "$sfm" ] && sfm="-u $sfm"
             if ! setfont -C ${DEVICE_PREFIX}$vc ${SETFONT_OPT} $sfm $font; then
                 [ "$VERBOSE" != "no" ] && log_action_end_msg 1
@@ -149,19 +149,15 @@
     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 \' `"
+     PERVC_ACMS="`set | grep "^CONSOLE_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 ACM_FONTNAME info from variable setting
              vc=`echo $acm | cut -b19- | cut -d= -f1`
-             eval acm=\$APP_CHARSET_MAP_vc$vc
+             eval acm=\$CONSOLE_MAP_vc$vc
              if ! setfont -C "${DEVICE_PREFIX}$vc" -m "$acm"; then
                  [ "$VERBOSE" != "no" ] && log_action_end_msg 1
                  break