xkb-data: Changes to 'debian-unstable'
AUTHORS | 6
ChangeLog | 263 +
INSTALL | 236
Makefile.am | 8
Makefile.in | 29
aclocal.m4 | 305 +
compat/Makefile.in | 24
compat/compat.dir | 36
compat/complete | 2
compat/default | 2
compat/level5 | 2
compat/misc | 2
configure | 1619 ++++++
configure.in | 28
debian/changelog | 44
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/backports/001_fix_us_layout.diff | 18
debian/patches/bz1576.diff | 202
debian/patches/bz8668.diff | 53
debian/patches/clean.diff | 18
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/mac_poweroff.diff | 8
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/sclk_toggle.diff | 24
debian/patches/send-upstream/001_keypad_comma.diff | 41
debian/patches/send-upstream/002_add_asus6000.diff | 69
debian/patches/series | 15
debian/patches/unhide_lv3_enter_switch.diff | 26
debian/patches/uz.diff | 86
debian/watch | 2
docs/Makefile.in | 22
geometry/Makefile.in | 24
geometry/digital_vndr/Makefile.in | 22
geometry/geometry.dir | 126
geometry/pc | 4
geometry/sgi_vndr/Makefile.in | 22
intltool-extract.in | 381 +
intltool-merge.in | 172
intltool-update.in | 127
keycodes/Makefile.am | 1
keycodes/Makefile.in | 25
keycodes/digital_vndr/Makefile.in | 22
keycodes/keycodes.dir | 129
keycodes/powerpcps2 | 134
keycodes/sgi_vndr/Makefile.in | 22
keycodes/xfree86 | 11
keymap/Makefile.in | 24
keymap/digital_vndr/Makefile.in | 22
keymap/keymap.dir | 448 -
keymap/sgi_vndr/Makefile.in | 22
keymap/sun_vndr/Makefile.in | 22
po/ChangeLog | 32
po/Makefile.in | 22
po/POTFILES | 3
po/POTFILES.in | 1
po/af.po | 1350 +----
po/az.po | 1350 +----
po/bg.po | 1321 +----
po/cs.po | 1350 +----
po/da.po | 1350 +----
po/el.po | 1336 +----
po/en_GB.po | 1359 +----
po/fi.po | 426 -
po/fr.po | 174
po/hu.po | 249
po/it.po | 1519 ++---
po/ka.po | 1576 +++---
po/ko.po | 2556 ++++++++++
po/nl.po | 1456 +----
po/ru.po | 1487 +++--
po/rw.po | 1321 +----
po/sk.po | 1350 +----
po/sl.po | 361 -
po/sq.po | 1350 +----
po/sr.po | 1265 +---
po/sr@Latn.po | 1370 +----
po/sv.po | 1869 ++++---
po/tr.po | 900 ---
po/uk.po | 408 -
po/vi.po | 1359 +----
po/zh_CN.po | 1350 +----
po/zh_TW.po | 1449 +----
rules/HDR | 1
rules/Makefile.am | 12
rules/Makefile.in | 34
rules/base | 26
rules/base.lists.part | 11
rules/base.lst | 43
rules/base.m_g.part | 2
rules/base.m_k.part | 1
rules/base.ml_g.part | 2
rules/base.ml_s.part | 2
rules/base.o_s.part | 6
rules/base.xml.in | 244
rules/compat/Makefile.in | 22
rules/sun.xml.in | 932 +++
semantics/Makefile.in | 24
semantics/semantics.dir | 4
symbols/Makefile.am | 2
symbols/Makefile.in | 26
symbols/ad | 2
symbols/af | 2
symbols/al | 2
symbols/altwin | 10
symbols/am | 16
symbols/ara | 2
symbols/az | 2
symbols/ba | 2
symbols/bd | 2
symbols/be | 2
symbols/bg | 2
symbols/br | 4
symbols/bt | 2
symbols/by | 2
symbols/ca | 4
symbols/capslock | 2
symbols/cd | 18
symbols/ch | 2
symbols/compose | 2
symbols/cs | 2
symbols/ctrl | 2
symbols/cz | 2
symbols/de | 2
symbols/digital_vndr/Makefile.in | 22
symbols/dk | 2
symbols/ee | 2
symbols/epo | 49
symbols/es | 5
symbols/eurosign | 2
symbols/fi | 132
symbols/fo | 2
symbols/fr | 180
symbols/fujitsu_vndr/Makefile.in | 22
symbols/gb | 2
symbols/ge | 382 +
symbols/gh | 2
symbols/gr | 2
symbols/group | 15
symbols/hp_vndr/Makefile.in | 22
symbols/hr | 2
symbols/hu | 2
symbols/ie | 2
symbols/il | 77
symbols/in | 130
symbols/inet | 183
symbols/iq | 2
symbols/ir | 8
symbols/is | 2
symbols/it | 4
symbols/jp | 170
symbols/keypad | 2
symbols/kg | 2
symbols/kh | 2
symbols/kr | 3
symbols/kz | 2
symbols/la | 2
symbols/latam | 2
symbols/latin | 2
symbols/level3 | 33
symbols/level5 | 2
symbols/lk | 2
symbols/lt | 2
symbols/lv | 2
symbols/ma | 325 +
symbols/macintosh_vndr/Makefile.am | 2
symbols/macintosh_vndr/Makefile.in | 24
symbols/macintosh_vndr/ch | 2
symbols/macintosh_vndr/dk | 5
symbols/macintosh_vndr/es | 34
symbols/macintosh_vndr/fr | 121
symbols/macintosh_vndr/is | 2
symbols/macintosh_vndr/it | 2
symbols/macintosh_vndr/latam | 38
symbols/macintosh_vndr/no | 1
symbols/macintosh_vndr/pt | 1
symbols/macintosh_vndr/se | 1
symbols/macintosh_vndr/us | 12
symbols/mao | 2
symbols/mk | 2
symbols/mm | 2
symbols/mn | 2
symbols/mt | 2
symbols/mv | 2
symbols/nbsp | 41
symbols/nec_vndr/Makefile.in | 22
symbols/ng | 3
symbols/nl | 84
symbols/no | 2
symbols/np | 2
symbols/pc | 8
symbols/pk | 2
symbols/pl | 2
symbols/pt | 2
symbols/ro | 2
symbols/ru | 2
symbols/se | 49
symbols/sgi_vndr/Makefile.in | 22
symbols/si | 2
symbols/sk | 2
symbols/sony_vndr/Makefile.in | 22
symbols/srvr_ctrl | 2
symbols/sun_vndr/Makefile.in | 22
symbols/sy | 2
symbols/symbols.dir | 1036 ++--
symbols/th | 2
symbols/tj | 2
symbols/tr | 2
symbols/ua | 2
symbols/us | 18
symbols/uz | 39
symbols/vn | 2
symbols/xfree68_vndr/Makefile.in | 22
symbols/za | 2
types/Makefile.in | 24
types/complete | 2
types/default | 2
types/level5 | 2
types/types.dir | 14
xkbrules.am | 3
xkeyboard-config.spec | 2
xkeyboard-config.spec.in | 2
276 files changed, 26073 insertions(+), 26109 deletions(-)
New commits:
commit 0d6c6efdb89df678812020c4c9dfac9bbc9eaa7a
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jun 3 18:33:04 2007 +0200
Fix watch file.
diff --git a/debian/changelog b/debian/changelog
index 0617d7e..6867400 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,10 @@ xkeyboard-config (0.9+cvs.20070428-2) UNRELEASED; urgency=low
* Patches backported from upstream:
+ 001_fix_us.diff: fix us layout. (Closes: #421532)
- -- Mohammed Adnène Trojette <adn+deb@diwi.org> Mon, 30 Apr 2007 00:12:26 +0200
+ [ Julien Cristau ]
+ * Fix watch file to look for tarballs at http://xlibs.fd.o/xkbdesc/
+
+ -- Mohammed Adnène Trojette <adn+deb@diwi.org> Sun, 03 Jun 2007 18:32:13 +0200
xkeyboard-config (0.9+cvs.20070428-1) experimental; urgency=low
diff --git a/debian/watch b/debian/watch
index 17286c6..9f7c7f0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://xorg.freedesktop.org/releases/individual/data/ xkbdata-(.*)\.tar\.gz
+http://xlibs.freedesktop.org/xkbdesc/ xkeyboard-config-(.*)\.tar\.gz
commit a89c54aa311859687e618b7ab2de1c45b1ea736c
Author: Mohammed Adnene Trojette <adn@uracile.localdomain>
Date: Mon Apr 30 00:20:08 2007 +0200
Fix US layout (001_fix_us_layout.diff)
+ Debian bug #421532
+ X.org bugs #8789 and #10811
Add keypad:comma (001_keypad_comma.diff)
+ Debian bug #409117 to forward
Add Asus 6000 series laptop layout
+ Debian bug #383953 to forward
diff --git a/debian/changelog b/debian/changelog
index 32b5e83..0617d7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xkeyboard-config (0.9+cvs.20070428-2) UNRELEASED; urgency=low
+
+ * Patches to send upstream.
+ + 002_add_asus6000.diff: add Asus A6000 series Keyboard
+ support. (Closes: #383953)
+ * Patches backported from upstream:
+ + 001_fix_us.diff: fix us layout. (Closes: #421532)
+
+ -- Mohammed Adnène Trojette <adn+deb@diwi.org> Mon, 30 Apr 2007 00:12:26 +0200
+
xkeyboard-config (0.9+cvs.20070428-1) experimental; urgency=low
* Add myself to Uploaders. (Closes: #401777)
@@ -8,7 +18,6 @@ xkeyboard-config (0.9+cvs.20070428-1) experimental; urgency=low
+ fix keymap on iBook G4 Japanese keyboard. (Closes: #374070)
+ fix <K6C> key in symbols/inet. (Closes: #409982)
+ update Finnish layout. (Closes: #405207)
- + add Logitech Media Elite keyboard support. (Closes: #384801)
+ add Logitech Cordless Desktop Optical support. (Closes: #391192)
+ fix a jp106 backslash/yen issue. (Closes: #280579)
* Patches refreshed:
diff --git a/debian/patches/backports/001_fix_us_layout.diff b/debian/patches/backports/001_fix_us_layout.diff
new file mode 100644
index 0000000..debcb66
--- /dev/null
+++ b/debian/patches/backports/001_fix_us_layout.diff
@@ -0,0 +1,18 @@
+Index: xkb-data-experimental/symbols/us
+===================================================================
+--- xkb-data-experimental.orig/symbols/us
++++ xkb-data-experimental/symbols/us
+@@ -61,6 +61,8 @@
+ key <AB09> { [ period, greater ] };
+ key <AB10> { [ slash, question ] };
+
++ key <BKSL> { [ backslash, bar ] };
++ key <CAPS> { [ Caps_Lock ] };
+ // End alphanumeric section
+ };
+
+@@ -507,4 +509,3 @@
+ include "us"
+ name[Group1]= "U.S. English - Macintosh";
+ };
+-
diff --git a/debian/patches/send-upstream/001_keypad_comma.diff b/debian/patches/send-upstream/001_keypad_comma.diff
index 90b610f..9393376 100644
--- a/debian/patches/send-upstream/001_keypad_comma.diff
+++ b/debian/patches/send-upstream/001_keypad_comma.diff
@@ -2,7 +2,7 @@ Index: xkb-data-experimental/rules/base
===================================================================
--- xkb-data-experimental.orig/rules/base
+++ xkb-data-experimental/rules/base
-@@ -828,6 +828,7 @@
+@@ -826,6 +826,7 @@
eurosign:2 = +eurosign(2)
keypad:oss = +keypad(oss)
keypad:legacy = +keypad(legacy)
diff --git a/debian/patches/send-upstream/002_add_asus6000.diff b/debian/patches/send-upstream/002_add_asus6000.diff
new file mode 100644
index 0000000..a7bfd04
--- /dev/null
+++ b/debian/patches/send-upstream/002_add_asus6000.diff
@@ -0,0 +1,69 @@
+Index: xkb-data-experimental/rules/base
+===================================================================
+--- xkb-data-experimental.orig/rules/base
++++ xkb-data-experimental/rules/base
+@@ -34,7 +34,7 @@
+
+ ! $inetkbds = a4techKB21 a4techKBS8 a4_rfkb23 \
+ acer_c300 acer_ferrari4k acer_tm_800 \
+- acpi airkey armada azonaRF2300 \
++ acpi airkey armada azonaRF2300 asus_6000 \
+ apple \
+ benqx730 benqx800 brother \
+ btc5113rf btc5126t btc9000 btc9000a btc9001ah btc5090 btc9019u \
+Index: xkb-data-experimental/rules/base.xml.in
+===================================================================
+--- xkb-data-experimental.orig/rules/base.xml.in
++++ xkb-data-experimental/rules/base.xml.in
+@@ -119,6 +119,12 @@
+ <model>
+ <configItem>
+ <name>azonaRF2300</name>
++ <_description>Asus A6000 series Keyboard</_description>
++ </configItem>
++ </model>
++ <model>
++ <configItem>
++ <name>asus_6000</name>
+ <_description>Azona RF2300 wireless Internet Keyboard</_description>
+ </configItem>
+ </model>
+Index: xkb-data-experimental/symbols/inet
+===================================================================
+--- xkb-data-experimental.orig/symbols/inet
++++ xkb-data-experimental/symbols/inet
+@@ -229,6 +229,22 @@
+ key <I74> { [ XF86Launch4 ] };
+ };
+
++// Asus
++
++// Asus A6000 series Keyboard
++partial alphanumeric_keys
++xkb_symbols "asus_6000" {
++ key <I20> { [ XF86AudioMute ] };
++ key <I2E> { [ XF86AudioLowerVolume ] };
++ key <I30> { [ XF86AudioRaiseVolume ] };
++ key <I6C> { [ XF86Mail ] };
++ key <I32> { [ XF86WWW ] };
++ key <I10> { [ XF86AudioPrev ] };
++ key <I19> { [ XF86AudioNext ] };
++ key <I24> { [ XF86AudioStop ] };
++ key <I22> { [ XF86AudioPlay ] };
++};
++
+ // Azona
+
+ // Azona RF2300 wireless Internet Keyboard
+Index: xkb-data-experimental/symbols/symbols.dir
+===================================================================
+--- xkb-data-experimental.orig/symbols/symbols.dir
++++ xkb-data-experimental/symbols/symbols.dir
+@@ -282,6 +282,7 @@
+ --p----- a------- inet(airkey)
+ --p----- -------- inet(apple)
+ --p----- a------- inet(armada)
++--p----- a------- inet(asus_6000)
+ --p----- a------- inet(azonaRF2300)
+ --p----- a------- inet(brother)
+ --p----- a------- inet(btc5090)
diff --git a/debian/patches/series b/debian/patches/series
index c331b3b..9ca176b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,5 @@ greek.diff
#japan.diff
resync_rules_base.diff
send-upstream/001_keypad_comma.diff
+send-upstream/002_add_asus6000.diff
+backports/001_fix_us_layout.diff
commit 62fe415ef73968139af8c1998bdb98a4aa2487cf
Author: Mohammed Adnene Trojette <adn@uracile.localdomain>
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 ] };
Reply to: