packages: kbd/kbd-unicode_start.patch, kbd/kbd.spec - no point dumping keym...

[glen]

Author: glen                         Date: Tue Aug 23 05:19:02 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- no point dumping keymap if it is not going to be used in unicode_start

---- Files affected:
packages/kbd:
   kbd-unicode_start.patch (1.3 -> 1.4) , kbd.spec (1.113 -> 1.114) 

---- Diffs:

================================================================
Index: packages/kbd/kbd-unicode_start.patch
diff -u packages/kbd/kbd-unicode_start.patch:1.3 packages/kbd/kbd-unicode_start.patch:1.4
--- packages/kbd/kbd-unicode_start.patch:1.3	Fri Dec  5 22:07:27 2008
+++ packages/kbd/kbd-unicode_start.patch	Tue Aug 23 07:18:57 2011
@@ -1,16 +1,60 @@
---- kbd-1.15/src/unicode_start.orig	2008-10-23 21:03:59.000000000 +0200
-+++ kbd-1.15/src/unicode_start	2008-12-05 20:17:24.728295331 +0100
-@@ -55,7 +55,12 @@
- 	# redirect stderr and stdout of loadkeys to /dev/null to avoid the confusing
- 	# "plus before udiaeresis ignored" warnings.
+--- kbd-1.15.3/src/unicode_start~	2011-08-23 08:14:50.523611798 +0300
++++ kbd-1.15.3/src/unicode_start	2011-08-23 08:14:24.636851881 +0300
+@@ -34,29 +36,34 @@
+ # not the global keymap. root will have to load the keymap in unicode mode
+ # explicitly.
  
+-uid="`id -u 2>/dev/null`" ||:
+-if [ "$uid" = '0' ]; then
+-	# There is no way of reverting the effect of "dumpkeys | loadkeys --unicode",
+-	# the memory of the earlier keymap is lost. Therefore, try
+-	# to save a copy of the original keymap to be able to reload it in unicode_stop.
+-	# (see also http://mail.nl.linux.org/linux-utf8/2003-08/msg00053.html):
+-
+-	[ -n "$HOME" -a "$HOME" != '/' ] ||
+-		HOME='/root'
+-
+-	if [ -d "$HOME" -a -w "$HOME" ]; then
+-		[ -d "$HOME/.kbd" ] ||
+-			mkdir -- "$HOME/.kbd"
+-
+-		[ ! -w "$HOME/.kbd" ] ||
+-			dumpkeys > "$HOME/.kbd/.keymap_sv"
+-	fi
+-
+-	# redirect stderr and stdout of loadkeys to /dev/null to avoid the confusing
+-	# "plus before udiaeresis ignored" warnings.
+-
 -	dumpkeys | loadkeys --unicode > /dev/null 2>&1
-+	# PLD: disabled because it breaks non-iso-8859-1 keymaps
-+	# instead use manually:
-+	#   loadkeys --unicode <keymap>
-+	# or
-+	#   dumpkeys -c <charset> | loadkeys --unicode
-+	#dumpkeys | loadkeys --unicode > /dev/null 2>&1
- fi
+-fi
++# PLD Linux: disabled because it breaks non-iso-8859-1 keymaps
++# instead use manually:
++#   loadkeys --unicode <keymap>
++# or
++#   dumpkeys -c <charset> | loadkeys --unicode
++
++#uid="`id -u 2>/dev/null`" ||:
++#if [ "$uid" = '0' ]; then
++#	# There is no way of reverting the effect of "dumpkeys | loadkeys --unicode",
++#	# the memory of the earlier keymap is lost. Therefore, try
++#	# to save a copy of the original keymap to be able to reload it in unicode_stop.
++#	# (see also http://mail.nl.linux.org/linux-utf8/2003-08/msg00053.html):
++#
++#	[ -n "$HOME" -a "$HOME" != '/' ] ||
++#		HOME='/root'
++#
++#	if [ -d "$HOME" -a -w "$HOME" ]; then
++#		[ -d "$HOME/.kbd" ] ||
++#			mkdir -- "$HOME/.kbd"
++#
++#		[ ! -w "$HOME/.kbd" ] ||
++#			dumpkeys > "$HOME/.kbd/.keymap_sv"
++#	fi
++#
++#	# redirect stderr and stdout of loadkeys to /dev/null to avoid the confusing
++#	# "plus before udiaeresis ignored" warnings.
++#	#dumpkeys | loadkeys --unicode > /dev/null 2>&1
++#fi
  
  # 2. The output side: the console screen.
+ 

================================================================
Index: packages/kbd/kbd.spec
diff -u packages/kbd/kbd.spec:1.113 packages/kbd/kbd.spec:1.114
--- packages/kbd/kbd.spec:1.113	Thu Jul 21 12:42:51 2011
+++ packages/kbd/kbd.spec	Tue Aug 23 07:18:57 2011
@@ -6,7 +6,7 @@
 Summary(pl.UTF-8):	Narzędzia do obsługi konsoli
 Name:		kbd
 Version:	1.15.3
-Release:	3
+Release:	4
 License:	GPL v2+
 Group:		Applications/Console
 Source0:	ftp://ftp.altlinux.org/pub/people/legion/kbd/%{name}-%{version}.tar.gz
@@ -219,6 +219,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.114  2011/08/23 05:18:57  glen
+- no point dumping keymap if it is not going to be used in unicode_start
+
 Revision 1.113  2011/07/21 10:42:51  glen
 - package upstart script
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kbd/kbd-unicode_start.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kbd/kbd.spec?r1=1.113&r2=1.114&f=u