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

Anton Zinoviev zinoviev at alioth.debian.org
Tue May 1 11:05:05 UTC 2007 

Author: zinoviev
Date: 2007-05-01 11:05:04 +0000 (Tue, 01 May 2007)
New Revision: 238

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/console-setup.templates
Log:
console-setup: Lithuanian keyboard support


Modified: people/zinoviev/console-setup/Keyboard/kbdcompiler
===================================================================
--- people/zinoviev/console-setup/Keyboard/kbdcompiler	2007-04-28 16:03:03 UTC (rev 237)
+++ people/zinoviev/console-setup/Keyboard/kbdcompiler	2007-05-01 11:05:04 UTC (rev 238)
@@ -66,16 +66,22 @@
     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'
-			    : (($nonlatin =~ / $layout /)
-			       ? "us,$layout"
-			       : $layout)));
+			 : (($layout eq 'lt') ? 'lt,lt'
+			    : (($layout eq 'jp') ? 'jp,jp'
+			       : (($nonlatin =~ / $layout /)
+				  ? "us,$layout"
+				  : $layout))));
     if (! -f "$dir/$model-$layout") {
 	if ($layout eq 'cs' or $layout eq 'jp') {
 	    execute ("./ckbcomp -compact -I. -I${xkbdir} -rules xorg"
 		     ." -model $model"
 		     ." -layout $actual_layout -variant latin,"
 		     ." >$dir/$model-$layout");
+	} elsif ($layout eq 'lt') {
+	    execute ("./ckbcomp -compact -I. -I${xkbdir} -rules xorg"
+		     ." -model $model"
+		     ." -layout $actual_layout -variant ,us"
+		     ." >$dir/$model-$layout");
 	} else {
 	    execute ("./ckbcomp -compact -I. -I${xkbdir} -rules xorg"
 		     ." -model $model -layout $actual_layout"
@@ -100,6 +106,12 @@
 	    }
 	} elsif ($actual_layout eq 'jp,jp') {
 	    $actual_variant = "latin,$variant";
+	} elsif ($actual_layout eq 'lt,lt') {
+	    if ($variant eq 'us') {
+		$actual_variant = "us,basic";
+	    } else {
+		$actual_variant = "$variant,us";
+	    }
 	} elsif ($actual_layout =~ /,/) {
 	    $actual_variant = ",$variant";
 	} else {

Modified: people/zinoviev/console-setup/debian/changelog
===================================================================
--- people/zinoviev/console-setup/debian/changelog	2007-04-28 16:03:03 UTC (rev 237)
+++ people/zinoviev/console-setup/debian/changelog	2007-05-01 11:05:04 UTC (rev 238)
@@ -29,6 +29,9 @@
     - By default do not use AltGr with basic US keyboard.  Closes: #421263.
     - Make sure amiga, ataritt, sun4 and sun5 are in KeyboardNames.pl even
       if they are not in the xml database.  Closes: #420821.
+    - Talk about 'national' instead of 'non-Latin' mode in the templates.
+      Treat the Lithuanian keyboard as a two-mode keyboard similarly to
+      the Serbian keyboard.  Closes: #421261.
   * Two additions to the FAQ:
     - Add a suggestion for the VBERestore option.  Thanks to Dmitry
       Semyonov, closes: #402143.
@@ -37,7 +40,7 @@
   * Added manual page for setupcon.  Thanks to Vassilis Pandis,
     closes: #405005. 
 
- -- Anton Zinoviev <zinoviev at debian.org>  Sat, 28 Apr 2007 18:59:16 +0300
+ -- Anton Zinoviev <zinoviev at debian.org>  Tue,  1 May 2007 13:59:29 +0300
 
 console-setup (1.15) unstable; urgency=low
 

Modified: people/zinoviev/console-setup/debian/config.proto
===================================================================
--- people/zinoviev/console-setup/debian/config.proto	2007-04-28 16:03:03 UTC (rev 237)
+++ people/zinoviev/console-setup/debian/config.proto	2007-05-01 11:05:04 UTC (rev 238)
@@ -1129,13 +1129,13 @@
     default_codeset="`decode_codeset $CODESET`"
 
     case "$XKBLAYOUT" in
-#	lt,us)
-#	    default_layout=${XKBLAYOUT%,*}
-#	    default_variant="${XKBVARIANT%,*}"
-#	    unsupported_layout=no
-#	    ;;	    
+	lt,lt)
+	    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)
+	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,lt|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#*,}
 	    default_variant="${XKBVARIANT#*,}"
 	    unsupported_layout=no
@@ -1318,6 +1318,10 @@
 				;;
 			esac
 			;;
+		    lt)
+			latin=no
+			real_layout=lt,lt
+			;;
 		    # TODO: make s.t. to not forget to update this list.  Don't
 		    # forget to update also the nonlatin list in kbdcompiler
 		    am|ara|ben|bd|bg|bt|by|deva|ge|gh|gr|guj|guru|il|in|ir|iku|kan|kh|la|lao|lk|mk|mm|mn|mv|mal|ori|pk|ru|scc|sy|syr|tel|th|tj|tam|ua|uz)
@@ -1347,6 +1351,15 @@
 				"latin,$variant"
 			    ;;
 		    esac
+		elif [ "$real_layout" = lt,lt ]; then
+		    case "$variant" in
+			us)
+			    db_set console-setup/variantcode "us,"
+			    ;;
+			*)
+			    db_set console-setup/variantcode "$variant,us"
+			    ;;
+		    esac
 		elif [ "$real_layout" = jp,jp ]; then
 			    db_set console-setup/variantcode "latin,$variant"
 		else

Modified: people/zinoviev/console-setup/debian/console-setup.templates
===================================================================
--- people/zinoviev/console-setup/debian/console-setup.templates	2007-04-28 16:03:03 UTC (rev 237)
+++ people/zinoviev/console-setup/debian/console-setup.templates	2007-05-01 11:05:04 UTC (rev 238)
@@ -100,9 +100,9 @@
 Type: select
 __Choices: Caps Lock, Right Alt, Right Control, Right Shift, Right Logo key, Menu key, Alt+Shift, Control+Shift, Shift+Caps Lock, Control+Alt, Both Shift keys together, Both Control keys together, Both Alt keys together, Left Alt, Left Control, Left Shift, Left Logo key, No toggling
 Default: Alt+Shift
-_Description: Method for toggling between Latin and non-Latin mode:
- Since your keyboard is a non-Latin one, you will need a way to toggle
- between the Latin and the non-Latin mode.  Several options are available.
+_Description: Method for toggling between national and Latin mode:
+ You will need a way to toggle the keyboard between the national
+ layout and the standard Latin layout.  Several options are available.
  .
  The most ergonomic choices seem to be the right Alt and the Caps Lock keys
  (in the later case use the combination Shift+Caps Lock for normal Caps
@@ -117,13 +117,13 @@
 Type: select
 __Choices: No temporary switch, Right Alt, Left Alt, Right Logo key, Left Logo key, Both Logo keys
 Default: No temporary switch
-_Description: Method for temporarily toggle between Latin and non-Latin input:
- Sometimes the keyboard is in non-Latin mode and you want to type only few
+_Description: Method for temporarily toggle between national and Latin input:
+ Sometimes the keyboard is in national mode and you want to type only few
  Latin letters. In this case it may be desirable to have a key for
- temporary switching between non-Latin and Latin letters.  While this key
- is pressed in non-Latin mode the keyboard types Latin letters and in
+ temporary switching between national and Latin symbols.  While this key
+ is pressed in national mode the keyboard types Latin letters and in
  reverse, when the keyboard is in Latin mode and you are pressing this key
- the keyboard will type non-Latin letters.
+ the keyboard will type national letters.
  .
  If you don't like this feature, choose the option "No temporary switch".

More information about the Pkg-kbd-commit mailing list