ChangeLog
| 12
INSTALL
| 236 -
debian/changelog
| 26
debian/compat
| 2
debian/control
| 4
debian/patches/01_cymotion_master_and_ibm_space_saver.diff
| 76
debian/patches/02_xkb_symbols_euro_support.diff
| 72
debian/patches/03_drop_rules_xorg_duplicates.diff
| 64
debian/patches/04_czech_include_location.diff
| 31
debian/patches/05_evdev_xkb.diff
| 763 ---
debian/patches/06_AB10_minus_underscore.diff
| 42
debian/patches/07_AE12_apostrophe_on_pc_de_nodeadkeys.diff
| 22
debian/patches/08_implement_grp:sclk_toggle.diff
| 75
debian/patches/09_enable_ca_variants.diff
| 16
debian/patches/10_ralt_switch_multikey.diff
| 63
debian/patches/11_uk_macintosh_problems.diff
| 50
debian/patches/12_implement_compose:caps.diff
| 65
debian/patches/13_macintosh_problems.diff
| 22
debian/patches/14_dead_diaresis.diff
| 21
debian/patches/15_symbols_polish_keypad_separator.diff
| 55
debian/patches/16_brazilian_keypad_separator.diff
| 32
debian/patches/17_tr_fix_eacute.diff
| 15
debian/patches/18_riscpc_keycodes.diff
| 155
debian/patches/19_sun_loads_srvr_ctrl.diff
| 65
debian/patches/bz1576.diff
| 202 -
debian/patches/bz8668.diff
| 53
debian/patches/compat-misc.diff
| 18
debian/patches/compatibility.diff
| 132
debian/patches/cvs.diff
| 1
debian/patches/fix_xkbcomp_crash.diff
| 204 -
debian/patches/japan.diff
| 143
debian/patches/obsolete_merged-upstream/01_cymotion_master_and_ibm_space_saver.diff
| 76
debian/patches/obsolete_merged-upstream/02_xkb_symbols_euro_support.diff
| 72
debian/patches/obsolete_merged-upstream/03_drop_rules_xorg_duplicates.diff
| 64
debian/patches/obsolete_merged-upstream/04_czech_include_location.diff
| 31
debian/patches/obsolete_merged-upstream/05_evdev_xkb.diff
| 763 +++
debian/patches/obsolete_merged-upstream/06_AB10_minus_underscore.diff
| 42
debian/patches/obsolete_merged-upstream/07_AE12_apostrophe_on_pc_de_nodeadkeys.diff
| 22
debian/patches/obsolete_merged-upstream/08_implement_grp:sclk_toggle.diff
| 75
debian/patches/obsolete_merged-upstream/09_enable_ca_variants.diff
| 16
debian/patches/obsolete_merged-upstream/10_ralt_switch_multikey.diff
| 63
debian/patches/obsolete_merged-upstream/11_uk_macintosh_problems.diff
| 50
debian/patches/obsolete_merged-upstream/12_implement_compose:caps.diff
| 65
debian/patches/obsolete_merged-upstream/13_macintosh_problems.diff
| 22
debian/patches/obsolete_merged-upstream/14_dead_diaresis.diff
| 21
debian/patches/obsolete_merged-upstream/15_symbols_polish_keypad_separator.diff
| 55
debian/patches/obsolete_merged-upstream/16_brazilian_keypad_separator.diff
| 32
debian/patches/obsolete_merged-upstream/17_tr_fix_eacute.diff
| 15
debian/patches/obsolete_merged-upstream/18_riscpc_keycodes.diff
| 155
debian/patches/obsolete_merged-upstream/19_sun_loads_srvr_ctrl.diff
| 65
debian/patches/obsolete_merged-upstream/bz1576.diff
| 202 +
debian/patches/obsolete_merged-upstream/bz8668.diff
| 53
debian/patches/obsolete_merged-upstream/compat-misc.diff
| 18
debian/patches/obsolete_merged-upstream/compatibility.diff
| 132
debian/patches/obsolete_merged-upstream/cvs.diff
| 1
debian/patches/obsolete_merged-upstream/fix_xkbcomp_crash.diff
| 204 +
debian/patches/obsolete_merged-upstream/japan.diff
| 143
debian/patches/obsolete_merged-upstream/po.diff
| 1978 ++++++++++
debian/patches/obsolete_merged-upstream/revert_bz8572.diff
| 63
debian/patches/obsolete_merged-upstream/uz.diff
| 86
debian/patches/po.diff
| 1978 ----------
debian/patches/resync_rules_base.diff
| 110
debian/patches/revert_bz8572.diff
| 63
debian/patches/send-upstream/001_keypad_comma.diff
| 41
debian/patches/series
| 1
debian/patches/uz.diff
| 86
keycodes/powerpcps2
| 134
keycodes/xfree86
| 1
rules/base
| 2
rules/base.lst
| 2
symbols/ma
| 30
71 files changed, 4689 insertions(+), 5080 deletions(-)
New commits:
commit 62fe415ef73968139af8c1998bdb98a4aa2487cf
Author: Mohammed Adnene Trojette <[EMAIL PROTECTED]>
Date: Sat Apr 28 20:58:02 2007 +0200
Synchronise orig with upstream's CVS from April 28 2007
diff --git a/ChangeLog b/ChangeLog
index 2b8d893..38d3702 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-04-27 Sergey Udaltsov
+
+ * geometry/microsoft: replacing non-defined AE00 with TLDE,
+ http://bugzilla.gnome.org/show_bug.cgi?id=429907
+
+2007-04-24 Sergey Udaltsov
+
+ * symbols/ma: fixing alt in Tifinagh, closing
+ https://bugs.freedesktop.org/show_bug.cgi?id=10736
+
2007-04-23 Sergey Udaltsov
* geometry/pc: fix for abnt2, closing
@@ -1430,7 +1440,7 @@
2004-09-13 22:39 svu
- * symbols/tj: new local cvs keyword seems to be ok - no more $Id:
ChangeLog,v 1.277 2007-04-23 22:09:06 svu Exp $
+ * symbols/tj: new local cvs keyword seems to be ok - no more $Id:
ChangeLog,v 1.279 2007-04-27 19:15:42 svu Exp $
2004-09-13 22:38 svu
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 23e5f25..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
-
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
-
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
diff --git a/keycodes/powerpcps2 b/keycodes/powerpcps2
deleted file mode 100644
index a607036..0000000
--- a/keycodes/powerpcps2
+++ /dev/null
@@ -1,134 +0,0 @@
-// $XConsortium: xfree86 /main/4 1996/08/31 12:16:59 kaleb $
-// $XFree86: xc/programs/xkbcomp/keycodes/xfree86,v 3.3.2.1 1999/06/21
09:45:28 hohndel Exp $
-default xkb_keycodes "powerpcps2" {
-
- minimum= 8;
- maximum= 135;
-
- <TLDE> = 49;
- <AE01> = 10;
- <AE02> = 11;
- <AE03> = 12;
- <AE04> = 13;
- <AE05> = 14;
- <AE06> = 15;
- <AE07> = 16;
- <AE08> = 17;
- <AE09> = 18;
- <AE10> = 19;
- <AE11> = 20;
- <AE12> = 21;
- <BKSP> = 22;
-
- <TAB> = 23;
- <AD01> = 24;
- <AD02> = 25;
- <AD03> = 26;
- <AD04> = 27;
- <AD05> = 28;
- <AD06> = 29;
- <AD07> = 30;
- <AD08> = 31;
- <AD09> = 32;
- <AD10> = 33;
- <AD11> = 34;
- <AD12> = 35;
- <RTRN> = 36;
-
- <CAPS> = 66;
- <AC01> = 38;
- <AC02> = 39;
- <AC03> = 40;
- <AC04> = 41;
- <AC05> = 42;
- <AC06> = 43;
- <AC07> = 44;
- <AC08> = 45;
- <AC09> = 46;
- <AC10> = 47;
- <AC11> = 48;
-
- <LFSH> = 50;
- <AB01> = 52;
- <AB02> = 53;
- <AB03> = 54;
- <AB04> = 55;
- <AB05> = 56;
- <AB06> = 57;
- <AB07> = 58;
- <AB08> = 59;
- <AB09> = 60;
- <AB10> = 61;
- <RTSH> = 62;
- <BKSL> = 51;
- <LSGT> = 94;
-
- <LALT> = 64;
- <LCTL> = 37;
- <SPCE> = 65;
- <RCTL> = 105;
- <RALT> = 108;
- // Microsoft keyboard extra keys
- <LWIN> = 133;
- <RWIN> = 134;
- <MENU> = 135;
-
- <ESC> = 9;
- <FK01> = 67;
- <FK02> = 68;
- <FK03> = 69;
- <FK04> = 70;
- <FK05> = 71;
- <FK06> = 72;
- <FK07> = 73;
- <FK08> = 74;
- <FK09> = 75;
- <FK10> = 76;
- <FK11> = 95;
- <FK12> = 96;
-
- <PRSC> = 107;
- <SCLK> = 78;
- <PAUS> = 127;
-
- <INS> = 118;
- <HOME> = 110;
- <PGUP> = 112;
- <DELE> = 119;
- <END> = 115;
- <PGDN> = 117;
-
- <UP> = 111;
- <LEFT> = 113;
- <DOWN> = 116;
- <RGHT> = 114;
-
- <NMLK> = 77;
- <KPDV> = 106;
- <KPMU> = 63;
- <KPSU> = 82;
-
- <KP7> = 79;
- <KP8> = 80;
- <KP9> = 81;
- <KPAD> = 86;
-
- <KP4> = 83;
- <KP5> = 84;
- <KP6> = 85;
-
- <KP1> = 87;
- <KP2> = 88;
- <KP3> = 89;
- <KPEN> = 104;
-
- <KP0> = 90;
- <KPDL> = 91;
-
- indicator 1 = "Caps Lock";
- indicator 2 = "Num Lock";
- indicator 3 = "Scroll Lock";
-
- alias <ALGR> = <RALT>;
-};
-
diff --git a/keycodes/xfree86 b/keycodes/xfree86
index e987d38..0998ba9 100644
--- a/keycodes/xfree86
+++ b/keycodes/xfree86
@@ -21,6 +21,7 @@ xkb_keycodes "basic" {
maximum= 255;
<TLDE> = 49;
+ alias <AE00> = <TLDE>; // Some geometries use AE00
<AE01> = 10;
<AE02> = 11;
<AE03> = 12;
diff --git a/rules/base b/rules/base
index fa5ebfb..828b8b5 100644
--- a/rules/base
+++ b/rules/base
@@ -796,7 +796,6 @@
grp:lctrl_toggle = +group(lctrl_toggle)
grp:rctrl_toggle = +group(rctrl_toggle)
grp:lalt_toggle = +group(lalt_toggle)
- grp:sclk_toggle = +group(sclk_toggle)
lv3:switch = +level3(switch)
lv3:ralt_switch = +level3(ralt_switch)
lv3:ralt_switch_multikey = +level3(ralt_switch_multikey)
@@ -807,7 +806,6 @@
lv3:win_switch = +level3(win_switch)
lv3:lwin_switch = +level3(lwin_switch)
lv3:rwin_switch = +level3(rwin_switch)
- lv3:enter_switch = +level3(enter_switch)
caps:capslock = +capslock(capslock)
caps:shiftlock = +capslock(shiftlock)
caps:grouplock = +capslock(grouplock)
diff --git a/rules/base.lst b/rules/base.lst
index 02d8d66..2986bc6 100644
--- a/rules/base.lst
+++ b/rules/base.lst
@@ -503,7 +503,6 @@
grp:rshift_toggle Right Shift key changes group.
grp:lctrl_toggle Left Ctrl key changes group.
grp:rctrl_toggle Right Ctrl key changes group.
- grp:sclk_toggle ScrollLock key changes group.
lv3 Third level choosers
lv3:switch Press Right Ctrl to choose 3rd level.
lv3:menu_switch Press Menu key to choose 3rd level.
@@ -515,7 +514,6 @@
lv3:ralt_switch Press Right Alt key to choose 3rd level.
lv3:ralt_switch_multikey Press Right Alt key to choose 3rd level,
Shift+Right Alt key is Multi_Key.
lv3:ralt_alt Right Alt key never chooses 3rd level.
- lv3:enter_switch Press Enter key on keypad to choose 3rd level.
ctrl Ctrl key position
ctrl:nocaps Make CapsLock an additional Ctrl.
ctrl:swapcaps Swap Ctrl and CapsLock.
diff --git a/symbols/ma b/symbols/ma
index ce7bc59..16d0717 100644
--- a/symbols/ma
+++ b/symbols/ma
@@ -77,12 +77,7 @@ xkb_symbols "tifinagh" {
key <AB09> { [ colon, slash ] };
key <AB10> { [ exclam, section ] };
- key <SPCE> { [ space, space, nobreakspace ] };
-
-
- key <RALT> { type[Group1]="TWO_LEVEL",
- [ ISO_Level3_Shift, Multi_key ] };
- modifier_map Mod5 { <RALT> };
+ include "level3(ralt_switch)"
};
partial alphanumeric_keys
@@ -120,9 +115,7 @@ xkb_symbols "tifinagh-phonetic" {
key <LatB> { [ 0x1002d31 ] };
key <LatN> { [ 0x1002d4f ] };
- key <RALT> { type[Group1]="TWO_LEVEL",
- [ ISO_Level3_Shift, Multi_key ] };
- modifier_map Mod5 { <RALT> };
+ include "level3(ralt_switch)"
};
// Clavier unicode tifinaghe étendu réalisé par l'IRCAM (Institut Royal de
la Culture Amazighe du Maroc) http://www.ircam.ma/
@@ -188,12 +181,7 @@ xkb_symbols "tifinagh-extended" {
key <AB09> { [ colon, slash ] };
key <AB10> { [ exclam, section ] };
- key <SPCE> { [ space, space, nobreakspace ] };
-
-
- key <RALT> { type[Group1]="TWO_LEVEL",
- [ ISO_Level3_Shift, Multi_key ] };
- modifier_map Mod5 { <RALT> };
+ include "level3(ralt_switch)"
};
partial alphanumeric_keys
@@ -231,9 +219,7 @@ xkb_symbols "tifinagh-extended-phonetic" {
key <LatB> { [ 0x1002d31 ] };
key <LatN> { [ 0x1002d4f ] };
- key <RALT> { type[Group1]="TWO_LEVEL",
- [ ISO_Level3_Shift, Multi_key ] };
- modifier_map Mod5 { <RALT> };
+ include "level3(ralt_switch)"
};
// Tifinagh keyboard; improved from the IRCAM layout to make all
@@ -296,9 +282,7 @@ xkb_symbols "tifinagh-alt" {
key <AB09> { [ colon, slash ] };
key <AB10> { [ exclam, section ] };
- key <RALT> { type[Group1]="TWO_LEVEL",
- [ ISO_Level3_Shift, Multi_key ] };
- modifier_map Mod5 { <RALT> };
+ include "level3(ralt_switch)"
};
partial alphanumeric_keys
@@ -336,8 +320,6 @@ xkb_symbols "tifinagh-alt-phonetic" {
key <LatB> { [ 0x1002d31, 0x1002d31, 0x1002d32 ] };
key <LatN> { [ 0x1002d4f, 0x1002d50, 0x1002d51 ] };
- key <RALT> { type[Group1]="TWO_LEVEL",
- [ ISO_Level3_Shift, Multi_key ] };
- modifier_map Mod5 { <RALT> };
+ include "level3(ralt_switch)"
};
commit 7b86de37d4004150d16572265c8b11fd080b341f
Author: Mohammed Adnene Trojette <[EMAIL PROTECTED]>
Date: Sat Apr 28 20:48:38 2007 +0200
Moved files
diff --git a/debian/patches/01_cymotion_master_and_ibm_space_saver.diff
b/debian/patches/01_cymotion_master_and_ibm_space_saver.diff
deleted file mode 100644
index 6b4811a..0000000
--- a/debian/patches/01_cymotion_master_and_ibm_space_saver.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-Index: xkbdata-X11R7.0-1.0.1/rules/xorg.xml
-===================================================================
---- xkbdata-X11R7.0-1.0.1.orig/rules/xorg.xml 2006-01-26 21:46:48.000000000
-0500
-+++ xkbdata-X11R7.0-1.0.1/rules/xorg.xml 2006-02-26 18:28:52.000000000
-0500
-@@ -619,6 +619,18 @@
- </model>
- <model>
- <configItem>
-+ <name>ibm_space_saver</name>
-+ <description>IBM Space Saver</description>
-+ </configItem>
-+ </model>
-+ <model>
-+ <configItem>
-+ <name>cherryblueb</name>
-+ <description>Cherry CyMotion Master XPress</description>
-+ </configItem>
-+ </model>
-+ <model>
-+ <configItem>
- <name>cherrybluea</name>
- <description>Cherry Blue Line [EMAIL PROTECTED] (alternate
option)</description>
- <description xml:lang="af">Cherry Blue Line [EMAIL PROTECTED]
(alternatief)</description>
-Index: xkbdata-X11R7.0-1.0.1/symbols/inet
-===================================================================
---- xkbdata-X11R7.0-1.0.1.orig/symbols/inet 2006-01-26 21:46:48.000000000
-0500
-+++ xkbdata-X11R7.0-1.0.1/symbols/inet 2006-02-26 18:28:52.000000000 -0500
-@@ -353,6 +353,48 @@
-
- // Cherry Blue Line [EMAIL PROTECTED] (alternate option)
- partial alphanumeric_keys
-+xkb_symbols "cherryblueb" {
-+ name[Group1]= "Cherry CyMotion Master XPress";
-+
-+ key <I0B> { [ XF86ScrollUp ] };
-+ key <I12> { [ XF86ScrollDown ] };
-+ key <I17> { [ XF86Cut ] };
-+ key <I0A> { [ XF86Copy ] };
-+ key <I18> { [ XF86Paste ] };
-+ key <I71> { [ XF86Book ] };
-+ key <I2C> { [ XF86Book ] };
-+ key <I72> { [ XF86Book ] };
-+ key <I07> { [ XF86Forward ] };
-+ key <I08> { [ XF86Back ] };
-+ key <I2E> { [ XF86AudioLowerVolume ] };
-+ key <I30> { [ XF86AudioRaiseVolume ] };
-+ key <I20> { [ XF86AudioMute ] };
-+ key <I6D> { [ XF86AudioMedia ] };
-+ key <I67> { [ XF86AudioRewind ] };
-+ key <I10> { [ XF86Back ] };
-+ key <I19> { [ XF86Forward ] };
-+ key <I70> { [ XF86Eject ] };
-+ key <I32> { [ XF86Finance ] };
-+ key <I6A> { [ XF86Back ] };
-+ key <I69> { [ XF86Forward ] };
-+ key <I68> { [ XF86Stop ] };
-+ key <FK16> { [ XF86Reload ] };
-+ key <I65> { [ XF86Search ] };
-+ key <I66> { [ XF86MyComputer ] };
-+ key <I02> { [ XF86HomePage ] };
-+ key <I6C> { [ XF86Mail ] };
-+ key <PRSC> { [ XF86Terminal ] };
-+ key <I21> { [ XF86Calculator ] };
-+ key <I1E> { [ XF86AudioRaiseVolume ] };
-+ key <I26> { [ XF86AudioMute ] };
-+ key <I25> { [ XF86AudioLowerVolume ] };
-+ key <XFER> { [ XF86Go ] };
-+ key <I24> { [ XF86AudioStop ] };
-+ key <I22> { [ XF86AudioPlay, XF86AudioPause ] };
-+ key <I63> { [ XF86Standby ] };
-+};
-+
-+partial alphanumeric_keys
- xkb_symbols "cherrybluea" {
- key <I6A> { [ XF86Back ] };
- key <I69> { [ XF86Forward ] };
diff --git a/debian/patches/02_xkb_symbols_euro_support.diff
b/debian/patches/02_xkb_symbols_euro_support.diff
deleted file mode 100644
index 29923de..0000000
--- a/debian/patches/02_xkb_symbols_euro_support.diff
+++ /dev/null
@@ -1,72 +0,0 @@
-$Id: 013a_xkb_symbols_euro_support.diff 396 2005-07-22 21:45:02Z dnusinow $
-
-This patch by Mike A. Harris.
-
-Not submitted upstream yet.
-
-Index: xc/programs/xkbcomp/symbols/hu
-===================================================================
---- xc.orig/programs/xkbcomp/symbols/hu 2005-06-26 06:51:37.000000000
+0800
-+++ xc/programs/xkbcomp/symbols/hu 2005-06-26 12:12:46.000000000 +0800
-@@ -246,6 +246,8 @@
- [ backslash ] };
- key <AD02> { [ w, W ],
- [ bar ] };
-+ key <AD07> { [ u, U ],
-+ [ EuroSign ] };
- key <AD08> { [ i, I ],
- [ Iacute ] };
- key <AD12> { [ uacute, Uacute ],
-Index: xc/programs/xkbcomp/symbols/hu_US
-===================================================================
---- xc.orig/programs/xkbcomp/symbols/hu_US 2005-06-26 06:51:37.000000000
+0800
-+++ xc/programs/xkbcomp/symbols/hu_US 2005-06-26 12:12:46.000000000 +0800
-@@ -44,6 +44,8 @@
- key <AD02> { [ w, W ],
- [ bar ] };
- key <AD06> { [ z, Z ] };
-+ key <AD07> { [ u, U ],
-+ [ EuroSign ] };
- key <AD08> { [ i, I ],
- [ Iacute ] };
- // key <AD11> { [ odoubleacute, Odoubleacute ],
-Index: xc/programs/xkbcomp/symbols/pl
-===================================================================
---- xc.orig/programs/xkbcomp/symbols/pl 2005-06-26 06:51:37.000000000
+0800
-+++ xc/programs/xkbcomp/symbols/pl 2005-06-26 12:12:46.000000000 +0800
-@@ -25,6 +25,8 @@
- [ lstroke, Lstroke ] };
- key <AB06> { [ ],
- [ nacute, Nacute ] };
-+ key <AD07> { [ ],
-+ [ EuroSign ] };
- key <AD09> { [ ],
- [ oacute, Oacute ] };
- key <AC02> { [ ],
-Index: xc/programs/xkbcomp/symbols/pl2
-===================================================================
---- xc.orig/programs/xkbcomp/symbols/pl2 2005-06-26 06:51:37.000000000
+0800
-+++ xc/programs/xkbcomp/symbols/pl2 2005-06-26 12:12:46.000000000 +0800
-@@ -45,7 +45,8 @@
- key <AD04> { [ r, R ] };
- key <AD05> { [ t, T ] };
- key <AD06> { [ z, Z ] };
-- key <AD07> { [ u, U ] };
-+ key <AD07> { [ u, U ],
-+ [ EuroSign ] };
- key <AD08> { [ i, I ] };
- key <AD09> { [ o, O ] };
- key <AD10> { [ p, P ] };
-Index: xc/programs/xkbcomp/symbols/tr
-===================================================================
---- xc.orig/programs/xkbcomp/symbols/tr 2005-06-26 06:51:37.000000000
+0800
-+++ xc/programs/xkbcomp/symbols/tr 2005-06-26 12:12:46.000000000 +0800
-@@ -37,6 +37,8 @@
- key <AE11> { [ asterisk, question ],
- [ backslash ] };
- key <AE12> { [ minus, underscore ] };
-+ key <AD03> { [ e, E ],
-+ [ EuroSign ] };
- key <AD08> { [ idotless, I ] };
- key <AD11> { [ gbreve, Gbreve ] };
- key <AD12> { [ udiaeresis, Udiaeresis ],
diff --git a/debian/patches/03_drop_rules_xorg_duplicates.diff
b/debian/patches/03_drop_rules_xorg_duplicates.diff
deleted file mode 100644
index 8e2a386..0000000
--- a/debian/patches/03_drop_rules_xorg_duplicates.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: xkbdata-X11R7.0-1.0.1/rules/xorg
-===================================================================
---- xkbdata-X11R7.0-1.0.1.orig/rules/xorg 2006-01-26 21:46:48.000000000
-0500
-+++ xkbdata-X11R7.0-1.0.1/rules/xorg 2006-02-26 20:18:18.000000000 -0500
-@@ -943,59 +943,6 @@
- eurosign:e = +eurosign(e)
- eurosign:5 = +eurosign(5)
- eurosign:2 = +eurosign(2)
-- grp:switch = +group(switch)
-- grp:lswitch = +group(lswitch)
-- grp:win_switch = +group(win_switch)
-- grp:lwin_switch = +group(lwin_switch)
-- grp:rwin_switch = +group(rwin_switch)
-- grp:toggle = +group(toggle)
-- grp:shifts_toggle = +group(shifts_toggle)
-- grp:ctrls_toggle = +group(ctrls_toggle)
-- grp:alts_toggle = +group(alts_toggle)
-- grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
-- grp:caps_toggle = +group(caps_toggle)
-- grp:shift_caps_toggle = +group(shift_caps_toggle)
-- grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
-- grp:alt_shift_toggle = +group(alt_shift_toggle)
-- grp:menu_toggle = +group(menu_toggle)
-- grp:lwin_toggle = +group(lwin_toggle)
-- grp:rwin_toggle = +group(rwin_toggle)
-- grp:lshift_toggle = +group(lshift_toggle)
-- grp:rshift_toggle = +group(rshift_toggle)
-- grp:lctrl_toggle = +group(lctrl_toggle)
-- grp:rctrl_toggle = +group(rctrl_toggle)
-- grp:lalt_toggle = +group(lalt_toggle)
-- lv3:switch = +level3(switch)
-- lv3:ralt_switch = +level3(ralt_switch)
-- lv3:lalt_switch = +level3(lalt_switch)
-- lv3:alt_switch = +level3(alt_switch)
-- lv3:menu_switch = +level3(menu_switch)
-- lv3:win_switch = +level3(win_switch)
-- lv3:lwin_switch = +level3(lwin_switch)
-- lv3:rwin_switch = +level3(rwin_switch)
-- caps:capslock = +capslock(capslock)
-- caps:shiftlock = +capslock(shiftlock)
-- caps:grouplock = +capslock(grouplock)
-- ctrl:nocaps = +ctrl(nocaps)
-- ctrl:swapcaps = +ctrl(swapcaps)
-- ctrl:ctrl_ac = +ctrl(ctrl_ac)
-- ctrl:ctrl_aa = +ctrl(ctrl_aa)
-- ctrl:ctrl_ra = +ctrl(ctrl_ra)
-- altwin:menu = +altwin(menu)
-- altwin:meta_alt = +altwin(meta_alt)
-- altwin:meta_win = +altwin(meta_win)
-- altwin:left_meta_win = +altwin(left_meta_win)
-- altwin:super_win = +altwin(super_win)
-- altwin:hyper_win = +altwin(hyper_win)
-- altwin:alt_super_win = +altwin(alt_super_win)
-- compose:ralt = +compose(ralt)
-- compose:rwin = +compose(rwin)
-- compose:menu = +compose(menu)
-- compose:rctrl = +compose(rctrl)
-- srvrkeys:none = +srvr_ctrl(no_srvr_keys)
-- eurosign:e = +eurosign(e)
-- eurosign:5 = +eurosign(5)
-- eurosign:2 = +eurosign(2)
-
- ! option = compat
- grp_led:num = +lednum(group_lock)
diff --git a/debian/patches/04_czech_include_location.diff
b/debian/patches/04_czech_include_location.diff
deleted file mode 100644
index 3b07fe4..0000000
--- a/debian/patches/04_czech_include_location.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: xkbdata-X11R7.0-1.0.1/symbols/pc/cz
-===================================================================
---- xkbdata-X11R7.0-1.0.1.orig/symbols/pc/cz 2006-01-26 21:46:48.000000000
-0500
-+++ xkbdata-X11R7.0-1.0.1/symbols/pc/cz 2006-02-26 20:21:39.000000000
-0500
-@@ -78,7 +78,7 @@
-
- // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
- xkb_symbols "bksl" {
-- include "cz(basic)"
-+ include "pc/cz(basic)"
- name[Group1]= "Czechia - With <\|> key";
-
- key <BKSL> { [ backslash, bar, slash, NoSymbol ]
};
-@@ -91,7 +91,7 @@
- // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
- // 2001 by Kamil Toman <[EMAIL PROTECTED]>
-
-- include "cz(basic)"
-+ include "pc/cz(basic)"
- name[Group1]= "Czechia - qwerty";
-
- key <AB01> { [ z, Z, degree, NoSymbol ]
};
-@@ -100,7 +100,7 @@
-
- // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
- xkb_symbols "qwerty_bksl" {
-- include "cz(qwerty)"
-+ include "pc/cz(qwerty)"
-
- name[Group1]= "Czechia - qwerty, extended Backslash";
-
diff --git a/debian/patches/05_evdev_xkb.diff b/debian/patches/05_evdev_xkb.diff
deleted file mode 100644
index a826bbd..0000000
--- a/debian/patches/05_evdev_xkb.diff
+++ /dev/null
@@ -1,763 +0,0 @@
-Index: xkbdata-X11R7.0-1.0.1/keycodes/Makefile.am
-===================================================================
---- xkbdata-X11R7.0-1.0.1.orig/keycodes/Makefile.am 2006-01-26
21:46:49.000000000 -0500
-+++ xkbdata-X11R7.0-1.0.1/keycodes/Makefile.am 2006-02-26 21:38:10.000000000
-0500
-@@ -5,6 +5,7 @@
- aliases \
- amiga \
- ataritt \
-+ evdev \
- fujitsu \
- hp \
- ibm \
-Index: xkbdata-X11R7.0-1.0.1/keycodes/evdev
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xkbdata-X11R7.0-1.0.1/keycodes/evdev 2006-02-26 21:37:54.000000000
-0500
-@@ -0,0 +1,355 @@
-+// translation from evdev scancodes to something resembling xfree86 keycodes.
-+
-+default xkb_keycodes "evdev" {
-+ minimum = 8;
-+ maximum = 255;
-+
-+ <TLDE> = 49;
-+ <AE01> = 10;
-+ <AE02> = 11;
-+ <AE03> = 12;
-+ <AE04> = 13;
-+ <AE05> = 14;
-+ <AE06> = 15;
-+ <AE07> = 16;
-+ <AE08> = 17;
-+ <AE09> = 18;
-+ <AE10> = 19;
-+ <AE11> = 20;
-+ <AE12> = 21;
-+ <BKSP> = 22;
-+
-+ <TAB> = 23;
-+ <AD01> = 24;
-+ <AD02> = 25;
-+ <AD03> = 26;
-+ <AD04> = 27;
-+ <AD05> = 28;
-+ <AD06> = 29;
-+ <AD07> = 30;
-+ <AD08> = 31;
-+ <AD09> = 32;
-+ <AD10> = 33;
-+ <AD11> = 34;
-+ <AD12> = 35;
-+ <BKSL> = 51;
-+ <RTRN> = 36;
-+
-+ <CAPS> = 66;
-+ <AC01> = 38;
-+ <AC02> = 39;
-+ <AC03> = 40;
-+ <AC04> = 41;
-+ <AC05> = 42;
-+ <AC06> = 43;
-+ <AC07> = 44;
-+ <AC08> = 45;
-+ <AC09> = 46;
-+ <AC10> = 47;
-+ <AC11> = 48;
-+
-+ <LFSH> = 50;
-+ <AB01> = 52;
-+ <AB02> = 53;
-+ <AB03> = 54;
-+ <AB04> = 55;
-+ <AB05> = 56;
-+ <AB06> = 57;
-+ <AB07> = 58;
-+ <AB08> = 59;
-+ <AB09> = 60;
-+ <AB10> = 61;
-+ <RTSH> = 62;
-+
-+ <LALT> = 64;
-+ <LCTL> = 37;
-+ <SPCE> = 65;
-+ <RCTL> = 105;
-+ <RALT> = 108;
-+ // Microsoft keyboard extra keys
-+ <LWIN> = 133;
-+ <RWIN> = 134;
-+ <MENU> = 135;
-+
-+ <ESC> = 9;
-+ <FK01> = 67;
-+ <FK02> = 68;
-+ <FK03> = 69;
-+ <FK04> = 70;
-+ <FK05> = 71;
-+ <FK06> = 72;
-+ <FK07> = 73;
-+ <FK08> = 74;
-+ <FK09> = 75;
-+ <FK10> = 76;
-+ <FK11> = 95;
-+ <FK12> = 96;
-+
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
