x11-xkb-utils: Changes to 'debian-unstable'
debian/changelog | 35
debian/control | 9
debian/copyright | 66
debian/rules | 6
setxkbmap/COPYING | 30
setxkbmap/ChangeLog | 165 +
setxkbmap/INSTALL | 291 ++
setxkbmap/Makefile.am | 36
setxkbmap/Makefile.in | 300 +--
setxkbmap/README | 27
setxkbmap/aclocal.m4 | 1244 +++++++++---
setxkbmap/config.guess | 243 +-
setxkbmap/config.h.in | 3
setxkbmap/config.sub | 91
setxkbmap/configure | 3927 +++++++++++++++++++---------------------
setxkbmap/configure.ac | 28
setxkbmap/depcomp | 87
setxkbmap/install-sh | 5
setxkbmap/missing | 49
setxkbmap/setxkbmap.c | 16
setxkbmap/setxkbmap.man | 6
xkbcomp/ChangeLog | 79
xkbcomp/Makefile.am | 22
xkbcomp/Makefile.in | 26
xkbcomp/aclocal.m4 | 2528 +++++++++++++-------------
xkbcomp/config.guess | 11
xkbcomp/config.h.in | 3
xkbcomp/config.sub | 61
xkbcomp/configure | 1813 ++++++------------
xkbcomp/configure.ac | 19
xkbcomp/parseutils.c | 2
xkbcomp/xkbparse.c | 663 +-----
xkbevd/COPYING | 30
xkbevd/ChangeLog | 223 ++
xkbevd/INSTALL | 291 ++
xkbevd/Makefile.am | 36
xkbevd/Makefile.in | 68
xkbevd/aclocal.m4 | 877 +++++++--
xkbevd/cfgparse.c | 70
xkbevd/cfgparse.y | 26
xkbevd/cfgscan.c | 38
xkbevd/config.guess | 210 --
xkbevd/config.h.in | 3
xkbevd/config.sub | 115 -
xkbevd/configure | 3994 ++++++++++++++++++-----------------------
xkbevd/configure.ac | 37
xkbevd/evargs.c | 22
xkbevd/example.cf | 1
xkbevd/printev.c | 26
xkbevd/tokens.h | 19
xkbevd/utils.c | 40
xkbevd/utils.h | 49
xkbevd/xkbevd.c | 74
xkbevd/xkbevd.h | 20
xkbevd/xkbevd.man | 44
xkbprint/ChangeLog | 109 +
xkbprint/INSTALL | 291 ++
xkbprint/Makefile.am | 30
xkbprint/Makefile.in | 62
xkbprint/aclocal.m4 | 877 +++++++--
xkbprint/config.guess | 210 --
xkbprint/config.h.in | 3
xkbprint/config.sub | 115 -
xkbprint/configure | 4657 +++++++++++++++++-------------------------------
xkbprint/configure.ac | 24
xkbutils/COPYING | 72
xkbutils/ChangeLog | 179 +
xkbutils/INSTALL | 291 ++
xkbutils/LED.c | 2
xkbutils/Makefile.am | 31
xkbutils/Makefile.in | 62
xkbutils/aclocal.m4 | 851 +++++++-
xkbutils/compile | 6
xkbutils/config.guess | 210 --
xkbutils/config.h.in | 3
xkbutils/config.sub | 115 -
xkbutils/configure | 4401 +++++++++++++++++++--------------------------
xkbutils/configure.ac | 34
xkbutils/xkbbell.man | 39
xkbutils/xkbvleds.man | 39
xkbutils/xkbwatch.man | 39
81 files changed, 16100 insertions(+), 14856 deletions(-)
New commits:
commit ea90177cecc75f21c995a88498ea3ed6750ab1db
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 10 17:49:31 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 0f29dbd..f46e181 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xkb-utils (7.6+2) UNRELEASED; urgency=low
+x11-xkb-utils (7.6+2) unstable; urgency=low
[ Cyril Brulebois ]
* Install xkbevd's example.cf file (Closes: #80510).
@@ -10,8 +10,9 @@ x11-xkb-utils (7.6+2) UNRELEASED; urgency=low
work!
* Drop Pre-Depends on x11-common.
* Bump Standards-Version to 3.9.1.
+ * Upload to unstable.
- -- Cyril Brulebois <kibi@debian.org> Fri, 14 Jan 2011 23:45:32 +0100
+ -- Julien Cristau <jcristau@debian.org> Thu, 10 Feb 2011 17:59:27 +0100
x11-xkb-utils (7.6+1) experimental; urgency=low
commit 1d929b6aedd67fd79ad436ad2d18dd91828c1a1a
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 10 17:56:01 2011 +0100
Bump Standards-Version to 3.9.1.
diff --git a/debian/changelog b/debian/changelog
index 17800b5..0f29dbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x11-xkb-utils (7.6+2) UNRELEASED; urgency=low
* Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your
work!
* Drop Pre-Depends on x11-common.
+ * Bump Standards-Version to 3.9.1.
-- Cyril Brulebois <kibi@debian.org> Fri, 14 Jan 2011 23:45:32 +0100
diff --git a/debian/control b/debian/control
index 166a14c..320a808 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
# xkbevd: libx11-dev, libxkbfile-dev, (bison)
# xkbprint: libx11-dev, libxkbfile-dev
# xkbutils: libx11-dev, libxaw7-dev, x11proto-core-dev
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
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 b401887e9272ffdd82e9f66cddc5b4f0a3cbc723
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 10 17:55:01 2011 +0100
Drop Pre-Depends on x11-common.
diff --git a/debian/changelog b/debian/changelog
index 1e11048..17800b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ x11-xkb-utils (7.6+2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your
work!
+ * Drop Pre-Depends on x11-common.
-- Cyril Brulebois <kibi@debian.org> Fri, 14 Jan 2011 23:45:32 +0100
diff --git a/debian/control b/debian/control
index d1f9ae9..166a14c 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,6 @@ 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}
-Pre-Depends: x11-common (>= 1:7.0.0)
Replaces: xbase-clients (<= 1:7.2.ds2-3)
Description: X11 XKB utilities
xkbutils contains a number of client-side utilities for XKB, the X11
commit 2c147a1aeb7c89e2db42f32cf6c662875802344b
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 10 17:56:46 2011 +0100
Remove Brice Goglin and David Nusinow from Uploaders.
Thanks for your work!
diff --git a/debian/changelog b/debian/changelog
index 985e775..1e11048 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
x11-xkb-utils (7.6+2) UNRELEASED; urgency=low
+ [ Cyril Brulebois ]
* Install xkbevd's example.cf file (Closes: #80510).
* Switch dh_install from --list-missing to --fail-missing for added
safety.
+ [ Julien Cristau ]
+ * Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your
+ work!
+
-- Cyril Brulebois <kibi@debian.org> Fri, 14 Jan 2011 23:45:32 +0100
x11-xkb-utils (7.6+1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index e14f400..d1f9ae9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11-xkb-utils
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
commit cde55363f6aa0a9d33e6451beb0c5ce98d12f98f
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 10 17:48:39 2011 +0100
Make get-tarballs download into the current directory
diff --git a/debian/rules b/debian/rules
index c1743ef..97f0daa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -112,4 +112,4 @@ get-tarballs: $(addprefix get-tarball-,$(SUBDIRS))
.PHONY: get-tarball-%
get-tarball-%:
- uscan --no-conf --download --no-symlink --package $* --upstream-version $(shell awk -F = '/^PACKAGE_VERSION=/ { print $$2 }' < $*/configure ) --watchfile debian/watch.$* || test $$? = 1
+ uscan --no-conf --destdir . --download --no-symlink --package $* --upstream-version $(shell awk -F = '/^PACKAGE_VERSION=/ { print $$2 }' < $*/configure ) --watchfile debian/watch.$* || test $$? = 1
commit f9839cea7d2e8c0523bc782853746f7b42f1d06a
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jan 14 23:50:13 2011 +0100
Switch dh_install from --list-missing to --fail-missing for added safety.
diff --git a/debian/changelog b/debian/changelog
index cd0eb8c..985e775 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
x11-xkb-utils (7.6+2) UNRELEASED; urgency=low
* Install xkbevd's example.cf file (Closes: #80510).
+ * Switch dh_install from --list-missing to --fail-missing for added
+ safety.
-- Cyril Brulebois <kibi@debian.org> Fri, 14 Jan 2011 23:45:32 +0100
diff --git a/debian/rules b/debian/rules
index a0e7c4b..c1743ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,7 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install --sourcedir=debian/tmp --fail-missing
install -m 644 xkbevd/example.cf \
debian/x11-xkb-utils/usr/share/doc/x11-xkb-utils/xkbevd-example.cf
dh_installchangelogs
commit fe221ffd9e66c8824ccaae0bee871001645ff907
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jan 14 23:49:57 2011 +0100
Install xkbevd's example.cf file (Closes: #80510).
diff --git a/debian/changelog b/debian/changelog
index 6396d01..cd0eb8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-xkb-utils (7.6+2) UNRELEASED; urgency=low
+
+ * Install xkbevd's example.cf file (Closes: #80510).
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 14 Jan 2011 23:45:32 +0100
+
x11-xkb-utils (7.6+1) experimental; urgency=low
[ Robert Hooker ]
diff --git a/debian/rules b/debian/rules
index ffd4348..a0e7c4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,6 +86,8 @@ binary-arch: build install
dh_installdocs
dh_install --sourcedir=debian/tmp --list-missing
+ install -m 644 xkbevd/example.cf \
+ debian/x11-xkb-utils/usr/share/doc/x11-xkb-utils/xkbevd-example.cf
dh_installchangelogs
dh_link
dh_strip
commit 72a71064dde79655633d5490bfe29ff7982dbc19
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Jan 13 18:52:55 2011 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 0533301..6396d01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xkb-utils (7.6+1) UNRELEASED; urgency=low
+x11-xkb-utils (7.6+1) experimental; urgency=low
[ Robert Hooker ]
* New upstream releases:
@@ -15,7 +15,7 @@ x11-xkb-utils (7.6+1) UNRELEASED; urgency=low
* Update debian/copyright from xkbutils upstream COPYING.
* Add x11proto-core-dev build-dep for xkbutils.
- -- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 18:07:37 -0400
+ -- Cyril Brulebois <kibi@debian.org> Thu, 13 Jan 2011 18:52:46 +0100
x11-xkb-utils (7.5+5) unstable; urgency=low
commit 1df0236885a64368808b96c899ec3f5ce66ec22a
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Jan 13 18:45:08 2011 +0100
Add x11proto-core-dev build-dep for xkbutils.
diff --git a/debian/changelog b/debian/changelog
index 79d9123..0533301 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ x11-xkb-utils (7.6+1) UNRELEASED; urgency=low
- xkbevd 1.1.2
- xkbprint 1.0.3
* Update debian/copyright from xkbutils upstream COPYING.
+ * Add x11proto-core-dev build-dep for xkbutils.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 18:07:37 -0400
diff --git a/debian/control b/debian/control
index 8df649d..e14f400 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Build-Depends:
libxkbfile-dev (>= 1:1.0.6-2),
bison,
quilt,
- xutils-dev (>= 1:7.5+4)
+ xutils-dev (>= 1:7.5+4),
+ x11proto-core-dev,
# Reasons for build-depends:
# debhelper for the packaging, pkg-config needed by configure scripts
# Individual apps:
@@ -19,7 +20,7 @@ Build-Depends:
# xkbcomp: libx11-dev, libxkbfile-dev
# xkbevd: libx11-dev, libxkbfile-dev, (bison)
# xkbprint: libx11-dev, libxkbfile-dev
-# xkbutils: libx11-dev, libxaw7-dev, libxkbfile-dev
+# xkbutils: libx11-dev, libxaw7-dev, x11proto-core-dev
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 e22fb1c90c48de053495cf303efe9a652e81d7f5
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Jan 13 18:41:57 2011 +0100
Update debian/copyright from xkbutils upstream COPYING.
diff --git a/debian/changelog b/debian/changelog
index 5eeb7d6..79d9123 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ x11-xkb-utils (7.6+1) UNRELEASED; urgency=low
* New upstream releases:
- xkbevd 1.1.2
- xkbprint 1.0.3
+ * Update debian/copyright from xkbutils upstream COPYING.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 18:07:37 -0400
diff --git a/debian/copyright b/debian/copyright
index 0b76678..060256e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -166,25 +166,71 @@ xkbprint:
THE USE OR PERFORMANCE OF THIS SOFTWARE.
xkbutils:
- Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
-
+ Copyright (c) 1993, 1995 by Silicon Graphics Computer Systems, Inc.
+
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
+ 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
+ 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.
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ 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
+ 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.
+
+
+ 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.
+
+
+ Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the next
+ paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
commit 747a9906fbfadb3262ea29d47e7460cecf1485bf
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Jan 13 13:19:38 2011 +0100
Document new upstream releases.
diff --git a/debian/changelog b/debian/changelog
index 9d3cecc..5eeb7d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
x11-xkb-utils (7.6+1) UNRELEASED; urgency=low
+ [ Robert Hooker ]
* New upstream releases:
- setxkbmap 1.2.0
- xkbcomp 1.2.0
@@ -7,6 +8,11 @@ x11-xkb-utils (7.6+1) UNRELEASED; urgency=low
- xkbutils 1.0.3
* Add xutils-dev to build deps.
+ [ Cyril Brulebois ]
+ * New upstream releases:
+ - xkbevd 1.1.2
+ - xkbprint 1.0.3
+
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 18:07:37 -0400
x11-xkb-utils (7.5+5) unstable; urgency=low
commit 505544dcaddc9639260f85da52cc891f0c186591
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Jan 13 13:18:46 2011 +0100
xkbprint 1.0.3
diff --git a/xkbprint/AUTHORS b/xkbprint/AUTHORS
deleted file mode 100644
index e69de29..0000000
diff --git a/xkbprint/ChangeLog b/xkbprint/ChangeLog
index 8b79b17..be3a9ac 100644
--- a/xkbprint/ChangeLog
+++ b/xkbprint/ChangeLog
@@ -1,3 +1,112 @@
+commit 93479193971679781c302dcfda3f653ea67fb452
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Jan 7 19:09:37 2011 -0800
+
+ xkbprint 1.0.3
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c6cb1b17600e2c2937751a712c7eadd411eb6da9
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Jan 5 17:03:30 2011 -0800
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM statements under the Automake initialization section.
+ Add missing AC_CONFIG_SRCDIR
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 5d321bc363ce5ef67a1297e24ed184a28eed4e9d
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Jan 5 17:00:42 2011 -0800
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ Enables use of platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 16c0b77e78ce2ce750b690469850294f5e69ab97
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jan 5 16:58:47 2011 -0800
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 6b8537579db562937af77ca5a4b0e19893a7bbee
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Jan 5 16:58:25 2011 -0800
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f15a69148c2ed5cf1717a0ad942ecdfcf037104d
+Author: Gaetan Nadon <memsize@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 90d54a9a94ac30ac6ee7fa78ea8e6a898490afe6
+Author: Gaetan Nadon <memsize@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 8d49899afe456a93c2bb7477b963fd31dbad5942
+Author: Gaetan Nadon <memsize@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 d2d7a487230ebc281aa2d1a88038befb69e63b7d
+Author: Gaetan Nadon <memsize@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 2683cf26ec97c49fac6145227d9f4cae3fa8a1bd
+Author: Gaetan Nadon <memsize@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 31b7584cd60accc2d7dbaf5797d34495e321b793
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Nov 10 23:39:43 2009 -0800
diff --git a/xkbprint/INSTALL b/xkbprint/INSTALL
index e69de29..8b82ade 100644
--- a/xkbprint/INSTALL
+++ b/xkbprint/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/xkbprint/Makefile.am b/xkbprint/Makefile.am
index faa9e99..9ab9834 100644
--- a/xkbprint/Makefile.am
+++ b/xkbprint/Makefile.am
@@ -40,38 +40,22 @@ appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-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
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(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/xkbprint/Makefile.in b/xkbprint/Makefile.in
index b9d5fda..27f3115 100644
--- a/xkbprint/Makefile.in
+++ b/xkbprint/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,8 +60,8 @@ bin_PROGRAMS = xkbprint$(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
+ $(top_srcdir)/configure COPYING ChangeLog INSTALL 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) \
@@ -135,6 +135,7 @@ am__remove_distdir = \
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
Reply to: