x11-xkb-utils: Changes to 'debian-unstable'
debian/README.source | 73
debian/changelog | 13
debian/control | 2
debian/patches/10_debian_add_xkbpath_env_variable.diff | 22
debian/xsfbs/repack.sh | 32
debian/xsfbs/xsfbs.mk | 21
debian/xsfbs/xsfbs.sh | 311 -
xkbcomp/ChangeLog | 21
xkbcomp/Makefile.in | 30
xkbcomp/aclocal.m4 | 1146 ++-
xkbcomp/configure | 69
xkbcomp/configure.ac | 2
xkbcomp/xkbcomp.c | 12
xkbcomp/xkbparse.c | 663 +-
xkbevd/ChangeLog | 308 -
xkbevd/INSTALL | 236
xkbevd/Makefile.am | 19
xkbevd/Makefile.in | 499 -
xkbevd/README | 24
xkbevd/aclocal.m4 | 1847 +++---
xkbevd/cfgparse.c | 855 +-
xkbevd/cfgscan.c | 4
xkbevd/compile | 142
xkbevd/config.guess | 107
xkbevd/config.h.in | 39
xkbevd/config.sub | 128
xkbevd/configure | 4087 +++++++++----
xkbevd/configure.ac | 12
xkbevd/depcomp | 172
xkbevd/install-sh | 517 +
xkbevd/missing | 104
xkbevd/mkinstalldirs | 158
xkbevd/utils.c | 43
xkbevd/utils.h | 2
xkbevd/xkbevd.c | 32
xkbevd/xkbevd.cf | 7
xkbevd/xkbevd.man | 2
xkbevd/ylwrap | 222
xkbprint/COPYING | 51
xkbprint/ChangeLog | 256
xkbprint/INSTALL | 236
xkbprint/Makefile.am | 14
xkbprint/Makefile.in | 419 -
xkbprint/README | 26
xkbprint/aclocal.m4 | 1847 +++---
xkbprint/compile | 142
xkbprint/config.guess | 107
xkbprint/config.h.in | 39
xkbprint/config.sub | 128
xkbprint/configure | 4984 ++++++++++++-----
xkbprint/configure.ac | 12
xkbprint/depcomp | 172
xkbprint/install-sh | 517 +
xkbprint/missing | 104
xkbprint/mkinstalldirs | 158
xkbprint/psgeom.c | 10
xkbprint/utils.c | 44
xkbprint/utils.h | 2
xkbprint/xkbprint.c | 6
xkbprint/xkbprint.man | 2
xkbutils/ChangeLog | 221
xkbutils/INSTALL | 236
xkbutils/LED.c | 6
xkbutils/Makefile.am | 50
xkbutils/Makefile.in | 508 +
xkbutils/README | 31
xkbutils/aclocal.m4 | 1526 +++--
xkbutils/compile | 17
xkbutils/config.guess | 1561 +++++
xkbutils/config.h.in | 42
xkbutils/config.sub | 1686 +++++
xkbutils/configure | 4596 ++++++++++-----
xkbutils/configure.ac | 18
xkbutils/depcomp | 172
xkbutils/install-sh | 517 +
xkbutils/missing | 104
xkbutils/mkinstalldirs | 158
xkbutils/utils.c | 41
xkbutils/utils.h | 6
xkbutils/xkbbell.c | 2
xkbutils/xkbbell.man | 82
xkbutils/xkbvleds.c | 18
xkbutils/xkbvleds.man | 84
xkbutils/xkbwatch.c | 5
xkbutils/xkbwatch.man | 33
85 files changed, 22320 insertions(+), 10659 deletions(-)
New commits:
commit c6fa3623580af95d0d158b3fd509b192cfd6380f
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Dec 6 22:42:14 2009 +0100
Prepare Changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 5ea94f2..38c3237 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xkb-utils (7.5+1) UNRELEASED; urgency=low
+x11-xkb-utils (7.5+1) unstable; urgency=low
* xkbcomp 1.1.1.
* xkbevd 1.1.0.
@@ -9,7 +9,7 @@ x11-xkb-utils (7.5+1) UNRELEASED; urgency=low
* Add README.source, bump Standards-Version to 3.8.3.
* Refresh patches.
- -- Brice Goglin <bgoglin@debian.org> Sun, 06 Dec 2009 22:41:45 +0100
+ -- Brice Goglin <bgoglin@debian.org> Sun, 06 Dec 2009 22:42:11 +0100
x11-xkb-utils (7.4+3) unstable; urgency=low
commit 06f70d5eaa59b577d6e0093554b805a1c3b445ac
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Dec 6 22:42:08 2009 +0100
Refresh patches
diff --git a/debian/changelog b/debian/changelog
index 1be34b4..5ea94f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ x11-xkb-utils (7.5+1) UNRELEASED; urgency=low
* xkbutils 1.0.2.
+ Add manpages, closes: #31396.
* Add README.source, bump Standards-Version to 3.8.3.
+ * Refresh patches.
- -- Brice Goglin <bgoglin@debian.org> Sun, 06 Dec 2009 22:34:36 +0100
+ -- Brice Goglin <bgoglin@debian.org> Sun, 06 Dec 2009 22:41:45 +0100
x11-xkb-utils (7.4+3) unstable; urgency=low
diff --git a/debian/patches/10_debian_add_xkbpath_env_variable.diff b/debian/patches/10_debian_add_xkbpath_env_variable.diff
index db2f9be..859292e 100644
--- a/debian/patches/10_debian_add_xkbpath_env_variable.diff
+++ b/debian/patches/10_debian_add_xkbpath_env_variable.diff
@@ -9,10 +9,16 @@ on xlibs are fixed. This patch by Denis Barbier.
This patch will not be submitted upstream.
+---
+ setxkbmap/setxkbmap.c | 4 ++++
+ xkbcomp/xkbpath.c | 5 +++++
+ xkbevd/xkbevd.c | 22 +++++++++++++++-------
+ 3 files changed, 24 insertions(+), 7 deletions(-)
+
Index: setxkbmap/setxkbmap.c
===================================================================
---- setxkbmap/setxkbmap.c.orig
-+++ setxkbmap/setxkbmap.c
+--- setxkbmap/setxkbmap.c.orig 2009-12-06 22:36:21.000000000 +0100
++++ setxkbmap/setxkbmap.c 2009-12-06 22:41:25.000000000 +0100
@@ -371,9 +371,13 @@
int i;
Bool ok;
@@ -29,8 +35,8 @@ Index: setxkbmap/setxkbmap.c
{
Index: xkbcomp/xkbpath.c
===================================================================
---- xkbcomp/xkbpath.c.orig
-+++ xkbcomp/xkbpath.c
+--- xkbcomp/xkbpath.c.orig 2009-12-06 22:36:21.000000000 +0100
++++ xkbcomp/xkbpath.c 2009-12-06 22:41:25.000000000 +0100
@@ -171,8 +171,13 @@
void
XkbAddDefaultDirectoriesToPath(void)
@@ -47,9 +53,9 @@ Index: xkbcomp/xkbpath.c
Index: xkbevd/xkbevd.c
===================================================================
---- xkbevd/xkbevd.c.orig
-+++ xkbevd/xkbevd.c
-@@ -471,20 +471,28 @@
+--- xkbevd/xkbevd.c.orig 2009-12-06 22:36:21.000000000 +0100
++++ xkbevd/xkbevd.c 2009-12-06 22:41:25.000000000 +0100
+@@ -481,20 +481,28 @@
else {
file= fopen(cfgFileName,"r");
if (file==NULL) { /* no personal config, try for a system one */
@@ -66,7 +72,7 @@ Index: xkbevd/xkbevd.c
+ sprintf(buf,DFLT_SYS_XKBEVD_CONFIG,xkbpath);
+ file= fopen(cfgFileName,"r");
+ }
- if (file==NULL) {
+ if (file==NULL && !eventMask) {
- if (verbose) {
- uError("Couldn't find a config file anywhere\n");
- uAction("Exiting\n");
commit 1e4bfbc23cb78a0efc742cc38cfb72febfaff9fd
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Dec 6 22:34:49 2009 +0100
Add README.source, bump Standards-Version to 3.8.3
diff --git a/debian/changelog b/debian/changelog
index 374b4f4..1be34b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ x11-xkb-utils (7.5+1) UNRELEASED; urgency=low
+ Fix typo in manpage, closes: #525254.
* xkbutils 1.0.2.
+ Add manpages, closes: #31396.
+ * Add README.source, bump Standards-Version to 3.8.3.
- -- Brice Goglin <bgoglin@debian.org> Sun, 06 Dec 2009 22:32:46 +0100
+ -- Brice Goglin <bgoglin@debian.org> Sun, 06 Dec 2009 22:34:36 +0100
x11-xkb-utils (7.4+3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 9a1410f..30cd7ae 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0),
# xkbevd: libx11-dev, libxkbfile-dev, (bison)
# xkbprint: libx11-dev, libxkbfile-dev
# xkbutils: libx11-dev, libxaw7-dev, libxkbfile-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xkb-utils
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xkb-utils.git
commit db0fe70de7232b2b16f93604179c1583cc309d61
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Dec 6 22:33:43 2009 +0100
Add bug closers
diff --git a/debian/changelog b/debian/changelog
index 4246fbe..374b4f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,11 @@ x11-xkb-utils (7.5+1) UNRELEASED; urgency=low
* xkbcomp 1.1.1.
* xkbevd 1.1.0.
* xkbprint 1.0.2.
+ + Fix typo in manpage, closes: #525254.
* xkbutils 1.0.2.
+ + Add manpages, closes: #31396.
- -- Brice Goglin <bgoglin@debian.org> Sun, 06 Dec 2009 22:29:23 +0100
+ -- Brice Goglin <bgoglin@debian.org> Sun, 06 Dec 2009 22:32:46 +0100
x11-xkb-utils (7.4+3) unstable; urgency=low
commit 47e1ca2fb0f75520a704362ef4014581a78c7c5a
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Dec 6 22:29:36 2009 +0100
xkbutils 1.0.2
diff --git a/debian/changelog b/debian/changelog
index 8ee1f16..4246fbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ x11-xkb-utils (7.5+1) UNRELEASED; urgency=low
* xkbcomp 1.1.1.
* xkbevd 1.1.0.
* xkbprint 1.0.2.
+ * xkbutils 1.0.2.
- -- Brice Goglin <bgoglin@debian.org> Sun, 06 Dec 2009 22:28:39 +0100
+ -- Brice Goglin <bgoglin@debian.org> Sun, 06 Dec 2009 22:29:23 +0100
x11-xkb-utils (7.4+3) unstable; urgency=low
diff --git a/xkbutils/ChangeLog b/xkbutils/ChangeLog
index 53eea06..026c193 100644
--- a/xkbutils/ChangeLog
+++ b/xkbutils/ChangeLog
@@ -1,29 +1,214 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 33383dca28dc60473f677a302962413d504fc4f3
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Oct 16 18:46:53 2009 -0700
- * configure.ac:
- Update package version for X11R7 release.
+ xkbutils 1.0.2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 864b472e096a8c6ca8f86f78615da023adeb60fd
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Oct 16 18:46:24 2009 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 917138713d60631c6d2e03afae88e7425caa7afd
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Oct 1 14:54:25 2009 -0700
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 0c3b1ab2daa3a48d33da55f016d6771b8faaef7b
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Thu Jan 22 15:06:47 2009 -0200
- * configure.ac:
- Update dependencies to work with separate build roots.
+ Correct make distcheck and sparse warnings.
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 98b7afc0d1d53a766ea60175e9fc5f031051f057
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Sun Mar 16 18:51:53 2008 -0300
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ Compile warning fixes.
+
+ Ansify some functions in LED.c and utils.c.
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit f4db3aa38240038496d99b1368f5b6fb412f53a9
+Author: James Cloos <cloos@jhcloos.com>
+Date: Wed Aug 20 10:32:51 2008 -0400
- * configure.ac:
- Update pkgcheck depedencies to work with separate build roots.
+ xaw8 is gone, use xaw7
+
+commit 67322880f26c3e4818b9b36b18487951769372a7
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Aug 18 15:53:46 2008 -0700
+
+ Add AM_PROG_CC_C_O to placate automake-1.10
+
+ Makefile.am:33: compiling `xkbbell.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
+
+commit 7fa628b28be06ba387faae712c616ebcd5306e57
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Aug 18 15:52:15 2008 -0700
+
+ Add rudimentary man pages for xkbbell, xkbvleds, xkbwatch
+
+ We've been shipping these in Solaris for years, but they still need
+ work - it's a starting point though.
+
+commit d3f4c454ac17f3d18d1c5cae8ee00e69ffb29358
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Mar 14 09:07:36 2008 -0700
+
+ Add missing dependency on inputproto.
+
+commit 69bcf4324926d9903979e62ed2f337898a6fe17d
+Author: James Cloos <cloos@jhcloos.com>
+Date: Fri Dec 7 20:54:53 2007 -0500
+
+ Fix commit 7a0686b98d54fe77b10c52d7c4cc9e84a4df4479
+
+commit 7a0686b98d54fe77b10c52d7c4cc9e84a4df4479
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Dec 6 16:37:19 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 95878b55dd4f6cbba6c2d2c1e9e5d25d44b8f5e6
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:51:27 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 164ce22b4217a55a388bc5d61ed960c3b0ae91a4
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Aug 23 19:24:54 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit 481219d69d95ea4dccfae7b3a003c155879f3d18
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:29:51 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit b8b8b84c9a5b85fed20ce23e71b01657d8231cc5
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:22:45 2005 +0000
+
+ Stub COPYING files
+
+commit dd7473e2087e366fc5c4c016026c22770b7413af
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:08 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit b828cb9a371404e62d833031a2b1d0312b776ad9
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:24 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit c91b322ed192a54144e56ce7e2564c94d228f2ad
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Sun Nov 20 22:08:53 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit 3b715538c80f0b145d9ec36d17acbb72e9e7bdcb
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Nov 19 07:15:37 2005 +0000
+
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
+
+commit 1cad9a1624d9af4cee9b3a4dbc36258a09ac0c3f
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:09:21 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit eeb9f2e7ea53b54c3ccf7593a0873410b547ff46
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 1 15:05:19 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit d77bf077c620d9bbec866d6a49212bca4848b11e
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:35 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 13e10bbd6f54b3d8b6cb4aa370c06863fb29d349
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Fri Jul 22 15:02:12 2005 +0000
+
+ Add utils.h as source so it lands in distdir.
+
+commit 3423f5d91ecd66a2a967ccf6ed9ddfd2940d12ba
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Jul 6 20:54:51 2005 +0000
+
+ Build system for xkbutils
+
+commit 5986b948e9821790f9c21f2556a11ca8f8a2d29e
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:54:57 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 80512e7091a09313043adbb6bca84424a5b3909b
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:35:37 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit ec5d08d47d138e3f1ceca5ccd06c845cee5f758d
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:13:14 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 02899a72c801eeb2b6b57bff82ae98d02ad9794e
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:36:26 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 4821635c8a3d82a52df7191996f455fc0b463347
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:24:13 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit d1c3c6175a74baf089122f4fc2136b96919577bf
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:29:14 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit b8a964643bded3b8b835a93c3fbdae248e90e021
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:49:23 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 53c921965d341cfa3f14fedf862d9db666c16002
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 15:54:54 2003 +0000
+
+ R6.6 is the Xorg base-line
diff --git a/xkbutils/INSTALL b/xkbutils/INSTALL
index 23e5f25..e69de29 100644
--- a/xkbutils/INSTALL
+++ b/xkbutils/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/xkbutils/LED.c b/xkbutils/LED.c
index abfc0ba..2856329 100644
--- a/xkbutils/LED.c
+++ b/xkbutils/LED.c
@@ -192,10 +192,8 @@ GetPixmaps(LEDWidget lw)
}
/* ARGSUSED */
-static void Initialize(request, new, args, num_args)
- Widget request, new;
- ArgList args;
- Cardinal *num_args;
+static void
+Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args)
{
LEDWidget lw = (LEDWidget) new;
diff --git a/xkbutils/Makefile.am b/xkbutils/Makefile.am
index 15859b3..3bfdf36 100644
--- a/xkbutils/Makefile.am
+++ b/xkbutils/Makefile.am
@@ -21,22 +21,66 @@
bin_PROGRAMS = xkbvleds xkbwatch xkbbell
+AM_CFLAGS = $(CWARNFLAGS)
+
# xkbvleds
xkbvleds_SOURCES = xkbvleds.c LED.c LED.h LEDP.h utils.c utils.h
-xkbvleds_CFLAGS = $(XKBVLEDS_CFLAGS)
+xkbvleds_CFLAGS = $(XKBVLEDS_CFLAGS) $(AM_CFLAGS)
xkbvleds_LDADD = $(XKBVLEDS_LIBS)
# xkbbell
xkbbell_SOURCES = xkbbell.c
-xkbbell_CFLAGS = $(XKBBELL_CFLAGS)
+xkbbell_CFLAGS = $(XKBBELL_CFLAGS) $(AM_CFLAGS)
xkbbell_LDADD = $(XKBBELL_LIBS)
# xkbwatch
xkbwatch_SOURCES = xkbwatch.c LED.c LED.h LEDP.h utils.c utils.h
-xkbwatch_CFLAGS = $(XKBWATCH_CFLAGS)
+xkbwatch_CFLAGS = $(XKBWATCH_CFLAGS) $(AM_CFLAGS)
xkbwatch_LDADD = $(XKBWATCH_LIBS)
+
+# Man pages
+appman_PRE = xkbbell.man xkbvleds.man xkbwatch.man
+
+appmandir = $(APP_MAN_DIR)
+
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+
+EXTRA_DIST = $(appman_PRE) ChangeLog
+CLEANFILES = $(appman_DATA)
+MAINTAINERCLEANFILES = ChangeLog
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+ XORGMANNAME = X Version 11
+
+SED = sed
+
+MAN_SUBSTS = \
+ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__xservername__|Xorg|g' \
+ -e 's|__xconfigfile__|xorg.conf|g' \
+ -e 's|__projectroot__|$(prefix)|g' \
+ -e 's|__apploaddir__|$(appdefaultdir)|' \
+ -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+ -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'
+
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+.man.$(APP_MAN_SUFFIX):
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/xkbutils/Makefile.in b/xkbutils/Makefile.in
index 1665320..857fea0 100644
--- a/xkbutils/Makefile.in
+++ b/xkbutils/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11 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, 2007, 2008, 2009 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.
@@ -35,15 +36,13 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
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
@@ -55,63 +54,111 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
bin_PROGRAMS = xkbvleds$(EXEEXT) xkbwatch$(EXEEXT) xkbbell$(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 depcomp install-sh missing mkinstalldirs
+ compile 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
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
PROGRAMS = $(bin_PROGRAMS)
am_xkbbell_OBJECTS = xkbbell-xkbbell.$(OBJEXT)
xkbbell_OBJECTS = $(am_xkbbell_OBJECTS)
am__DEPENDENCIES_1 =
xkbbell_DEPENDENCIES = $(am__DEPENDENCIES_1)
+xkbbell_LINK = $(CCLD) $(xkbbell_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
am_xkbvleds_OBJECTS = xkbvleds-xkbvleds.$(OBJEXT) \
xkbvleds-LED.$(OBJEXT) xkbvleds-utils.$(OBJEXT)
xkbvleds_OBJECTS = $(am_xkbvleds_OBJECTS)
xkbvleds_DEPENDENCIES = $(am__DEPENDENCIES_1)
+xkbvleds_LINK = $(CCLD) $(xkbvleds_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
am_xkbwatch_OBJECTS = xkbwatch-xkbwatch.$(OBJEXT) \
xkbwatch-LED.$(OBJEXT) xkbwatch-utils.$(OBJEXT)
xkbwatch_OBJECTS = $(am_xkbwatch_OBJECTS)
xkbwatch_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+xkbwatch_LINK = $(CCLD) $(xkbwatch_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(xkbbell_SOURCES) $(xkbvleds_SOURCES) $(xkbwatch_SOURCES)
DIST_SOURCES = $(xkbbell_SOURCES) $(xkbvleds_SOURCES) \
$(xkbwatch_SOURCES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+DATA = $(appman_DATA)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
+ { test ! -d "$(distdir)" \
+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr "$(distdir)"; }; }
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
Reply to: