debian/README.source | 2
debian/changelog | 13
debian/control | 17
debian/patches/10_debian_add_xkbpath_env_variable.diff | 87
debian/patches/11_xkb_documentation_updates.diff | 2
debian/patches/series | 1
debian/xsfbs/xsfbs.mk | 35
xkbcomp/ChangeLog | 148
xkbcomp/INSTALL | 291 +
xkbcomp/Makefile.am | 14
xkbcomp/Makefile.in | 46
xkbcomp/aclocal.m4 | 1715 ++++--
xkbcomp/config.guess | 248
xkbcomp/config.h.in | 3
xkbcomp/config.sub | 102
xkbcomp/configure | 4506 +++++++++--------
xkbcomp/configure.ac | 17
xkbcomp/depcomp | 87
xkbcomp/install-sh | 5
xkbcomp/keycodes.c | 16
xkbcomp/missing | 49
xkbcomp/parseutils.c | 10
xkbcomp/parseutils.h | 6
xkbcomp/symbols.c | 9
xkbcomp/xkbcomp.c | 2
xkbcomp/xkbcomp.h | 2
xkbcomp/xkbparse.c | 87
xkbcomp/xkbparse.y | 53
xkbcomp/xkbscan.c | 142
xkbcomp/ylwrap | 11
30 files changed, 4597 insertions(+), 3129 deletions(-)
New commits:
commit ce733d67ec8ad7fcf9d710da5813bf2ea9b9fd89
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Jul 8 17:19:28 2010 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 5b7f48c..11526d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xkb-utils (7.5+3) UNRELEASED; urgency=low
+x11-xkb-utils (7.5+3) unstable; urgency=low
* debian/rules: add get-tarballs target.
* Update xkbcomp to git master, with performance improvements.
@@ -9,7 +9,7 @@ x11-xkb-utils (7.5+3) UNRELEASED; urgency=low
which were only in old ubuntu releases.
* Bump Standards-Version to 3.9.0.
- -- Julien Cristau <jcris...@debian.org> Sun, 09 May 2010 14:23:46 +0200
+ -- Julien Cristau <jcris...@debian.org> Thu, 08 Jul 2010 17:19:03 +0100
x11-xkb-utils (7.5+2) unstable; urgency=low
commit 4c1e42ea3ed47ca77672b8ec9ae00a851628ef11
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Jul 8 17:19:02 2010 +0100
Bump Standards-Version to 3.9.0.
diff --git a/debian/changelog b/debian/changelog
index 214dfc0..5b7f48c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ x11-xkb-utils (7.5+3) UNRELEASED; urgency=low
* Drop dependency on cpp, leftover from the xbase-clients split.
* Drop Conflicts/Replaces on setxkbmap, xkbcomp, xkbevd, xkbprint, xkbutils
which were only in old ubuntu releases.
+ * Bump Standards-Version to 3.9.0.
-- Julien Cristau <jcris...@debian.org> Sun, 09 May 2010 14:23:46 +0200
diff --git a/debian/control b/debian/control
index 1e2ebbd..ca93554 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends:
# xkbevd: libx11-dev, libxkbfile-dev, (bison)
# xkbprint: libx11-dev, libxkbfile-dev
# xkbutils: libx11-dev, libxaw7-dev, libxkbfile-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
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 be428bfd3dd5d048e0f11641e26cc5b040930f1e
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Jul 8 17:04:28 2010 +0100
Drop obsolete Conflicts/Replaces
Drop Conflicts/Replaces on setxkbmap, xkbcomp, xkbevd, xkbprint,
xkbutils which were only in old ubuntu releases.
diff --git a/debian/changelog b/debian/changelog
index b696236..214dfc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ x11-xkb-utils (7.5+3) UNRELEASED; urgency=low
* Drop 10_debian_add_xkbpath_env_variable.diff, long obsolete.
* Add build-dep on bison, xkbcomp wants yacc.
* Drop dependency on cpp, leftover from the xbase-clients split.
+ * Drop Conflicts/Replaces on setxkbmap, xkbcomp, xkbevd, xkbprint, xkbutils
+ which were only in old ubuntu releases.
-- Julien Cristau <jcris...@debian.org> Sun, 09 May 2010 14:23:46 +0200
diff --git a/debian/control b/debian/control
index a1e6c26..1e2ebbd 100644
--- a/debian/control
+++ b/debian/control
@@ -27,8 +27,7 @@ Package: x11-xkb-utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: x11-common (>= 1:7.0.0)
-Conflicts: setxkbmap, xkbcomp, xkbevd, xkbprint, xkbutils
-Replaces: xbase-clients (<= 1:7.2.ds2-3), setxkbmap, xkbcomp, xkbevd,
xkbprint, xkbutils
+Replaces: xbase-clients (<= 1:7.2.ds2-3)
Description: X11 XKB utilities
xkbutils contains a number of client-side utilities for XKB, the X11
keyboard extension.
commit 7bb536fa51f3fb3bdb21a2d149f6ad3784d1f366
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Jul 8 16:59:54 2010 +0100
Drop dependency on cpp, leftover from the xbase-clients split.
diff --git a/debian/changelog b/debian/changelog
index 1d95036..b696236 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ x11-xkb-utils (7.5+3) UNRELEASED; urgency=low
* Update xkbcomp to git master, with performance improvements.
* Drop 10_debian_add_xkbpath_env_variable.diff, long obsolete.
* Add build-dep on bison, xkbcomp wants yacc.
+ * Drop dependency on cpp, leftover from the xbase-clients split.
-- Julien Cristau <jcris...@debian.org> Sun, 09 May 2010 14:23:46 +0200
diff --git a/debian/control b/debian/control
index c7d27c1..a1e6c26 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/app/x11-xkb-utils.git
Package: x11-xkb-utils
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
+Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: x11-common (>= 1:7.0.0)
Conflicts: setxkbmap, xkbcomp, xkbevd, xkbprint, xkbutils
Replaces: xbase-clients (<= 1:7.2.ds2-3), setxkbmap, xkbcomp, xkbevd,
xkbprint, xkbutils
commit f97782bf5de0e075626f10d8cbfe232a357bc404
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Jul 8 16:46:07 2010 +0100
Add build-dep on bison, xkbcomp wants yacc.
diff --git a/debian/changelog b/debian/changelog
index 11a9c11..1d95036 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11-xkb-utils (7.5+3) UNRELEASED; urgency=low
* debian/rules: add get-tarballs target.
* Update xkbcomp to git master, with performance improvements.
* Drop 10_debian_add_xkbpath_env_variable.diff, long obsolete.
+ * Add build-dep on bison, xkbcomp wants yacc.
-- Julien Cristau <jcris...@debian.org> Sun, 09 May 2010 14:23:46 +0200
diff --git a/debian/control b/debian/control
index 2ac7bc2..c7d27c1 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends:
libx11-dev (>= 2:1.3.3-2),
libxaw7-dev (>= 1:1.0.1),
libxkbfile-dev (>= 1:1.0.6-2),
+ bison,
quilt,
# Reasons for build-depends:
# debhelper for the packaging, pkg-config needed by configure scripts
commit d83d8999b43b6d0d215b2069501e798b1e61d42c
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Jul 8 16:29:45 2010 +0100
Wrap build-depends control field
diff --git a/debian/control b/debian/control
index 8d00310..2ac7bc2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,13 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin
<bgog...@debian.org>, Cyril Brulebois <k...@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.3.3-2),
- libxaw7-dev (>= 1:1.0.1), libxkbfile-dev (>= 1:1.0.6-2), quilt
+Build-Depends:
+ debhelper (>= 5.0.0),
+ pkg-config,
+ libx11-dev (>= 2:1.3.3-2),
+ libxaw7-dev (>= 1:1.0.1),
+ libxkbfile-dev (>= 1:1.0.6-2),
+ quilt,
# Reasons for build-depends:
# debhelper for the packaging, pkg-config needed by configure scripts
# Individual apps:
commit 19353aab165840f85e7982d279714f2c31ed0567
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Jul 8 16:18:02 2010 +0100
Drop svn Id keyword
diff --git a/debian/patches/11_xkb_documentation_updates.diff
b/debian/patches/11_xkb_documentation_updates.diff
index 69e020e..cbaf6ca 100644
--- a/debian/patches/11_xkb_documentation_updates.diff
+++ b/debian/patches/11_xkb_documentation_updates.diff
@@ -1,5 +1,3 @@
-$Id: 051_xkb_documentation_updates.diff 966 2005-12-24 22:35:05Z dnusinow $
-
Expand, correct, and tidy up XKB client manpages. Correct typos in
xkbcomp's README.config file.
commit 75cbb8364d6c090fc8f846ad6c6094fa9f5f12a0
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Jul 8 16:17:38 2010 +0100
Drop 10_debian_add_xkbpath_env_variable.diff, long obsolete.
diff --git a/debian/changelog b/debian/changelog
index bb8d575..11a9c11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11-xkb-utils (7.5+3) UNRELEASED; urgency=low
* debian/rules: add get-tarballs target.
* Update xkbcomp to git master, with performance improvements.
+ * Drop 10_debian_add_xkbpath_env_variable.diff, long obsolete.
-- Julien Cristau <jcris...@debian.org> Sun, 09 May 2010 14:23:46 +0200
diff --git a/debian/patches/10_debian_add_xkbpath_env_variable.diff
b/debian/patches/10_debian_add_xkbpath_env_variable.diff
deleted file mode 100644
index f23f764..0000000
--- a/debian/patches/10_debian_add_xkbpath_env_variable.diff
+++ /dev/null
@@ -1,87 +0,0 @@
-$Id$
-
-As explained in #324768, this patch modifies setxkbmap and xkbcomp
-programs so that they look for XKB data files in $XKBPATH if this
-environment variable is set. This allows installing both xlibs and
-xkeyboard-config at the same time, so that xkeyboard-config can
-install its files under /etc/X11/xkb-data until all packages depending
-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(-)
-
---- a/setxkbmap/setxkbmap.c.orig 2009-12-06 22:36:21.000000000 +0100
-+++ b/setxkbmap/setxkbmap.c 2009-12-06 22:41:25.000000000 +0100
-@@ -371,9 +371,13 @@
- int i;
- Bool ok;
- unsigned present;
-+ char *xkbpath;
-
- ok = True;
- addToList(&szInclPath, &numInclPath, &inclPath, ".");
-+ xkbpath = (char *)getenv("XKBPATH");
-+ if (xkbpath != NULL)
-+ addToList(&szInclPath, &numInclPath, &inclPath, xkbpath);
- addToList(&szInclPath, &numInclPath, &inclPath, DFLT_XKB_CONFIG_ROOT);
- for (i = 1; (i < argc) && ok; i++)
- {
---- a/xkbcomp/xkbpath.c.orig 2009-12-06 22:36:21.000000000 +0100
-+++ b/xkbcomp/xkbpath.c 2009-12-06 22:41:25.000000000 +0100
-@@ -171,8 +171,13 @@
- void
- XkbAddDefaultDirectoriesToPath(void)
- {
-+ char *xkbpath;
-+
- if (noDefaultPath)
- return;
-+ xkbpath = (char *)getenv("XKBPATH");
-+ if (xkbpath != NULL)
-+ XkbAddDirectoryToPath(xkbpath);
- XkbAddDirectoryToPath(DFLT_XKB_CONFIG_ROOT);
- }
-
---- a/xkbevd/xkbevd.c.orig 2009-12-06 22:36:21.000000000 +0100
-+++ b/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 */
-+ char *xkbpath;
- if (cfgFileName!=buf) { /* user specified a file. bail */
- uError("Can't open config file \"%s\n",cfgFileName);
- uAction("Exiting\n");
- exit(1);
- }
-- sprintf(buf,DFLT_SYS_XKBEVD_CONFIG,DFLT_XKB_CONFIG_ROOT);
-- file= fopen(cfgFileName,"r");
-+ xkbpath= (char *)getenv("XKBPATH");
-+ if (xkbpath!=NULL) {
-+ sprintf(buf,DFLT_SYS_XKBEVD_CONFIG,xkbpath);
-+ file= fopen(cfgFileName,"r");
-+ }
- if (file==NULL && !eventMask) {
-- if (verbose) {
-- uError("Couldn't find a config file anywhere\n");
-- uAction("Exiting\n");
-- exit(1);
-+ sprintf(buf,DFLT_SYS_XKBEVD_CONFIG,DFLT_XKB_CONFIG_ROOT);
-+ file= fopen(cfgFileName,"r");
-+ if (file==NULL) {
-+ if (verbose) {
-+ uError("Couldn't find a config file anywhere\n");
-+ uAction("Exiting\n");
-+ exit(1);
-+ }
-+ exit(0);
- }
-- exit(0);
- }
- }
- }
diff --git a/debian/patches/series b/debian/patches/series
index fb0a336..38807e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-10_debian_add_xkbpath_env_variable.diff
#11_xkb_documentation_updates.diff -p0
commit 30bbdf5f1ecf063192b72abd397cf40db9967b4d
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Jul 8 16:14:31 2010 +0100
Update xkbcomp to git master, with performance improvements.
diff --git a/debian/changelog b/debian/changelog
index 81a14bf..bb8d575 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
x11-xkb-utils (7.5+3) UNRELEASED; urgency=low
* debian/rules: add get-tarballs target.
+ * Update xkbcomp to git master, with performance improvements.
-- Julien Cristau <jcris...@debian.org> Sun, 09 May 2010 14:23:46 +0200
diff --git a/xkbcomp/AUTHORS b/xkbcomp/AUTHORS
deleted file mode 100644
index e69de29..0000000
diff --git a/xkbcomp/ChangeLog b/xkbcomp/ChangeLog
index 6d33aea..7f1a062 100644
--- a/xkbcomp/ChangeLog
+++ b/xkbcomp/ChangeLog
@@ -1,3 +1,151 @@
+commit 0b04ecbb7a6afb223c91d3b15baab0bc48542281
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Tue Jun 15 19:26:19 2010 +0100
+
+ Fix gcc warnings
+
+ It was right too: printf was being misused in some spots.
+
+ Signed-off-by: Daniel Stone <dan...@fooishbar.org>
+
+commit 41b0857c8c1179b87a26888588cbfff28f8bb0d6
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Tue Jun 8 15:11:19 2010 +0100
+
+ Don't malloc() and free() most scanned symbols
+
+ Use a constant buffer. Sigh.
+
+ Signed-off-by: Daniel Stone <dan...@fooishbar.org>
+
+commit 7f7a57c75beb5e1dfb53351e490ef00a324b2727
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Tue Jun 8 12:14:00 2010 +0100
+
+ Fix compilation with DEBUG
+
+ Signed-off-by: Daniel Stone <dan...@fooishbar.org>
+
+commit 9887842e33174a6e98675b912e419c711dd20c0f
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Mon Jun 7 22:45:13 2010 +0100
+
+ Use fread() instead of getc()
+
+ So, it turns out that if you're parsing a fairly large amount of data,
+ using getc() to get all the input rather than, say, read(), is some kind
+ of remarkably daft and unperformant idea.
+
+ Signed-off-by: Daniel Stone <dan...@fooishbar.org>
+
+commit 02de53d767b20bab1517b4e8a3e7eb3b9e7f15be
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Mon Jun 7 22:43:01 2010 +0100
+
+ Lazy keysym parsing (avoid XStringToKeysym)
+
+ Instead of calling XStringToKeysym on every keysym we parse, store it as
+ a string until we need to store it in an actual keymap.
+
+ Signed-off-by: Daniel Stone <dan...@fooishbar.org>
+
+commit 07cc4d60dea2b4c947fed45b082edae4a53b186a
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jun 2 15:23:58 2010 -0400
+
+ config: add check for yacc to insure it is installed #27973
+
+ Unlike other macros AC_PROG_YACC sets the YACC variable to "yacc"
+ as a last resort, even if no programs have been found. Improve error
+ checking by issuing an error message if yacc is not found. The module
+ cannot build anyway.
+
+ Reported-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 7888738047e9f1545aa1905b4a2a0654686f49a8
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Thu Feb 11 10:08:07 2010 -0500
+
+ config: move CWARNFLAGS from configure.ac to Makefile.am
+
+ Compiler warning flags should be explicitly set in the makefile
+ rather than being merged with other packages compiler flags.
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit ba906359da32644b40b3a8a71e77d3cabca56efe
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Thu Nov 26 09:19:54 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 667f0a0e5d3143533cbbe5979ef82c13cfa62c3a
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Oct 28 14:09:08 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit 4b7c8a8ef337614c831b2555afeb6d89dbc14fb1
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Tue Oct 27 15:07:25 2009 -0400
+
+ Deploy the new XORG_DEFAULT_OPTIONS #24242
+
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file
from
+ future changes.
+
+commit 5fa9ef7e5e87f875dd92cc33403cebf6c60c557f
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Mon Oct 26 22:08:39 2009 -0400
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit b3a52787e0dad42ea7e8da26926b9533b1ecab84
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Thu Oct 22 12:34:15 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
+commit fa7e3ff7b49f76294aa14aa8bf1b8adbceb5d340
+Author: Jeremy Huddleston <jerem...@freedesktop.org>
+Date: Wed Oct 21 12:47:21 2009 -0700
+
+ This is not a GNU project, so declare it foreign.
+
+ On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
+ > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
+ > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
+ > > was quite annoying to work around since 'autoreconf -fvi' replaces
+ > > it and git wants to commit it. Should these files even be in git?
+ > > Can I nuke them for the betterment of humanity and since they get
+ > > created by autoreconf anyways?
+ >
+ > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
+
+ As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
+ AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
+ of the INSTALL file. It is also part of the 24206 solution.
+
+ Signed-off-by: Jeremy Huddleston <jerem...@freedesktop.org>
+
commit a5160032d7e46473b8702b87a546071fc0c0978c
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Sat Oct 3 21:12:47 2009 +1000
diff --git a/xkbcomp/INSTALL b/xkbcomp/INSTALL
index e69de29..8b82ade 100644
--- a/xkbcomp/INSTALL
+++ b/xkbcomp/INSTALL
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ 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 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.
+
+ Running `configure' might take a while. 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.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+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=c99 CFLAGS=-g 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 can use 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 `..'.
+
+ With a non-GNU `make', it is safer 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.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+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.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+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).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--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.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff --git a/xkbcomp/Makefile.am b/xkbcomp/Makefile.am
index fca1f67..3550c40 100644
--- a/xkbcomp/Makefile.am
+++ b/xkbcomp/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = xkbcomp
-AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"'
+AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"'
$(CWARNFLAGS)
xkbcomp_LDADD = $(XKBCOMP_LIBS)
xkbcomp_SOURCES = \
@@ -62,7 +62,8 @@ appman_PRE = \
xkbcomp.man
BUILT_SOURCES = xkbparse.c
-MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+MAINTAINERCLEANFILES += $(BUILT_SOURCES)
EXTRA_DIST = \
README.config \
@@ -99,12 +100,13 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES += ChangeLog
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff --git a/xkbcomp/Makefile.in b/xkbcomp/Makefile.in
index 5dbcdf8..3878897 100644
--- a/xkbcomp/Makefile.in
+++ b/xkbcomp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,9 +60,8 @@ bin_PROGRAMS = xkbcomp$(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 \
- config.guess config.sub depcomp install-sh missing xkbparse.c \
- ylwrap
+ $(top_srcdir)/configure COPYING ChangeLog INSTALL config.guess \
+ config.sub depcomp install-sh missing xkbparse.c ylwrap
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -147,6 +146,7 @@ am__remove_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@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
@@ -179,6 +179,7 @@ FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL = @INSTALL@
+INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -200,9 +201,12 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -211,6 +215,7 @@ XKBCOMP_CFLAGS = @XKBCOMP_CFLAGS@
XKBCOMP_LIBS = @XKBCOMP_LIBS@
XKBCONFIGROOT = @XKBCONFIGROOT@
YACC = @YACC@
+YACC_INST = @YACC_INST@
YFLAGS = @YFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -231,7 +236,6 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@@ -263,7 +267,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"'
+AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"'
$(CWARNFLAGS)
xkbcomp_LDADD = $(XKBCOMP_LIBS)
xkbcomp_SOURCES = \
action.c \
@@ -303,8 +307,8 @@ appman_PRE = \
xkbcomp.man
BUILT_SOURCES = xkbparse.c
-MAINTAINERCLEANFILES = $(BUILT_SOURCES) ChangeLog
-EXTRA_DIST = README.config README.enhancing $(appman_PRE) ChangeLog
+MAINTAINERCLEANFILES = ChangeLog INSTALL $(BUILT_SOURCES)
+EXTRA_DIST = README.config README.enhancing $(appman_PRE)
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:m...@app_man_suffix@)
CLEANFILES = $(appman_DATA)
@@ -338,15 +342,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@
$(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
- $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
+ $(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -577,7 +581,8 @@ distdir: $(DISTFILES)
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-test -n "$(am__skip_mode_fix)" \
- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ || find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -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 $(install_sh) -c -m a+r {} {} \; \
@@ -621,17 +626,17 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1owtzd-0002i9...@alioth.debian.org
