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

[Anton Zinoviev]

Author: zinoviev
Date: 2007-05-10 10:29:16 +0000 (Thu, 10 May 2007)
New Revision: 245

Modified:
   kbd/trunk/debian/changelog
   kbd/trunk/debian/console-screen.kbd.sh
Log:
kbd(console-screen.kbd.sh): give a font argument to start_unicode


Modified: kbd/trunk/debian/changelog
===================================================================
--- kbd/trunk/debian/changelog	2007-05-10 09:44:15 UTC (rev 244)
+++ kbd/trunk/debian/changelog	2007-05-10 10:29:16 UTC (rev 245)
@@ -6,8 +6,9 @@
     closes: #398439.
   * Search for an installed font in unicode_start since now LatArCyrHeb-16
     may not be installed.
-  * Run unicode_{start,stop} before setfont in the init.d script.  Thanks
-    to Mattia, closes: #421390.
+  * 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.
 
  -- 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 09:44:15 UTC (rev 244)
+++ kbd/trunk/debian/console-screen.kbd.sh	2007-05-10 10:29:16 UTC (rev 245)
@@ -107,7 +107,11 @@
     fi
     for vc in $LIST_CONSOLES
     do
-        $action < ${DEVICE_PREFIX}$vc > ${DEVICE_PREFIX}$vc 2> /dev/null || true
+        if [ "${CONSOLE_FONT}" ]; then
+            $action "${CONSOLE_FONT}" < ${DEVICE_PREFIX}$vc > ${DEVICE_PREFIX}$vc 2> /dev/null || true
+	else
+            $action < ${DEVICE_PREFIX}$vc > ${DEVICE_PREFIX}$vc 2> /dev/null || true
+	fi
     done