[Pkg-kbd-commit] r244 - in kbd/trunk/debian: . patches

[Anton Zinoviev]

Author: zinoviev
Date: 2007-05-10 09:44:15 +0000 (Thu, 10 May 2007)
New Revision: 244

Added:
   kbd/trunk/debian/patches/default_font_for_unicode_start.diff
Modified:
   kbd/trunk/debian/changelog
   kbd/trunk/debian/console-screen.kbd.sh
   kbd/trunk/debian/patches/series
Log:
kbd: patch to compute default font in unicode_start; run setfont after unicode_start in the init.d script


Modified: kbd/trunk/debian/changelog
===================================================================
--- kbd/trunk/debian/changelog	2007-05-10 08:20:29 UTC (rev 243)
+++ kbd/trunk/debian/changelog	2007-05-10 09:44:15 UTC (rev 244)
@@ -1,11 +1,15 @@
 kbd (1.12-18) UNRELEASED; urgency=low
 
+  * Add me to uploaders
   * Add console-setup as an alternative in the dependencies on
     console-common and console-data.  Thanks to Martin-Éric Racine,
     closes: #398439.
-  * Add me to uploaders
+  * 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.
 
- -- Anton Zinoviev <zinoviev at debian.org>  Thu, 10 May 2007 10:59:12 +0300
+ -- Anton Zinoviev <zinoviev at debian.org>  Thu, 10 May 2007 11:21:53 +0300
 
 kbd (1.12-17) unstable; urgency=low
 

Modified: kbd/trunk/debian/console-screen.kbd.sh
===================================================================
--- kbd/trunk/debian/console-screen.kbd.sh	2007-05-10 08:20:29 UTC (rev 243)
+++ kbd/trunk/debian/console-screen.kbd.sh	2007-05-10 09:44:15 UTC (rev 244)
@@ -89,6 +89,28 @@
         LIST_CONSOLES=`sed -e '/^ *#/d' /etc/inittab | grep 'tty[0-9]*$' | awk -F: '{printf "%s ", $1}'`
     fi
 
+    # Go to UTF-8 mode as necessary
+    # 
+    if [ -f /etc/environment ] || [ -f /etc/default/locale ]
+    then
+        for var in LANG LC_CTYPE LC_ALL
+        do
+            value=$(egrep "^[^#]*${var}=" /etc/environment /etc/default/locale 2>/dev/null | tail -n1 | cut -d= -f2)
+            eval $var=$value
+        done
+    fi
+    CHARMAP=`LANG=$LANG LC_ALL=$LC_ALL LC_CTYPE=$LC_CTYPE locale charmap 2>/dev/null`
+    if [ "$CHARMAP" = "UTF-8" ]; then
+        action=unicode_start
+    else
+        action=unicode_stop
+    fi
+    for vc in $LIST_CONSOLES
+    do
+        $action < ${DEVICE_PREFIX}$vc > ${DEVICE_PREFIX}$vc 2> /dev/null || true
+    done
+
+
     # Global default font+map
     if [ "${CONSOLE_FONT}" ]; then
         [ "$VERBOSE" != "no" ] && log_action_begin_msg "Setting up general console font"
@@ -149,27 +171,6 @@
 #    fi
 
 
-    # Go to UTF-8 mode as necessary
-    # 
-    if [ -f /etc/environment ] || [ -f /etc/default/locale ]
-    then
-        for var in LANG LC_CTYPE LC_ALL
-        do
-            value=$(egrep "^[^#]*${var}=" /etc/environment /etc/default/locale 2>/dev/null | tail -n1 | cut -d= -f2)
-            eval $var=$value
-        done
-    fi
-    CHARMAP=`LANG=$LANG LC_ALL=$LC_ALL LC_CTYPE=$LC_CTYPE locale charmap 2>/dev/null`
-    if [ "$CHARMAP" = "UTF-8" ]; then
-        action=unicode_start
-    else
-        action=unicode_stop
-    fi
-    for vc in $LIST_CONSOLES
-    do
-        $action < ${DEVICE_PREFIX}$vc > ${DEVICE_PREFIX}$vc 2> /dev/null || true
-    done
-
     # screensaver stuff
     setterm_args=""
     if [ "$BLANK_TIME" ]; then

Added: kbd/trunk/debian/patches/default_font_for_unicode_start.diff
===================================================================
--- kbd/trunk/debian/patches/default_font_for_unicode_start.diff	2007-05-10 08:20:29 UTC (rev 243)
+++ kbd/trunk/debian/patches/default_font_for_unicode_start.diff	2007-05-10 09:44:15 UTC (rev 244)
@@ -0,0 +1,32 @@
+Index: trunk/src/unicode_start
+===================================================================
+--- trunk.orig/src/unicode_start
++++ trunk/src/unicode_start
+@@ -45,8 +45,17 @@
+ # have a Unicode map attached, or explicitly specified, e.g.,
+ # by giving `def.uni' as a second argument.
+ 
+-DEFAULT_UNICODE_FONT=LatArCyrHeb-16
+ # Also drdos8x16 is a good candidate.
++for DEFAULT_UNICODE_FONT in \
++	/usr/share/consolefonts/Uni1-VGA16.psf* \
++	/usr/share/consolefonts/LatArCyrHeb-16.psf* \
++	/usr/share/consolefonts/default*.psf* \
++	/usr/share/consolefonts/*.psf*
++do
++	if [ -f "$DEFAULT_UNICODE_FONT" ]; then
++		break
++	fi
++done
+ 
+ case $# in
+ 	2)
+@@ -56,7 +65,7 @@
+ 		setfont $1
+ 		;;
+ 	0)
+-		setfont $DEFAULT_UNICODE_FONT
++		setfont "$DEFAULT_UNICODE_FONT"
+ 		;;
+ 	*)
+ 		echo "usage: unicode_start [font [unicode map]]"

Modified: kbd/trunk/debian/patches/series
===================================================================
--- kbd/trunk/debian/patches/series	2007-05-10 08:20:29 UTC (rev 243)
+++ kbd/trunk/debian/patches/series	2007-05-10 09:44:15 UTC (rev 244)
@@ -18,3 +18,4 @@
 thai.diff
 mapscrn-acm.diff
 sparc-compile.diff
+default_font_for_unicode_start.diff