[Pkg-kbd-commit] r232 - in people/zinoviev/console-setup: . Keyboard debian

[Anton Zinoviev]

Author: zinoviev
Date: 2007-04-27 15:06:04 +0000 (Fri, 27 Apr 2007)
New Revision: 232

Modified:
   people/zinoviev/console-setup/Keyboard/kbdcompiler
   people/zinoviev/console-setup/debian/changelog
   people/zinoviev/console-setup/debian/config.proto
   people/zinoviev/console-setup/debian/control-udeb
   people/zinoviev/console-setup/setupcon
Log:
console-setup: fix #421260 (multiply Installer-Menu-Item by 100)


Modified: people/zinoviev/console-setup/Keyboard/kbdcompiler
===================================================================
--- people/zinoviev/console-setup/Keyboard/kbdcompiler	2007-04-27 14:19:23 UTC (rev 231)
+++ people/zinoviev/console-setup/Keyboard/kbdcompiler	2007-04-27 15:06:04 UTC (rev 232)
@@ -65,10 +65,8 @@
 for my $layout (values %KeyboardNames::layouts) {
     next if ($layout eq 'nec/jp');
     next if ($layout eq 'nec_vndr/jp');
-    my $actual_layout = (($layout eq 'cs')
-			 ? 'cs,cs'
-			 : (($layout eq 'jp')
-			    ? 'jp,jp'
+    my $actual_layout = (($layout eq 'cs') ? 'cs,cs'
+			 : (($layout eq 'jp') ? 'jp,jp'
 			    : (($nonlatin =~ / $layout /)
 			       ? "us,$layout"
 			       : $layout)));

Modified: people/zinoviev/console-setup/debian/changelog
===================================================================
--- people/zinoviev/console-setup/debian/changelog	2007-04-27 14:19:23 UTC (rev 231)
+++ people/zinoviev/console-setup/debian/changelog	2007-04-27 15:06:04 UTC (rev 232)
@@ -23,6 +23,9 @@
     - Use 'jp(latin)' instead of 'us' in the Latin mode of Japanese
       keyboards.  Override the keyboard model if it was chosen by default
       and the layout is Japanese or Brasilian.  Closes: #420824.
+    - Add --save-only option to setupcon.  Closes: #420832.
+    - Multiply the Installer-Menu-Item field of the udebs by 100.
+      Closes: #421260.
   * Two additions to the FAQ:
     - Add a suggestion for the VBERestore option.  Thanks to Dmitry
       Semyonov, closes: #402143.

Modified: people/zinoviev/console-setup/debian/config.proto
===================================================================
--- people/zinoviev/console-setup/debian/config.proto	2007-04-27 14:19:23 UTC (rev 231)
+++ people/zinoviev/console-setup/debian/config.proto	2007-04-27 15:06:04 UTC (rev 232)
@@ -1129,6 +1129,11 @@
     default_codeset="`decode_codeset $CODESET`"
 
     case "$XKBLAYOUT" in
+#	lt,us)
+#	    default_layout=${XKBLAYOUT%,*}
+#	    default_variant="${XKBVARIANT%,*}"
+#	    unsupported_layout=no
+#	    ;;	    
 	# TODO: make s.t. to not forget to update this list
 	cs,cs|us,am|us,ara|us,ben|us,bd|us,bg|us,bt|us,by|us,deva|us,ge|us,gh|us,gr|us,guj|us,guru|us,il|us,in|us,ir|us,iku|jp,jp|us,jp|us,kan|us,kh|us,la|us,lao|us,lk|us,mk|us,mm|us,mn|us,mv|us,mal|us,ori|us,pk|us,ru|us,scc|us,sy|us,syr|us,tel|us,th|us,tj|us,tam|us,ua|us,uz)
 	    default_layout=${XKBLAYOUT#*,}

Modified: people/zinoviev/console-setup/debian/control-udeb
===================================================================
--- people/zinoviev/console-setup/debian/control-udeb	2007-04-27 14:19:23 UTC (rev 231)
+++ people/zinoviev/console-setup/debian/control-udeb	2007-04-27 15:06:04 UTC (rev 232)
@@ -7,7 +7,7 @@
  This is an experimental replacement of kbd-chooser.  It depends on
  loadkeys which does not exist in the installer currently.
 XC-Package-Type: udeb
-XB-Installer-Menu-Item: 12
+XB-Installer-Menu-Item: 1200
 
 Package: console-setup-amiga-ekmap
 Provides: console-setup-ekmap

Modified: people/zinoviev/console-setup/setupcon
===================================================================
--- people/zinoviev/console-setup/setupcon	2007-04-27 14:19:23 UTC (rev 231)
+++ people/zinoviev/console-setup/setupcon	2007-04-27 15:06:04 UTC (rev 232)
@@ -17,6 +17,9 @@
 #     along with this program, write to the Free Software Foundation, Inc.,
 #     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+###########################################################################
+
+
 # The same as /usr/bin/which - in order to make "which" available before
 # /usr is mounted
 which () {
@@ -205,7 +208,7 @@
 	if [ "$save_only" != yes ]; then
 	    if which consolechars >/dev/null; then
 		if [ "$bigfont" = yes ]; then
-		    echo "setupcon: The console-chars utility from the console-setup font can load only fonts witn 8 pixel width matrix.  Please install the setfont utility from the kbd package." >&2
+		    echo "setupcon: The consolechars utility from the console-setup font can load only fonts witn 8 pixel width matrix.  Please install the setfont utility from the kbd package." >&2
 		fi
 		eval consolechars -v --tty=$console -f "$FONT" $verbose
 	    elif which setfont >/dev/null; then