xkb-data: Changes to 'debian-unstable'
ChangeLog | 224 +++
INSTALL | 236 +++
Makefile.am | 3
Makefile.in | 45
NEWS | 3
aclocal.m4 | 465 ++++++
compat/Makefile.am | 2
compat/Makefile.in | 37
compat/compat.dir | 1
compat/olpc | 52
config.guess | 601 ++++----
config.sub | 145 +-
configure | 2570 ++++++++++++++++++++++++++++++++++--
configure.in | 13
debian/README.Debian | 22
debian/changelog | 12
debian/control | 4
docs/Makefile.in | 35
geometry/Makefile.in | 35
geometry/digital_vndr/Makefile.in | 35
geometry/geometry.dir | 13
geometry/microsoft | 281 +++
geometry/pc | 132 -
geometry/sgi_vndr/Makefile.in | 35
intltool-extract.in | 18
intltool-merge.in | 153 +-
intltool-update.in | 10
keycodes/Makefile.in | 35
keycodes/digital_vndr/Makefile.in | 35
keycodes/evdev | 10
keycodes/keycodes.dir | 1
keycodes/sgi_vndr/Makefile.in | 35
keymap/Makefile.in | 35
keymap/digital_vndr/Makefile.in | 35
keymap/sgi_vndr/Makefile.in | 35
keymap/sun_vndr/Makefile.in | 35
po/ChangeLog | 8
po/Makefile.in | 7
po/Makefile.in.in | 218 +++
po/Makevars | 41
po/af.po | 2044 +++++++++-------------------
po/az.po | 2044 +++++++++-------------------
po/bg.po | 2633 ++++++++++++++++++++++++-------------
po/cs.po | 2041 +++++++++-------------------
po/da.po | 2044 +++++++++-------------------
po/el.po | 2173 +++++++-----------------------
po/fi.po | 1577 ++++++++++------------
po/hu.po | 1835 +++++++++++++++++--------
po/nl.po | 1119 ++++++++-------
po/rw.po | 1203 +++++++---------
po/sq.po | 2038 +++++++++-------------------
po/sv.po | 1104 ++++++++-------
po/uk.po | 1083 ++++++++-------
po/vi.po | 2262 ++++++++++++++++++++++---------
po/zh_CN.po | 2043 +++++++++-------------------
rules/Makefile.am | 28
rules/Makefile.in | 64
rules/base | 569 -------
rules/base.lists.part | 10
rules/base.lst | 69
rules/base.m_g.part | 1
rules/base.m_k.part | 4
rules/base.ml_c.part | 1
rules/base.ml_s.part | 5
rules/base.o_s.part | 5
rules/base.xml.in | 292 +++-
rules/compat/Makefile.in | 35
rules/compat/base.l2_s.part | 2
rules/compat/base.l2v2_s.part | 2
rules/compat/base.l3_s.part | 2
rules/compat/base.l3v3_s.part | 2
rules/compat/base.l4_s.part | 2
rules/compat/base.l4v4_s.part | 2
rules/compat/base.lists.part | 2
rules/compat/base.ml1_s.part | 2
rules/compat/base.ml1v1_s.part | 2
rules/compat/base.ml_s.part | 2
rules/compat/base.mlv_s.part | 2
rules/compat/layoutRename.lst | 1
rules/compat/variantRename.lst | 6
rules/merge.sh | 3
semantics/Makefile.in | 35
symbols/Makefile.am | 42
symbols/Makefile.in | 75 -
symbols/af | 187 ++
symbols/ara | 65
symbols/ba | 12
symbols/br | 253 +++
symbols/capslock | 7
symbols/cs | 2
symbols/de | 14
symbols/digital_vndr/Makefile.in | 35
symbols/dk | 10
symbols/ee | 30
symbols/es | 38
symbols/et | 8
symbols/eurosign | 19
symbols/fi | 192 +-
symbols/fr | 62
symbols/fujitsu_vndr/Makefile.in | 35
symbols/ge | 62
symbols/gr | 168 +-
symbols/group | 23
symbols/hp_vndr/Makefile.in | 35
symbols/hr | 10
symbols/in | 94 +
symbols/inet | 201 +-
symbols/kz | 20
symbols/latam | 4
symbols/level3 | 7
symbols/macintosh_vndr/Makefile.in | 35
symbols/macintosh_vndr/dk | 13
symbols/me | 53
symbols/nec_vndr/Makefile.in | 35
symbols/ng | 63
symbols/np | 57
symbols/olpc | 22
symbols/pk | 284 ++-
symbols/pl | 115 +
symbols/pt | 122 +
symbols/ro | 28
symbols/rs | 261 +++
symbols/ru | 47
symbols/sgi_vndr/Makefile.in | 35
symbols/shift | 19
symbols/si | 12
symbols/sony_vndr/Makefile.in | 35
symbols/sun_vndr/Makefile.in | 35
symbols/sun_vndr/cs | 2
symbols/sun_vndr/cz | 2
symbols/sun_vndr/de | 2
symbols/sun_vndr/dk | 2
symbols/sun_vndr/fr | 4
symbols/sun_vndr/gb | 4
symbols/sun_vndr/gr | 2
symbols/sun_vndr/it | 2
symbols/sun_vndr/jp | 10
symbols/sun_vndr/ko | 6
symbols/sun_vndr/nl | 2
symbols/sun_vndr/no | 2
symbols/sun_vndr/pl | 2
symbols/sun_vndr/ru | 2
symbols/sun_vndr/sw | 4
symbols/sun_vndr/tr | 2
symbols/sun_vndr/tuv | 4
symbols/sun_vndr/tw | 2
symbols/sun_vndr/us | 28
symbols/symbols.dir | 166 +-
symbols/th | 63
symbols/tr | 61
symbols/ua | 45
symbols/us | 147 +-
symbols/xfree68_vndr/Makefile.in | 35
types/Makefile.in | 35
types/extra | 33
xkeyboard-config.spec | 2
156 files changed, 20731 insertions(+), 17026 deletions(-)
New commits:
commit bd04cc7ea64c5ad21da9c1da6ba2873f06328e6f
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date: Fri Jan 4 23:05:09 2008 +0100
* New upstream CVS snapshot from January 4th 2008:
+ fix Latin American layout. (Closes: #444035)
+ fix Cherry CyMotion Master Linux layout. (Closes: #343929)
+ fix HP Compaq nx9020 layout. (Closes: #395883)
+ split Serbia and Montenegro. (Closes: #451622)
* debian/control:
+ bump Standards-Version to 3.7.3.
+ use Vcs-Git and Vcs-Browser fields.
diff --git a/ChangeLog b/ChangeLog
index 3383f6d..6379cb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,225 @@
+2008-01-04 Sergey Udaltsov
+
+ * symbols/inet, rules/base.lists.part, rules/base.xml.in: adding BTC
+ 6301URF, https://bugs.freedesktop.org/show_bug.cgi?id=13913
+
+2008-01-03 Sergey Udaltsov
+
+ * symbols/pl, rules/base.xml.in: added pl(ru_phonetic_dvorak),
+ https://bugs.freedesktop.org/show_bug.cgi?id=13900
+
+2008-01-02 Sergey Udaltsov
+
+ * symbols/ro, rules/base.xml.in: small fixes for Romanian visible
+ strings from
+ https://bugs.freedesktop.org/show_bug.cgi?id=13277
+ * rules/base.xml.in, rules/compat/variantRename.lst, symbols/fr,
+ symbols/ge: moving ge(azerty_tscapo) to fr(geo), since that layout is
+ only used in France, closing
+ https://bugs.freedesktop.org/show_bug.cgi?id=13644
+ * symbols/ara: remove presentation forms from Arabic layout,
+ https://bugs.freedesktop.org/show_bug.cgi?id=13894
+
+2007-12-31 Sergey Udaltsov
+
+ * symbols/ro, rules/base.xml.in, rules/compat/variantRename.lst:
+ temporarily (partially) reverting
+ https://bugs.freedesktop.org/show_bug.cgi?id=13277
+
+2007-12-27 Sergey Udaltsov
+
+ * rules/base.o_s.part, rules/base.xml.in, symbols/capslock: adding xkb
+ option caps:swapescape,
+ https://bugs.freedesktop.org/show_bug.cgi?id=13824
+
+2007-12-26 Sergey Udaltsov
+
+ * symbols/ee, rules/base.xml.in: adding ee(us), polishing eurosign
+ usage in ee, https://bugs.freedesktop.org/show_bug.cgi?id=13799
+
+2007-12-25 Sergey Udaltsov
+
+ * symbols/eurosign, rules/base.xml.in, rules/base.o_s.part: add
+ eurosign(4)
+
+2007-12-23 Sergey Udaltsov
+
+ * symbols/inet, rules/base.xml.in: add logiultrax model,
+ https://bugs.freedesktop.org/show_bug.cgi?id=13028
+ * symbols/me, rules/base.xml.in: use Latin as default Montenegro
+ variant, https://bugs.freedesktop.org/show_bug.cgi?id=13777
+ * symbols/inet, keycodes/evdev: Kill off the I211 key in evdev
+
+2007-12-17 Sergey Udaltsov
+
+ * keycodes/sun, rules/base.m_k.part, rules/base.ml_s.part,
+ symbols/sun_vndr/cs, symbols/sun_vndr/cz, symbols/sun_vndr/de,
+ symbols/sun_vndr/dk, symbols/sun_vndr/fr, symbols/sun_vndr/gb,
+ symbols/sun_vndr/gr, symbols/sun_vndr/it, symbols/sun_vndr/jp,
+ symbols/sun_vndr/ko, symbols/sun_vndr/nl, symbols/sun_vndr/no,
+ symbols/sun_vndr/pl, symbols/sun_vndr/ru, symbols/sun_vndr/sw,
+ symbols/sun_vndr/tr, symbols/sun_vndr/tuv, symbols/sun_vndr/tw,
+ symbols/sun_vndr/us: added sun type 6 support,
+ https://bugs.freedesktop.org/show_bug.cgi?id=13664
+
+2007-12-10 Sergey Udaltsov
+
+ * symbols/inet: fixed thinkpad,
+ https://bugs.freedesktop.org/show_bug.cgi?id=13461
+
+2007-12-08 Sergey Udaltsov
+
+ * symbols/inet, rules/base.xml.in, rules/base.lists.part: added
+ fscaa1667g model, thanks to Matthew W. S. Bell
+ * symbols/gr: updated greek symbols,
+ https://bugs.freedesktop.org/show_bug.cgi?id=13570
+
+2007-11-30 Sergey Udaltsov
+
+ * symbols/us: small olpc fix
+ * symbols/inet: introducing nav_common and media_nav_common,
+ https://bugs.freedesktop.org/show_bug.cgi?id=13461
+
+2007-11-21 Sergey Udaltsov
+
+ * symbols/np, rules/base.lists.part: added np(olpc)
+ * symbols/et, rules/base.lists.part: added et(olpc)
+ * symbols/in: small fix in in(ben_probhat),
+ https://bugs.freedesktop.org/show_bug.cgi?id=12038
+
+2007-11-20 Sergey Udaltsov
+
+ * symbols/af, symbols/kz, symbols/ng, rules/base.xml.in: OLPC fixes
+ from Bernardo
+ * symbols/pk, rules/base.xml.in: fixing pk(ara) - it is not default
+
+2007-11-18 Sergey Udaltsov
+
+ * symbols/ro, rules/base.xml.in, rules/compat/variantRename.lst:
+ ro(comma), ro(academic) --> ro(cedilla), ro(std_cedilla),
+ https://bugs.freedesktop.org/show_bug.cgi?id=13277
+
+2007-11-17 Sergey Udaltsov
+
+ * symbols/ua, rules/base.xml.in: added ua(unicode)
+
+2007-11-15 Sergey Udaltsov
+
+ * symbols/olpc, keycodes/es: small OLPC fixes
+
+2007-11-14 Sergey Udaltsov
+
+ * symbols/inet, keycodes/evdev: revert #12203
+ https://bugs.freedesktop.org/show_bug.cgi?id=12227
+
+2007-11-01 Sergey Udaltsov
+
+ * symbols/fi, rules/base.xml.in: swapping fi(basic) and fi(kotoistus),
+ https://bugs.freedesktop.org/show_bug.cgi?id=12764
+
+2007-10-28 Sergey Udaltsov
+
+ * symbols/ara, symbols/us, symbols/es, symbols/us, symbols/ng: OLPC
+ fixlets
+
+2007-10-23 Sergey Udaltsov
+
+ * symbols/ru, rules/base.xml.in: added ru(kom),
+ https://bugs.freedesktop.org/show_bug.cgi?id=12893
+
+2007-10-21 Sergey Udaltsov
+
+ * symbols/us, rules/base.xml.in: added us(dvorak-intl),
+ https://bugs.freedesktop.org/show_bug.cgi?id=12867
+ * symbols/macintosh_vndr/dk: dk(macbookpro),
+ https://bugs.freedesktop.org/show_bug.cgi?id=12716
+
+2007-10-19 Sergey Udaltsov
+
+ * symbols/tr, rules/base.xml.in: added tr(intl),
+ https://bugs.freedesktop.org/show_bug.cgi?id=12856
+
+2007-10-18 Sergey Udaltsov
+
+ * geometry/pc, rules/base.xml.in, rules/compat/base.lists.part,
+ symbols/br, symbols/pt: added some br and pt layouts,
+ https://bugs.freedesktop.org/show_bug.cgi?id=12816
+ * rules/base.xml.in symbols/dk: added dk(dvorak),
+ https://bugs.freedesktop.org/show_bug.cgi?id=12837
+
+2007-10-13 Sergey Udaltsov
+
+ * symbols/inet, rules/base.lists.part, rules/base.xml.in: added diNovo
+ Edge, https://bugs.freedesktop.org/show_bug.cgi?id=12789
+
+2007-10-10 Sergey Udaltsov
+
+ * rules/base.xml.in, rules/base.m_g.part: added microsoftelite model,
+ https://bugs.freedesktop.org/show_bug.cgi?id=12753
+ * symbols/fi: fixed fi(kotoistus),
+ https://bugs.freedesktop.org/show_bug.cgi?id=12764
+
+2007-10-09 Sergey Udaltsov
+
+ * geometry/microsoft: added "elite" geometry,
+ https://bugs.freedesktop.org/show_bug.cgi?id=12753
+ * symbols/us: fix for olpc
+
+2007-10-07 Sergey Udaltsov
+
+ * symbols/kz, rules/base.lists.part: added kz(olpc)
+ * symbols/pk: fixed pk(olpc)
+ * rules/base.xml.in: lost vendors,
+ https://bugs.freedesktop.org/show_bug.cgi?id=12719
+ * symbols/inet, rules/base.lists.part, rules/base.xml.in: added
+ chicony0108 model,
+ https://bugs.freedesktop.org/show_bug.cgi?id=6914
+ * symbols/de, types/extra: SS hangling,
+ https://bugs.freedesktop.org/show_bug.cgi?id=7642
+
+2007-10-04 Sergey Udaltsov
+
+ * symbols/us: s/U.S. English/USA/
+ * rules/base.o_s.part, rules/base.xml.in,
+ rules/compat/layoutRename.lst, symbols/Makefile.am, symbols/cs,
+ symbols/me, symbols/rs, symbols/ba, symbols/hr, symbols/si: splitting
+ Serbia and Montenegro
+ https://bugs.freedesktop.org/show_bug.cgi?id=12390
+
+2007-10-02 Sergey Udaltsov
+
+ * symbols/inet: fixing dell inspiron,
+ https://bugs.freedesktop.org/show_bug.cgi?id=12653
+ * configure.in, rules/Makefile.am, po/ChangeLog: dropping translations
+ from base.xml, let apps/libs use .gmo files instead
+
+2007-09-27 Sergey Udaltsov
+
+ * symbols/shift, symbols/Makefile.am, rules/base.o_s.part: added
+ shift:breaks_caps, https://bugs.freedesktop.org/show_bug.cgi?id=9546
+
+2007-09-26 Sergey Udaltsov
+
+ * symbols/latam: no dead_tilde,
+ https://bugs.freedesktop.org/show_bug.cgi?id=12568
+ * rules/base.xml.in, symbols/in: added mal_lalitha, small fixes,
+ https://bugs.freedesktop.org/show_bug.cgi?id=12426
+ * rules/base.lists.part, rules/base.m_k.part, rules/base.ml_c.part,
+ rules/base.ml_s.part, rules/base.xml.in, rules/merge.sh,
+ symbols/Makefile.am, symbols/ara, symbols/br, symbols/es,
+ symbols/group, symbols/inet, symbols/level3, symbols/ng, symbols/olpc,
+ symbols/pk, symbols/ru, symbols/th, symbols/tr, symbols/us: massive
+ patch from OLPC project
+
+2007-09-25 Sergey Udaltsov
+
+ * NEWS, configure.in: preparing release 1.1
+
+2007-09-24 Sergey Udaltsov
+
+ * symbols/inet: added extra key for nx9020
+ https://bugs.freedesktop.org/show_bug.cgi?id=7310
+
2007-09-14 Sergey Udaltsov
* symbols/inet: small fixes in cymotionlinux,
@@ -1682,7 +1904,7 @@
2004-09-13 22:39 svu
- * symbols/tj: new local cvs keyword seems to be ok - no more $Id: ChangeLog,v 1.331 2007-09-14 22:12:47 svu Exp $
+ * symbols/tj: new local cvs keyword seems to be ok - no more $Id: ChangeLog,v 1.387 2008-01-04 21:07:52 svu Exp $
2004-09-13 22:38 svu
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..23e5f25
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,236 @@
+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/Makefile.am b/Makefile.am
index e76be4c..b044dc1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,3 +22,6 @@ install-xkbcomp:
endif
install-data-hook: install-xkbcomp
+
+sync-po:
+ rsync -Lrtvz translationproject.org::tp/latest/xkeyboard-config/ po
diff --git a/Makefile.in b/Makefile.in
index 537b16a..0b4c20d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,11 +33,14 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-subdir = .
+build_triplet = @build@
+host_triplet = @host@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/xkeyboard-config.spec.in \
$(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
- NEWS TODO config.rpath install-sh missing
+ NEWS TODO config.guess config.rpath config.sub install-sh \
+ missing
+subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -77,9 +80,12 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
@@ -92,23 +98,28 @@ DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+EGREP = @EGREP@
EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -120,7 +131,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
@@ -131,6 +141,10 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -139,12 +153,18 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
ac_ct_CC = @ac_ct_CC@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
@@ -155,13 +175,21 @@ am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
+build = @build@
build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+host = @host@
host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
@@ -367,7 +395,7 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/.
+ $(mkdir_p) $(distdir)/. $(distdir)/po
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -613,6 +641,9 @@ uninstall-info: uninstall-info-recursive
@CREATE_XKBCOMP_SYMLINK_FALSE@install-xkbcomp:
install-data-hook: install-xkbcomp
+
+sync-po:
+ rsync -Lrtvz translationproject.org::tp/latest/xkeyboard-config/ po
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/NEWS b/NEWS
index 8da35c3..c7c7510 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+1.0 First time-based release. Bugfixes (27). Updated/new translations, renewed relations with TP. Renamed (for clarity) types. Some new layouts and models.
+0.9 Maintenance release. Bugfixes (76). Updated/new translations. Updated/new layouts.
+0.8 Maintenance release. Bugfixes. Updated/new translations. Updated/new layouts.
1.0 Maintenance release. Bugfixes (72). Updated/new translations. Updated/new layouts and models.
0.9 Maintenance release. Bugfixes (76). Updated/new translations. Updated/new layouts.
0.8 Maintenance release. Bugfixes. Updated/new translations. Updated/new layouts.
diff --git a/aclocal.m4 b/aclocal.m4
index ca2994c..d762210 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -11,9 +11,443 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License. As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# This file can be copied and used freely without restrictions. It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+#
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
+#
+# Modified to never use included libintl.
+# Owen Taylor <otaylor@redhat.com>, 12/15/1998
+#
+# Major rework to remove unused code
+# Owen Taylor <otaylor@redhat.com>, 12/11/2002
+#
+# Added better handling of ALL_LINGUAS from GNU gettext version
+# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
+#
+# Modified to require ngettext
+# Matthias Clasen <mclasen@redhat.com> 08/06/2004
+#
+# We need this here as well, since someone might use autoconf-2.5x
+# to configure GLib then an older version to configure a package
+# using AM_GLIB_GNU_GETTEXT
+AC_PREREQ(2.53)
+
+dnl
+dnl We go to great lengths to make sure that aclocal won't
+dnl try to pull in the installed version of these macros
+dnl when running aclocal in the glib directory.
+dnl
+m4_copy([AC_DEFUN],[glib_DEFUN])
+m4_copy([AC_REQUIRE],[glib_REQUIRE])
+dnl
+dnl At the end, if we're not within glib, we'll define the public
+dnl definitions in terms of our private definitions.
+dnl
+
+# GLIB_LC_MESSAGES
+#--------------------
+glib_DEFUN([GLIB_LC_MESSAGES],
+ [AC_CHECK_HEADERS([locale.h])
+ if test $ac_cv_header_locale_h = yes; then
+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+ if test $am_cv_val_LC_MESSAGES = yes; then
+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
+ [Define if your <locale.h> file defines LC_MESSAGES.])
+ fi
+ fi])
+
+# GLIB_PATH_PROG_WITH_TEST
+#----------------------------
+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
+[# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+ /*)
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if [$3]; then
+ ac_cv_path_$1="$ac_dir/$ac_word"
+ break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+ ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+ AC_MSG_RESULT([$]$1)
+else
+ AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
+
+# GLIB_WITH_NLS
+#-----------------
+glib_DEFUN([GLIB_WITH_NLS],
+ dnl NLS is obligatory
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ USE_NLS=yes
+ AC_SUBST(USE_NLS)
+
+ gt_cv_have_gettext=no
+
+ CATOBJEXT=NONE
+ XGETTEXT=:
+ INTLLIBS=
+
+ AC_CHECK_HEADER(libintl.h,
+ [gt_cv_func_dgettext_libintl="no"
+ libintl_extra_libs=""
+
+ #
+ # First check in libc
+ #
+ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
+ [AC_TRY_LINK([
+#include <libintl.h>
+],
+ [return !ngettext ("","", 1)],
+ gt_cv_func_ngettext_libc=yes,
+ gt_cv_func_ngettext_libc=no)
+ ])
+
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+ [AC_TRY_LINK([
+#include <libintl.h>
+],
+ [return !dgettext ("","")],
+ gt_cv_func_dgettext_libc=yes,
+ gt_cv_func_dgettext_libc=no)
+ ])
+ fi
+
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+ AC_CHECK_FUNCS(bind_textdomain_codeset)
+ fi
+
+ #
+ # If we don't have everything we want, check in libintl
+ #
+ if test "$gt_cv_func_dgettext_libc" != "yes" \
+ || test "$gt_cv_func_ngettext_libc" != "yes" \
+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+
+ AC_CHECK_LIB(intl, bindtextdomain,
+ [AC_CHECK_LIB(intl, ngettext,
+ [AC_CHECK_LIB(intl, dgettext,
+ gt_cv_func_dgettext_libintl=yes)])])
+
+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+ AC_MSG_CHECKING([if -liconv is needed to use gettext])
+ AC_MSG_RESULT([])
+ AC_CHECK_LIB(intl, ngettext,
+ [AC_CHECK_LIB(intl, dcgettext,
+ [gt_cv_func_dgettext_libintl=yes
+ libintl_extra_libs=-liconv],
+ :,-liconv)],
+ :,-liconv)
+ fi
+
+ #
+ # If we found libintl, then check in it for bind_textdomain_codeset();
+ # we'll prefer libc if neither have bind_textdomain_codeset(),
+ # and both have dgettext and ngettext
+ #
Reply to: