x11-xkb-utils: Changes to 'debian-unstable'
debian/changelog | 11 +
debian/control | 10
debian/copyright | 67 ++++++
debian/xsfbs/xsfbs.mk | 103 +---------
debian/xsfbs/xsfbs.sh | 7
xkbcomp/COPYING | 94 ++++++++-
xkbcomp/ChangeLog | 330 ++++++++++++++++++++++++++++----
xkbcomp/INSTALL | 236 ----------------------
xkbcomp/Makefile.am | 10
xkbcomp/Makefile.in | 174 ++++++++--------
xkbcomp/aclocal.m4 | 238 +++++++++++++----------
xkbcomp/action.c | 4
xkbcomp/compat.c | 3
xkbcomp/config.guess | 56 +++--
xkbcomp/config.h.in | 9
xkbcomp/config.sub | 78 ++++++-
xkbcomp/configure | 216 ++++++++++++---------
xkbcomp/configure.ac | 3
xkbcomp/depcomp | 93 +++++++--
xkbcomp/expr.h | 2
xkbcomp/geometry.c | 6
xkbcomp/install-sh | 514 ++++++++++++++++++++++++++++++++++----------------
xkbcomp/keycodes.c | 4
xkbcomp/keytypes.c | 2
xkbcomp/misc.c | 9
xkbcomp/misc.h | 24 +-
xkbcomp/missing | 61 +++--
xkbcomp/parseutils.h | 2
xkbcomp/symbols.c | 2
xkbcomp/utils.c | 18 -
xkbcomp/utils.h | 20 -
xkbcomp/vmod.c | 3
xkbcomp/xkbcomp.c | 5
xkbcomp/xkbparse.c | 387 ++++++++++++++++++-------------------
xkbcomp/xkbparse.y | 5
xkbcomp/xkbpath.c | 2
xkbcomp/xkbpath.h | 2
xkbcomp/xkbscan.c | 2
xkbcomp/ylwrap | 223 +++++++++++++++++++++
39 files changed, 1909 insertions(+), 1126 deletions(-)
New commits:
commit 2dd401d73b361d3fce04f66e16e520ef5d1ee78c
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 7 20:22:39 2008 +0100
debian/control updates
Drop debian revisions from build-deps.
Bump Standards-Version to 3.7.3 (no changes).
Drop the XS- prefix from Vcs-* debian/control fields.
diff --git a/debian/changelog b/debian/changelog
index 5fbf19e..499888d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ x11-xkb-utils (7.4+1) UNRELEASED; urgency=low
* xkbcomp 1.0.4.
* Complete debian/copyright's information about xkbcomp from upstream's
COPYING file.
+ * Drop debian revisions from build-deps.
+ * Bump Standards-Version to 3.7.3 (no changes).
+ * Drop the XS- prefix from Vcs-* debian/control fields.
-- Julien Cristau <jcristau@debian.org> Fri, 07 Mar 2008 20:10:33 +0100
diff --git a/debian/control b/debian/control
index ab3ec0d..9a1410f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>, Brice Goglin <bgoglin@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0-1),
- libxaw7-dev (>= 1:1.0.1-1), libxkbfile-dev (>= 1:1.0.1-1), quilt
+Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0),
+ libxaw7-dev (>= 1:1.0.1), libxkbfile-dev (>= 1:1.0.1), quilt
# Reasons for build-depends:
# debhelper for the packaging, pkg-config needed by configure scripts
# Individual apps:
@@ -13,9 +13,9 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0-1),
# xkbevd: libx11-dev, libxkbfile-dev, (bison)
# xkbprint: libx11-dev, libxkbfile-dev
# xkbutils: libx11-dev, libxaw7-dev, libxkbfile-dev
-Standards-Version: 3.7.2.0
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xkb-utils
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xkb-utils.git
+Standards-Version: 3.7.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
Package: x11-xkb-utils
Architecture: any
commit 611579495cefaf0b3489d152daea1f54d04cc188
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 7 20:14:37 2008 +0100
Complete debian/copyright's information about xkbcomp
Upstream has a COPYING file now, use that.
diff --git a/debian/changelog b/debian/changelog
index 46a5167..5fbf19e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
x11-xkb-utils (7.4+1) UNRELEASED; urgency=low
* xkbcomp 1.0.4.
+ * Complete debian/copyright's information about xkbcomp from upstream's
+ COPYING file.
-- Julien Cristau <jcristau@debian.org> Fri, 07 Mar 2008 20:10:33 +0100
diff --git a/debian/copyright b/debian/copyright
index 688d7ba..0b76678 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -50,6 +50,73 @@ xkbcomp:
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ Copyright 1988, 1998 The Open Group
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation.
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ Except as contained in this notice, the name of The Open Group shall not be
+ used in advertising or otherwise to promote the sale, use or other dealings
+ in this Software without prior written authorization from The Open Group.
+
+
+ Copyright 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+ All Rights Reserved
+
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted,
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in
+ supporting documentation, and that the name of Digital not be
+ used in advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.
+
+ DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ SOFTWARE.
+
+
+ COPYRIGHT 1990
+ DIGITAL EQUIPMENT CORPORATION
+ MAYNARD, MASSACHUSETTS
+ ALL RIGHTS RESERVED.
+
+ THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
+ SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
+ DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
+ FOR ANY PURPOSE. IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
+ WARRANTY.
+
+ IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT
+ RIGHTS, APPROPRIATE LEGENDS MAY BE PLACED ON THE DERIVATIVE WORK IN
+ ADDITION TO THAT SET FORTH ABOVE.
+
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted, provided
+ that the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of Digital Equipment Corporation not be
+ used in advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.
+
xkbevd:
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
commit 13366609b99f70d851cc43beb02d01fdcbc8e1a6
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 7 20:10:45 2008 +0100
xkbcomp 1.0.4
diff --git a/debian/changelog b/debian/changelog
index 4cdbe31..46a5167 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-xkb-utils (7.4+1) UNRELEASED; urgency=low
+
+ * xkbcomp 1.0.4.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 07 Mar 2008 20:10:33 +0100
+
x11-xkb-utils (7.3+1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/xkbcomp/COPYING b/xkbcomp/COPYING
index 7f33cbf..fc22e80 100644
--- a/xkbcomp/COPYING
+++ b/xkbcomp/COPYING
@@ -1,12 +1,90 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
+THE USE OR PERFORMANCE OF THIS SOFTWARE.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Copyright 1988, 1998 The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+
+Copyright 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+ All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+
+ COPYRIGHT 1990
+ DIGITAL EQUIPMENT CORPORATION
+ MAYNARD, MASSACHUSETTS
+ ALL RIGHTS RESERVED.
+
+THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
+SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
+DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
+FOR ANY PURPOSE. IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
+WARRANTY.
+
+IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT
+RIGHTS, APPROPRIATE LEGENDS MAY BE PLACED ON THE DERIVATIVE WORK IN
+ADDITION TO THAT SET FORTH ABOVE.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted, provided
+that the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Digital Equipment Corporation not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
diff --git a/xkbcomp/ChangeLog b/xkbcomp/ChangeLog
index 093899d..2e3b422 100644
--- a/xkbcomp/ChangeLog
+++ b/xkbcomp/ChangeLog
@@ -1,51 +1,317 @@
-2006-04-26 Adam Jackson <ajax@freedesktop.org>
+commit c1cc023fc50ce3a4a23f4682ebefd2301fd13170
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Feb 29 15:30:34 2008 -0500
- * configure.ac:
- Bump to 1.0.2
+ Bug #7645: Fix a conditional that always evaluates to FALSE.
+
+ Since it's if (0 || foo), simplify to if (foo).
-2006-04-03 Daniel Stone <daniel@freedesktop.org>
+commit 3f8bd7e68d0028bce5075124a32cc004166486c6
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Tue Jan 22 16:05:14 2008 -0800
- * compat.c:
- Bug #4851: Fix up have-no-file test.
+ Bug 14185: MAINTAINERCLEANFILES multiply defined in Makefile.am
+
+ <http://bugs.freedesktop.org/show_bug.cgi?id=14185>
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 2421069a3686f7bff702383675fdb77be108021e
+Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
+Date: Sun Jan 6 11:40:30 2008 +0100
- * configure.ac:
- Update package version for X11R7 release.
+ Revert "Also mark xkbparse.h as a generated file."
+ Apparently only yacc generates it.
+
+ This reverts commit 3e5b0d615b94c66a2b5a8b3d2e4a04713a442002.
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 3e5b0d615b94c66a2b5a8b3d2e4a04713a442002
+Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
+Date: Sun Jan 6 11:17:07 2008 +0100
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Also mark xkbparse.h as a generated file.
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 686e8b6d33602f5fb7de7a768e532a4ac8090c26
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Dec 6 16:37:18 2007 -0500
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Replace static ChangeLog with dist-hook to generate from git log
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 6aae208fe5bd8f71757c294a441d7c599a1ec4a1
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sun Sep 23 20:15:47 2007 +0200
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Ignore *.o and ylwrap.
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 829cb75130d1edd88fa1d33e277f49167daedacf
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sun Sep 23 20:15:13 2007 +0200
- * configure.ac:
- Update package version number for RC1 release.
+ Fixed a bunch of const correctness bugs.
-2005-10-15 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e8ffa513a109209849b11a3c608356cc28314a8e
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sun Sep 23 17:50:41 2007 +0200
- * Makefile.am: Have generated files be cleaned by maintainer in
- order to pass check-tarball test.
+ Fixed an invalid memory access.
+
+ Some keynames are less than 3 characters long (not counting the
+ terminator). We're now also initializing all of the keyName array.
-2005-09-01 Kristian Høgsberg <krh@redhat.com>
+commit dfa65b0c8df6a6aab4f86c32a0acb41f44201e7c
+Author: Daniel Drake <ddrake@brontes3d.com>
+Date: Mon May 21 13:41:00 2007 -0800
- * Makefile.am (AM_CFLAGS): Define DFLT_XKB_CONFIG_ROOT to
- $(datadir)/X11/xkb so we look in the right place.
+ Bug #11025: xkbcomp COPYING file
+
+ X.Org Bugzilla #11025 <https://bugs.freedesktop.org/show_bug.cgi?id=11025>
-2005-08-02 Keith Packard <keithp@keithp.com>
+commit 3ca028cf767258fd62fb7a1b0eb22d13d333a3ae
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:51:25 2007 -0400
- * Makefile.am:
- Mark generated files as BUILT_SOURCES and CLEANFILES
- to ensure they are regenerated after 'make clean' and
- to make parallel builds work right.
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit b00e474ca8dbbb0166f2108e4b08cc3f9c36c735
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Aug 23 19:24:52 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit 313a2748d3dff872e067d515d6deabe1bbd56fbe
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Nov 8 16:30:57 2006 +0200
+
+ bump to 1.0.3
+
+commit 337ed258a1cd3f5a16fa69ef15e98781e76f63a1
+Author: Etsushi Kato <ek.kato@gmail.com>
+Date: Wed Nov 8 16:29:16 2006 +0200
+
+ compat: avoid use of uninitialised variable (bug #8846)
+ si.interp.match may be unused, so just clobber it, which means we don't
+ end up with stuff like LevelOneOnlyMask wandering in.
+
+commit d920bbadb94684287f70e50ded2a35d65186c188
+Author: Andriy Gapon <avg@icyb.net.ua>
+Date: Sun Oct 29 02:59:53 2006 +0300
+
+ parser: accept negative numbers in geometry co-ordinates (bug #8763)
+ Accept negative co-ordinates for geometry, per the spec.
+
+commit 0e8fd676de161ba52bb4544f8641be756bc580a1
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Apr 26 23:41:58 2006 +0000
+
+ Bump to 1.0.2
+
+commit 58c77c8db1bfdc739fac7b100fb813028d0449c7
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Mon Apr 3 11:28:43 2006 +0000
+
+ Bug #4851: Fix up have-no-file test.
+
+commit 02d32f8dbc79116d33ef428d5b064009cdd6a06e
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:29:51 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 836db774d1f08a050af8717c4c8501f337f36281
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:22:44 2005 +0000
+
+ Stub COPYING files
+
+commit e9f680c5654cd93d30b16bc4b626ae5b25f84e87
+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 b158f550fce661d67604f4a23d33a9f3b7bc22a1
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:22 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit f1370c50b199c3c8b2760ebf0228d741855390d7
+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 8eb3737f5bce19b89c80d9ab256204f0fa62529b
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:01:43 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 f19c3028c34a0dba4ffb9ae19c13421e7ff0ff12
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:35:01 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 3ada747f1cb5400404e4b63430f7a817dbf0c4cb
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Sun Nov 20 22:08:53 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit 4eeb611f17bdc01f7a6cb4db3f0997ce5ecc6361
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:47:54 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 958d09064c96cb50df6f92bfb8d4754c87451920
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 23:56:23 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 950fba3262905c58891773a8795305e685dc1cb3
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Oct 15 19:32:52 2005 +0000
+
+ Have generated files be cleaned by maintainer in order to pass
+ check-tarball test.
+
+commit a83e4bb777d6f9b1b42a7fb3ff84a5e0d7e123c7
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Fri Oct 14 00:25:46 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 8c0d310c1acccc424dae29554a5075f9b339e95f
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Sep 1 19:37:02 2005 +0000
+
+ Define DFLT_XKB_CONFIG_ROOT to $(datadir)/X11/xkb so we look in the right
+ place.
+
+commit fabda6a820bdccae85a7c22ad0b30f089952606b
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Aug 2 18:03:01 2005 +0000
+
+ Mark generated files as BUILT_SOURCES and CLEANFILES to ensure they are
+ regenerated after 'make clean' and to make parallel builds work right.
+
+commit 35e0b7ef41ffe1f17ad8f21dbda10267961231ea
+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 e447fee50a8014b5281a5abfcc5e468f8cc130ca
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Fri Jul 22 15:08:19 2005 +0000
+
+ Use YACC to compile xkbparse.y.
+
+commit 34cd161f5947b4dc185356bc65653717f56ced00
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Jul 20 19:31:57 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 8335e5fa471e25675c6a369ec2348883953fcdd0
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Sat Jul 16 20:56:47 2005 +0000
+
+ Add xkbcomp data to symlink.sh. Some fixes to xkbcomp/Makefile.am
+
+commit d7b3354575f31caa9044b6c5f7aee4f010f6192a
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Fri Jul 15 18:02:35 2005 +0000
+
+ Build system for xkbcomp
+
+commit 59e48918e7c252926bb5e51a077bcbc8a7eec829
+Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
+Date: Mon Nov 15 15:06:52 2004 +0000
+
+ Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added
+ mingw (Win32) port
+
+commit 0336e043fab6f2a8828d90bc9eef2e23878f6dd1
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Sep 3 23:41:22 2004 +0000
+
+ Update formatted docs.
+
+commit 20240438ef9d3a6c66443ca9f095a2766ef6ed4e
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:54:50 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit a3729a9f9fcda07b233f434266148c8751684347
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:35:25 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 37a1152a4024fb799fe1272ce378e6c7c97ee951
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:13:08 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 55f40d0286d0e2e4b1602f983b749352188c3ec4
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:36:25 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 2a95cda1d358fc309c78dc5201a1dbacaba9d0bf
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:24:08 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit dbba2cffbc57e5bbdec8f24417a8a5dcfef7c2a2
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Jan 29 08:09:12 2004 +0000
+
+ Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit 8aa5bcfe58d3776746d7b0d627f2fb8744fb0817
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Dec 19 20:55:58 2003 +0000
+
+ XFree86 4.3.99.902 (RC 2)
+
+commit 37ebbbe7b11febaf548006a9b73db0eebf79881a
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:29:13 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 287ac4c6af61d8f9f95cd3b3219c979e1329a2fe
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:49:22 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 262961d88faf67f69f4630acb8234a4f2c5a6e80
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:49:22 2003 +0000
+
+ Initial revision
+
+commit 2af3aabf0e7eb1514d39b29a6b58fcd0d4de41d1
+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/xkbcomp/INSTALL b/xkbcomp/INSTALL
index 23e5f25..e69de29 100644
--- a/xkbcomp/INSTALL
+++ b/xkbcomp/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/xkbcomp/Makefile.am b/xkbcomp/Makefile.am
index 3e63535..ffcbcbd 100644
--- a/xkbcomp/Makefile.am
+++ b/xkbcomp/Makefile.am
@@ -98,3 +98,13 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES += ChangeLog
+
+.PHONY: ChangeLog
+
+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
diff --git a/xkbcomp/Makefile.in b/xkbcomp/Makefile.in
index ea32cea..daf0a98 100644
--- a/xkbcomp/Makefile.in
+++ b/xkbcomp/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 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 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,17 +55,18 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
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
-subdir = .
+ 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) \
$(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 =
@@ -86,14 +83,16 @@ am_xkbcomp_OBJECTS = action.$(OBJEXT) alias.$(OBJEXT) compat.$(OBJEXT) \
xkbcomp_OBJECTS = $(am_xkbcomp_OBJECTS)
am__DEPENDENCIES_1 =
xkbcomp_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ ||
YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+YLWRAP = $(top_srcdir)/ylwrap
SOURCES = $(xkbcomp_SOURCES)
Reply to: