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

[Anton Zinoviev]

Author: zinoviev
Date: 2007-04-27 15:50:34 +0000 (Fri, 27 Apr 2007)
New Revision: 234

Modified:
   people/zinoviev/console-setup/Keyboard/KeyboardNames.pl
   people/zinoviev/console-setup/Keyboard/xmlreader
   people/zinoviev/console-setup/debian/changelog
Log:
console-setup: make sure amiga,ataritt,sun4 and sun5 are in KeyboardNames.xml even if they are not in xml data base


Modified: people/zinoviev/console-setup/Keyboard/KeyboardNames.pl
===================================================================
--- people/zinoviev/console-setup/Keyboard/KeyboardNames.pl	2007-04-27 15:14:48 UTC (rev 233)
+++ people/zinoviev/console-setup/Keyboard/KeyboardNames.pl	2007-04-27 15:50:34 UTC (rev 234)
@@ -9,6 +9,8 @@
     'Acer AirKey V' => 'airkey',
     'Acer TravelMate 800' => 'acer_tm_800',
     'Advance Scorpius KI' => 'scorpius',
+    'Amiga' => 'amiga',
+    'Atari TT' => 'ataritt',
     'Azona RF2300 wireless Internet Keyboard' => 'azonaRF2300',
     'BTC 5090' => 'btc5090',
     'BTC 5113RF Multimedia' => 'btc5113rf',
@@ -111,6 +113,8 @@
     'SVEN Ergonomic 2500' => 'sven',
     'Samsung SDM 4500P' => 'samsung4500',
     'Samsung SDM 4510P' => 'samsung4510',
+    'Sun Type 4' => 'sun4',
+    'Sun Type 5' => 'sun5',
     'Super Power Multimedia Keyboard' => 'sp_inet',
     'Symplon PaceBook (tablet PC)' => 'symplon',
     'Toshiba Satellite S3000' => 'toshiba_s3000',

Modified: people/zinoviev/console-setup/Keyboard/xmlreader
===================================================================
--- people/zinoviev/console-setup/Keyboard/xmlreader	2007-04-27 15:14:48 UTC (rev 233)
+++ people/zinoviev/console-setup/Keyboard/xmlreader	2007-04-27 15:50:34 UTC (rev 234)
@@ -263,6 +263,21 @@
     }
 }
 
+# Fixups for model names we need
+my %modelvalues = map { $_ => 1 } values %models;
+if (not exists $modelvalues{amiga}) {
+    $models{'Amiga'} = 'amiga';
+}
+if (not exists $modelvalues{ataritt}) {
+    $models{'Atari TT'} = 'ataritt';
+}
+if (not exists $modelvalues{sun4}) {
+    $models{'Sun Type 4'} = 'sun4';
+}
+if (not exists $modelvalues{sun5}) {
+    $models{'Sun Type 5'} = 'sun5';
+}
+
 print <<'EOT';
 #!/usr/bin/perl -w
 

Modified: people/zinoviev/console-setup/debian/changelog
===================================================================
--- people/zinoviev/console-setup/debian/changelog	2007-04-27 15:14:48 UTC (rev 233)
+++ people/zinoviev/console-setup/debian/changelog	2007-04-27 15:50:34 UTC (rev 234)
@@ -27,6 +27,8 @@
     - Multiply the Installer-Menu-Item field of the udebs by 100.
       Closes: #421260.
     - 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.
   * Two additions to the FAQ:
     - Add a suggestion for the VBERestore option.  Thanks to Dmitry
       Semyonov, closes: #402143.