debian/changelog | 10 debian/copyright | 4 debian/patches/series | 2 setxkbmap/ChangeLog | 278 ++++++++- setxkbmap/INSTALL | 236 -------- setxkbmap/Makefile.am | 18 setxkbmap/Makefile.in | 152 ++--- setxkbmap/aclocal.m4 | 1412 ++++++++++++++++++++++++------------------------ setxkbmap/compile | 142 ---- setxkbmap/config.h.in | 9 setxkbmap/config.sub | 14 setxkbmap/configure | 292 ++++++--- setxkbmap/configure.ac | 5 setxkbmap/depcomp | 64 ++ setxkbmap/install-sh | 348 +++++++++-- setxkbmap/missing | 61 +- setxkbmap/setxkbmap.c | 6 setxkbmap/setxkbmap.man | 59 +- 18 files changed, 1675 insertions(+), 1437 deletions(-)
New commits: commit 4cc45cf1694e0f4115a59f4be1e0a694ba313405 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Mon Aug 13 14:42:12 2007 +0200 Improvements to debian/copyright. diff --git a/debian/changelog b/debian/changelog index e1eb304..9a20a82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ x11-xkb-utils (7.2+1) UNRELEASED; urgency=low + includes man page improvements (closes: #252631) * Disable patch 11_xkb_documentation_updates.diff which doesn't apply cleanly. + * Add upstream URL to debian/copyright. - -- Julien Cristau <[EMAIL PROTECTED]> Mon, 13 Aug 2007 14:36:58 +0200 + -- Julien Cristau <[EMAIL PROTECTED]> Mon, 13 Aug 2007 14:41:37 +0200 x11-xkb-utils (0.1) experimental; urgency=low diff --git a/debian/copyright b/debian/copyright index 064a62a..688d7ba 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,3 +1,7 @@ +The contents of this package were downloaded from +http://xorg.freedesktop.org/releases/individual/app/ +It contains the setxkbmap, xkbcomp, xkbevd, xkbprint and xkbutils applications. + setxkbmap: Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc. commit addadc8047ab5841c1098392edefd18a94eb7e96 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Mon Aug 13 14:38:23 2007 +0200 Disable patch 11_xkb_documentation_updates.diff It doesn't apply cleanly, so disable it until someone manages to update it. diff --git a/debian/changelog b/debian/changelog index 4798650..e1eb304 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ x11-xkb-utils (7.2+1) UNRELEASED; urgency=low * setxkbmap 1.0.4. + includes man page improvements (closes: #252631) + * Disable patch 11_xkb_documentation_updates.diff which doesn't apply + cleanly. - -- Julien Cristau <[EMAIL PROTECTED]> Mon, 13 Aug 2007 14:33:02 +0200 + -- Julien Cristau <[EMAIL PROTECTED]> Mon, 13 Aug 2007 14:36:58 +0200 x11-xkb-utils (0.1) experimental; urgency=low diff --git a/debian/patches/series b/debian/patches/series index d8501e9..dfe5c16 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ 10_debian_add_xkbpath_env_variable.diff -p0 -11_xkb_documentation_updates.diff -p0 +#11_xkb_documentation_updates.diff -p0 commit 20b9f334cbb60bca1068b9a0576644e3ae370484 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Mon Aug 13 14:35:18 2007 +0200 setxkbmap 1.0.4. diff --git a/debian/changelog b/debian/changelog index b785a57..4798650 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x11-xkb-utils (7.2+1) UNRELEASED; urgency=low + + * setxkbmap 1.0.4. + + includes man page improvements (closes: #252631) + + -- Julien Cristau <[EMAIL PROTECTED]> Mon, 13 Aug 2007 14:33:02 +0200 + x11-xkb-utils (0.1) experimental; urgency=low [ Timo Aaltonen ] diff --git a/setxkbmap/ChangeLog b/setxkbmap/ChangeLog index 90b6f08..4319456 100644 --- a/setxkbmap/ChangeLog +++ b/setxkbmap/ChangeLog @@ -1,50 +1,266 @@ -2006-03-10 Daniel Stone <[EMAIL PROTECTED]> +commit 35d3e114ef3b0e6f56b38ddd9cac79e4c953ca85 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Jul 23 17:18:26 2007 -0700 - * configure.ac: - Bump to 1.0.2; release. + Version bump: 1.0.4 - * setxkbmap.c: - Initialise vd.variant and vd.variant to NULL when failing to get - the active RMLVO components from the server. +commit 0a9044e26d1f8a2517c8e000b6f3afb169999ff3 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Jul 23 16:45:21 2007 -0700 -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> + lint target needs to use AM_CFLAGS too - * configure.ac: - Update package version for X11R7 release. +commit c2a336b187e1f78c3bfa8fad0f2cade6cf06071d +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Jul 23 16:42:40 2007 -0700 -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> + Use AM_CFLAGS instead of setxkbmap_CFLAGS to avoid automake-1.10 warning + + Makefile.am:31: compiling `setxkbmap.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac' - * configure.ac: - Update package version number for final X11R7 release candidate. +commit 75a5110558714d5f601235fdc5762aeef731f73d +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Tue Apr 17 11:34:43 2007 -0700 -2005-12-08 Kevin E. Martin <kem-at-freedesktop-dot-org> + Minor code cleanups (remove unused static and opencoding of strdup) - * Makefile.am: - * configure.ac: - Add configure options to allow hard-coded paths to be changed. +commit f5eb468f0ca87917488bdd8bdecf9e31fce88945 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Tue Apr 17 11:17:13 2007 -0700 -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> + Add rules for checking code with sparse/lint/etc. - * Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. +commit 2d43b8fa9b21bcf9f5c289ab1afba3e73c42f661 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Apr 16 20:34:31 2007 -0700 -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> + Replace static ChangeLog with dist-hook to generate from git log - * configure.ac: - Update package version number for X11R7 RC3 release. +commit f7007821434313df1dc848a1e547922f65d4c7d5 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Apr 16 19:53:27 2007 -0700 -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> + More man page cleanups (grammatical nits, etc.) - * configure.ac: - Update package version number for X11R7 RC2 release. +commit ca1e9f1cc9716a0cb751853cfb7b6b0ff6bb21d6 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Apr 16 19:43:31 2007 -0700 -2005-10-20 Donnie Berkholz <[EMAIL PROTECTED]> + Bug 7841: setxkbmap man page doesn't describe all switches + + Added descriptions for -device, -I, -keycodes, and -verbose/-v. + + X.Org Bugzilla #7841 <https://bugs.freedesktop.org/show_bug.cgi?id=7841> + Reported upstream from + Debian BTS #252631 <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=252631> - * Makefile.am: Bug #4830 <https://bugs.freedesktop.org/show_bug.cgi?id=4830> - Set DFLT_XKB_CONFIG_ROOT instead of using hard-coded default. +commit 1dae768e463ddb3bbccd05291867eb1f7fcc6d97 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Apr 16 19:22:18 2007 -0700 -2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> + renamed: .cvsignore -> .gitignore - * configure.ac: - Update package version number for RC1 release. +commit e1424c8c8e5c0aeeba304d20cbe7c475c701c641 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Apr 16 19:21:52 2007 -0700 + Correct XKB data files path in man page + + Use path found by configure instead of hardcoding __projectroot__/lib/X11/xkb + +commit c10ca0d0f886f01f48f6090eed0ed6d0364c0e47 +Author: Daniel Stone <[EMAIL PROTECTED]> +Date: Thu Nov 2 03:39:09 2006 +0200 + + bump to 1.0.3 + +commit 8e975edfadc068f9cc603d7c8b5f27067371161f +Author: Daniel Stone <[EMAIL PROTECTED]> +Date: Sun Oct 15 21:11:13 2006 +0300 + + add support for extended devices + Add a -device parameter, which allows setting the map on arbitary extended + devices. + +commit 7a56fb2fa2f0d49a8544f92b3821304f6ae7d78d +Author: Daniel Stone <[EMAIL PROTECTED]> +Date: Sun Oct 15 20:52:14 2006 +0300 + + defaults: make the defaults a bit more modern + Fix default path, bump default model from pc101 to pc105. + +commit 6b195148c00b990923ad5de4d021d4eeacbede68 +Author: Daniel Stone <[EMAIL PROTECTED]> +Date: Fri Mar 10 09:09:12 2006 +0000 + + Bump to 1.0.2; release. + Initialise vd.variant and vd.variant to NULL when failing to get the active + RMLVO components from the server. + +commit 986fa213931e8d86ff0c1db7d6fe684b1fb92794 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Wed Dec 21 02:29:47 2005 +0000 + + Update package version for X11R7 release. + +commit f78664751580af7600ff56ba7893e468049582ef +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Mon Dec 19 16:22:41 2005 +0000 + + Stub COPYING files + +commit 18a904ff67a98ccd870f0d4124fa2286c6a9dcd3 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Thu Dec 15 00:24:04 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 9169e024c530c9ef60cd96263a9fe6000578ec0f +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Thu Dec 8 17:55:17 2005 +0000 + + Add configure options to allow hard-coded paths to be changed. + +commit 5e37a2d4e4b23b6f4d40e5d4f3d2d1520c5cf727 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Tue Dec 6 22:48:18 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit 017cc2da18c70b6fcf16444b1236479999ff6f24 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Sat Dec 3 05:49:17 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 0207f788fa51e336dcf9d93dd2b814829beca9d7 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Nov 28 22:01:38 2005 +0000 + + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 + update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) + +commit dc9758a53f1d3495dc8e020f7738dc985c131b1e +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Mon Nov 21 10:34:57 2005 +0000 + + Another pass at .cvsignores for apps. + +commit e8fea23dac64d343be9af90777b77c4ece76b1ea +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Sun Nov 20 22:08:49 2005 +0000 + + Add/improve .cvsignore files for apps. + +commit fbcb6a1b247f6789cf5d2f16e31b3266473fffa4 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Wed Nov 9 21:09:20 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit ee92bd69fbe2b31629a1f9d87d464113ca8f0721 +Author: Donnie Berkholz <[EMAIL PROTECTED]> +Date: Thu Oct 20 22:17:26 2005 +0000 + + Bug #4830 <https://bugs.freedesktop.org/show_bug.cgi?id=4830> Set + DFLT_XKB_CONFIG_ROOT instead of using hard-coded default. + +commit 7909f46a7ba31944be57b1574f70da82d8bfd385 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Wed Oct 19 02:47:50 2005 +0000 + + Update package version number for RC1 release. + +commit c856b9d6932fce0a199ca094a9130c0cef1bb404 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Oct 17 23:56:20 2005 +0000 + + Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to + work better with BSD make + +commit ef156a1dd209e48588200154eb98d97d494c6b85 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Fri Oct 14 00:25:42 2005 +0000 + + Use sed to fill in variables in man page + +commit 8bfb654c46fc5a27183ff6109aa17c33f0350466 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Fri Jul 29 21:22:30 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to + reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit a727d14743a3d18723d31ee42f9e54c1a4e98599 +Author: Daniel Stone <[EMAIL PROTECTED]> +Date: Wed Jul 27 01:54:17 2005 +0000 + + Move manpages to section 1 instead of section m. + +commit 5273d6fadca1eb3aca9d406a81b80aba9c32bb6a +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Wed Jul 20 19:31:50 2005 +0000 + + Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global + configure cache, you cache it, and the cached value is probably wrong. + +commit e04d3454c2e7b0390ccf61d9f6e0ca3d2a04dfb6 +Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]> +Date: Wed Jul 6 20:33:26 2005 +0000 + + Build system for setxkbmap + +commit 81fa26b0cde086ec0707096a942d773e7d6411ee +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Fri Apr 23 19:54:37 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 99566aece09d0b750267f48dc39552bbd1aae4bf +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Sun Mar 14 08:34:56 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 3994d4ee8ba772d63092e4cc2a14973af105dd97 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Wed Mar 3 12:12:54 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit d719f5ad11295655fb9d757e4172cecb5e99dc57 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Thu Feb 26 13:36:15 2004 +0000 + + readding XFree86's cvs IDs + +commit 4d09b800cde7710fb05491fcd7bb1d71b9e31054 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Thu Feb 26 09:23:57 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit a64d8c5f7f6604d323519090ba339900d9d585f2 +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Tue Nov 25 19:29:03 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit bff1de092debc890f15dacc871698b9679db366a +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Fri Nov 14 16:48:58 2003 +0000 + + XFree86 4.3.0.1 + +commit cb8f1b8c472547e0f9804dc29c2f658772056faf +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Fri Nov 14 16:48:58 2003 +0000 + + Initial revision diff --git a/setxkbmap/INSTALL b/setxkbmap/INSTALL index 23e5f25..e69de29 100644 --- a/setxkbmap/INSTALL +++ b/setxkbmap/INSTALL @@ -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/setxkbmap/Makefile.am b/setxkbmap/Makefile.am index 226d448..cd0ab1d 100644 --- a/setxkbmap/Makefile.am +++ b/setxkbmap/Makefile.am @@ -23,7 +23,7 @@ bin_PROGRAMS = setxkbmap [EMAIL PROTECTED]@ -setxkbmap_CFLAGS = $(SETXKBMAP_CFLAGS) \ +AM_CFLAGS = $(SETXKBMAP_CFLAGS) \ -D__XKBDEFRULES__='"xorg"' \ -DDFLT_XKB_CONFIG_ROOT=\"$(XKBCONFIGROOT)\" setxkbmap_LDADD = $(SETXKBMAP_LIBS) @@ -38,9 +38,14 @@ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:[EMAIL PROTECTED]@) -EXTRA_DIST = $(appman_PRE) +EXTRA_DIST = $(appman_PRE) ChangeLog CLEANFILES = $(appman_DATA) +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog + SED = sed # Strings to replace in man pages @@ -48,6 +53,7 @@ XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 MAN_SUBSTS = \ + -e 's|__xkbconfigroot__|"$(XKBCONFIGROOT)"|' \ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -e 's|__xservername__|Xorg|g' \ @@ -64,3 +70,11 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): sed $(MAN_SUBSTS) < $< > $@ + +if LINT +ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) + +lint: + $(LINT) $(ALL_LINT_FLAGS) $(setxkbmap_SOURCES) +endif LINT diff --git a/setxkbmap/Makefile.in b/setxkbmap/Makefile.in index 27d30fa..c943881 100644 --- a/setxkbmap/Makefile.in +++ b/setxkbmap/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -36,15 +36,11 @@ # PERFORMANCE OF THIS SOFTWARE. -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -59,28 +55,28 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = setxkbmap$(EXEEXT) +subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - compile config.guess config.sub depcomp install-sh missing -subdir = . + config.guess config.sub depcomp install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_setxkbmap_OBJECTS = setxkbmap-setxkbmap.$(OBJEXT) +am_setxkbmap_OBJECTS = setxkbmap.$(OBJEXT) setxkbmap_OBJECTS = $(am_setxkbmap_OBJECTS) am__DEPENDENCIES_1 = setxkbmap_DEPENDENCIES = $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I. +DEFAULT_INCLUDES = [EMAIL PROTECTED]@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -113,8 +109,6 @@ distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ APP_MAN_DIR = @APP_MAN_DIR@ APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ @@ -137,6 +131,7 @@ ECHO_T = @ECHO_T@ EXEEXT = @EXEEXT@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -146,13 +141,14 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LINT = @LINT@ +LINT_FLAGS = @LINT_FLAGS@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -169,9 +165,11 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ XKBCONFIGROOT = @XKBCONFIGROOT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -183,6 +181,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -210,9 +209,12 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -setxkbmap_CFLAGS = $(SETXKBMAP_CFLAGS) \ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AM_CFLAGS = $(SETXKBMAP_CFLAGS) \ -D__XKBDEFRULES__='"xorg"' \ -DDFLT_XKB_CONFIG_ROOT=\"$(XKBCONFIGROOT)\" @@ -225,7 +227,7 @@ appman_PRE = \ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:[EMAIL PROTECTED]@) -EXTRA_DIST = $(appman_PRE) +EXTRA_DIST = $(appman_PRE) ChangeLog CLEANFILES = $(appman_DATA) SED = sed @@ -233,6 +235,7 @@ SED = sed XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 MAN_SUBSTS = \ + -e 's|__xkbconfigroot__|"$(XKBCONFIGROOT)"|' \ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -e 's|__xservername__|Xorg|g' \ @@ -243,10 +246,12 @@ MAN_SUBSTS = \ -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \ - -e 's|__XKBCONFIGROOT__|$(XKBCONFIGROOT)|g' + -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' SUFFIXES = .$(APP_MAN_SUFFIX) .man [EMAIL PROTECTED]@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ [EMAIL PROTECTED]@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) + all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -289,7 +294,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @@ -304,7 +309,7 @@ distclean-hdr: -rm -f config.h stamp-h1 install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -327,7 +332,7 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) setxkbmap$(EXEEXT): $(setxkbmap_OBJECTS) $(setxkbmap_DEPENDENCIES) @rm -f setxkbmap$(EXEEXT) - $(LINK) $(setxkbmap_LDFLAGS) $(setxkbmap_OBJECTS) $(setxkbmap_LDADD) $(LIBS) + $(LINK) $(setxkbmap_OBJECTS) $(setxkbmap_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -335,39 +340,24 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c [EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ [EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ .c.o: [EMAIL PROTECTED]@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ [EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi [EMAIL PROTECTED]@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< [EMAIL PROTECTED]@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: [EMAIL PROTECTED]@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ [EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi [EMAIL PROTECTED]@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` [EMAIL PROTECTED]@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -setxkbmap-setxkbmap.o: setxkbmap.c [EMAIL PROTECTED]@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(setxkbmap_CFLAGS) $(CFLAGS) -MT setxkbmap-setxkbmap.o -MD -MP -MF "$(DEPDIR)/setxkbmap-setxkbmap.Tpo" -c -o setxkbmap-setxkbmap.o `test -f 'setxkbmap.c' || echo '$(srcdir)/'`setxkbmap.c; \ [EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/setxkbmap-setxkbmap.Tpo" "$(DEPDIR)/setxkbmap-setxkbmap.Po"; else rm -f "$(DEPDIR)/setxkbmap-setxkbmap.Tpo"; exit 1; fi [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='setxkbmap.c' object='setxkbmap-setxkbmap.o' libtool=no @AMDEPBACKSLASH@ [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ [EMAIL PROTECTED]@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(setxkbmap_CFLAGS) $(CFLAGS) -c -o setxkbmap-setxkbmap.o `test -f 'setxkbmap.c' || echo '$(srcdir)/'`setxkbmap.c - -setxkbmap-setxkbmap.obj: setxkbmap.c [EMAIL PROTECTED]@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(setxkbmap_CFLAGS) $(CFLAGS) -MT setxkbmap-setxkbmap.obj -MD -MP -MF "$(DEPDIR)/setxkbmap-setxkbmap.Tpo" -c -o setxkbmap-setxkbmap.obj `if test -f 'setxkbmap.c'; then $(CYGPATH_W) 'setxkbmap.c'; else $(CYGPATH_W) '$(srcdir)/setxkbmap.c'; fi`; \ [EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/setxkbmap-setxkbmap.Tpo" "$(DEPDIR)/setxkbmap-setxkbmap.Po"; else rm -f "$(DEPDIR)/setxkbmap-setxkbmap.Tpo"; exit 1; fi [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='setxkbmap.c' object='setxkbmap-setxkbmap.obj' libtool=no @AMDEPBACKSLASH@ [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ [EMAIL PROTECTED]@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(setxkbmap_CFLAGS) $(CFLAGS) -c -o setxkbmap-setxkbmap.obj `if test -f 'setxkbmap.c'; then $(CYGPATH_W) 'setxkbmap.c'; else $(CYGPATH_W) '$(srcdir)/setxkbmap.c'; fi` -uninstall-info-am: install-appmanDATA: $(appman_DATA) @$(NORMAL_INSTALL) - test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)" + test -z "$(appmandir)" || $(MKDIR_P) "$(DESTDIR)$(appmandir)" @list='$(appman_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -433,23 +423,22 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -460,10 +449,13 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -538,7 +530,7 @@ distcheck: dist $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]