Re: Bug#346298: patch followup
On Thu, Jan 19, 2006 at 10:58:22PM +0200, Guillem Jover wrote:
> > Since it is "Large Format Computing's Catalan keyboard", I propose calling it
> > lfc-cat. Is that fine?
>
> That would be better, yes.
I'm attaching a new patch.
> I agree with Jordi that unilaterally
> defining this as the "Catalan keyboard" is not quite correct. And I can
> understand that you like it, but then you've been using an us mapping
> for a long time anyway, I don't see users in general wanting that even
> if it may have some benefits. That should be proposed and discussed in
> the Catalan community (whatever that may be ;) at large.
Ok. We can discuss that later then.
--
Robert Millan
diff -Nur console-data-2002.12.04dbs.old/debian/console-data.config console-data-2002.12.04dbs/debian/console-data.config
--- console-data-2002.12.04dbs.old/debian/console-data.config 2006-01-11 10:01:49.000000000 +0100
+++ console-data-2002.12.04dbs/debian/console-data.config 2006-01-20 12:13:02.000000000 +0100
@@ -127,6 +127,10 @@
'French' => { 'Standard' => 'cf', },
'English' => { 'Standard' => 'us', },
},
+ 'LFC Catalan' =>
+ {
+ 'Standard' => { 'Standard' => 'lfc-cat' },
+ },
'Czech' => # needs confirm
{
'Standard' =>
diff -Nur console-data-2002.12.04dbs.old/debian/console-data.keymaps console-data-2002.12.04dbs/debian/console-data.keymaps
--- console-data-2002.12.04dbs.old/debian/console-data.keymaps 2006-01-11 10:01:43.000000000 +0100
+++ console-data-2002.12.04dbs/debian/console-data.keymaps 2006-01-20 12:12:31.000000000 +0100
@@ -107,6 +107,10 @@
'French' => { 'Standard' => 'cf', },
'English' => { 'Standard' => 'us', },
},
+ 'LFC Catalan' =>
+ {
+ 'Standard' => { 'Standard' => 'lfc-cat' },
+ },
'Czech' => # needs confirm
{
'Standard' =>
diff -Nur console-data-2002.12.04dbs.old/debian/console-keymaps-at.install console-data-2002.12.04dbs/debian/console-keymaps-at.install
--- console-data-2002.12.04dbs.old/debian/console-keymaps-at.install 2006-01-11 10:01:43.000000000 +0100
+++ console-data-2002.12.04dbs/debian/console-keymaps-at.install 2006-01-20 11:40:10.000000000 +0100
@@ -5,6 +5,7 @@
build-tree/console-data-1999.08.29/keymaps/i386/qwerty/br-abnt2.kmap.gz usr/share/keymaps/i386/qwerty
build-tree/console-data-1999.08.29/keymaps/i386/qwerty/br-latin1.kmap.gz usr/share/keymaps/i386/qwerty
build-tree/console-data-1999.08.29/keymaps/i386/qwerty/bg.kmap.gz usr/share/keymaps/i386/qwerty
+build-tree/console-data-1999.08.29/keymaps/i386/qwerty/lfc-cat.kmap.gz usr/share/keymaps/i386/qwerty
build-tree/console-data-1999.08.29/keymaps/i386/qwertz/croat.kmap.gz usr/share/keymaps/i386/qwertz
build-tree/console-data-1999.08.29/keymaps/i386/qwerty/cz-lat2.kmap.gz usr/share/keymaps/i386/qwerty
build-tree/console-data-1999.08.29/keymaps/i386/qwerty/dk-latin1.kmap.gz usr/share/keymaps/i386/qwerty
diff -Nur console-data-2002.12.04dbs.old/debian/console-keymaps-at.templates console-data-2002.12.04dbs/debian/console-keymaps-at.templates
--- console-data-2002.12.04dbs.old/debian/console-keymaps-at.templates 2006-01-11 10:01:48.000000000 +0100
+++ console-data-2002.12.04dbs/debian/console-keymaps-at.templates 2006-01-20 11:40:10.000000000 +0100
@@ -1,4 +1,4 @@
Template: console-keymaps-at/keymap
Type: select
-__Choices: by,bg,croat,cz-lat2,sg-latin1,de-latin1-nodeadkeys,dk-latin1,us,uk,dvorak,et,es,la-latin1,fi-latin1,fr-latin9,be2-latin1,cf,fr_CH-latin1,gr,hebrew,hu,is-latin1,it,lt,lv-latin4,jp106,mk,no-latin1,nl,pl,pt-latin1,br-abnt2,br-latin1,ro,ru,sk-qwerty,slovene,sr-cy,se-latin1,trfu,trqu,ua
+__Choices: by,bg,lfc-cat,croat,cz-lat2,sg-latin1,de-latin1-nodeadkeys,dk-latin1,us,uk,dvorak,et,es,la-latin1,fi-latin1,fr-latin9,be2-latin1,cf,fr_CH-latin1,gr,hebrew,hu,is-latin1,it,lt,lv-latin4,jp106,mk,no-latin1,nl,pl,pt-latin1,br-abnt2,br-latin1,ro,ru,sk-qwerty,slovene,sr-cy,se-latin1,trfu,trqu,ua
_Description: Keymap to use:
diff -Nur console-data-2002.12.04dbs.old/debian/patches/230_lfc-cat_keymap.patch console-data-2002.12.04dbs/debian/patches/230_lfc-cat_keymap.patch
--- console-data-2002.12.04dbs.old/debian/patches/230_lfc-cat_keymap.patch 1970-01-01 01:00:00.000000000 +0100
+++ console-data-2002.12.04dbs/debian/patches/230_lfc-cat_keymap.patch 2006-01-20 11:45:10.000000000 +0100
@@ -0,0 +1,78 @@
+diff -Nur console-data-1999.08.29.old/keymaps/i386/qwerty/lfc-cat.kmap console-data-1999.08.29/keymaps/i386/qwerty/lfc-cat.kmap
+--- console-data-1999.08.29.old/keymaps/i386/qwerty/lfc-cat.kmap 1970-01-01 01:00:00.000000000 +0100
++++ console-data-1999.08.29/keymaps/i386/qwerty/lfc-cat.kmap 2006-01-16 12:26:58.000000000 +0100
+@@ -0,0 +1,74 @@
++# lfc-cat.kmap
++# contributed by Robert Millan
++keymaps 0-2,4-6,8-9,12
++include "qwerty-layout"
++include "linux-with-alt-and-altgr"
++include "euro"
++strings as usual
++include "euro"
++
++keycode 1 = Escape
++keycode 2 = one exclam
++keycode 3 = two at dead_diaeresis nul nul
++keycode 4 = three numbersign
++ control keycode 4 = Escape
++keycode 5 = four dollar dollar Control_backslash
++keycode 6 = five percent
++ control keycode 6 = Control_bracketright
++keycode 7 = six asciicircum
++ control keycode 7 = Control_asciicircum
++keycode 8 = seven ampersand dead_acute Control_underscore
++keycode 9 = eight asterisk bracketleft Delete
++keycode 10 = nine parenleft dead_grave
++keycode 11 = zero parenright braceright
++keycode 12 = minus underscore backslash Control_underscore Control_underscore
++keycode 13 = equal plus
++keycode 14 = Delete
++keycode 15 = Tab
++keycode 17 = w W eacute Eacute
++ control keycode 17 = Control_w
++keycode 18 = e E egrave Egrave
++ control keycode 18 = Control_e
++keycode 21 = y Y udiaeresis Udiaeresis
++ control keycode 21 = Control_y
++keycode 22 = u U uacute Uacute
++ control keycode 22 = Control_u
++keycode 23 = i I iacute Iacute
++ control keycode 23 = Control_i
++keycode 24 = o O oacute Oacute
++ control keycode 24 = Control_o
++keycode 25 = p P ograve Ograve
++ control keycode 25 = Control_p
++keycode 26 = bracketleft braceleft
++ control keycode 26 = Escape
++keycode 27 = bracketright braceright euro Control_bracketright
++keycode 28 = Return
++ alt keycode 28 = Meta_Control_m
++keycode 29 = Control
++keycode 30 = a A agrave Agrave
++ control keycode 30 = Control_a
++keycode 37 = k K idiaeresis Idiaeresis
++ control keycode 37 = Control_k
++keycode 38 = l L periodcentered
++ control keycode 38 = Control_l
++keycode 39 = semicolon colon
++keycode 40 = apostrophe quotedbl
++ control keycode 40 = Control_g
++keycode 41 = grave asciitilde
++ control keycode 41 = nul
++keycode 42 = Shift
++keycode 43 = backslash bar
++ control keycode 43 = Control_backslash
++keycode 46 = c C +ccedilla +Ccedilla
++ control keycode 46 = Control_c
++keycode 51 = comma less
++keycode 52 = period greater
++keycode 53 = slash question
++ control keycode 53 = Delete
++keycode 54 = Shift
++keycode 56 = Alt
++keycode 57 = space
++ control keycode 57 = nul
++keycode 58 = Caps_Lock
++keycode 86 = less greater bar
++keycode 97 = Control
Reply to: