debian/README.source | 73 debian/changelog | 109 debian/control | 32 debian/copyright | 67 debian/patches/10_debian_add_xkbpath_env_variable.diff | 88 debian/patches/11_xkb_documentation_updates.diff | 2 debian/patches/series | 1 debian/rules | 48 debian/watch.setxkbmap | 2 debian/watch.xkbcomp | 2 debian/watch.xkbevd | 2 debian/watch.xkbprint | 2 debian/watch.xkbutils | 2 debian/x11-xkb-utils-udeb.install | 2 debian/xsfbs/repack.sh | 32 debian/xsfbs/xsfbs-autoreconf.mk | 150 debian/xsfbs/xsfbs.mk | 188 debian/xsfbs/xsfbs.sh | 533 - setxkbmap/COPYING | 30 setxkbmap/ChangeLog | 217 setxkbmap/INSTALL | 291 setxkbmap/Makefile.am | 36 setxkbmap/Makefile.in | 321 setxkbmap/README | 27 setxkbmap/aclocal.m4 | 1360 +++ setxkbmap/config.guess | 291 setxkbmap/config.h.in | 33 setxkbmap/config.sub | 149 setxkbmap/configure | 5569 +++++++++------ setxkbmap/configure.ac | 22 setxkbmap/depcomp | 116 setxkbmap/install-sh | 231 setxkbmap/missing | 49 setxkbmap/setxkbmap.c | 1319 ++- setxkbmap/setxkbmap.man | 8 xkbcomp/COPYING | 94 xkbcomp/ChangeLog | 831 ++ xkbcomp/INSTALL | 143 xkbcomp/Makefile.am | 38 xkbcomp/Makefile.in | 425 - xkbcomp/README | 1 xkbcomp/README.config | 1 xkbcomp/README.enhancing | 1 xkbcomp/aclocal.m4 | 2464 ++++--- xkbcomp/action.c | 2200 +++--- xkbcomp/action.h | 47 xkbcomp/alias.c | 386 - xkbcomp/alias.h | 51 xkbcomp/compat.c | 1319 ++- xkbcomp/compat.h | 1 xkbcomp/config.guess | 299 xkbcomp/config.h.in | 48 xkbcomp/config.sub | 223 xkbcomp/configure | 5773 +++++++++------- xkbcomp/configure.ac | 33 xkbcomp/depcomp | 172 xkbcomp/expr.c | 1753 ++-- xkbcomp/expr.h | 281 xkbcomp/geometry.c | 5907 +++++++++------- xkbcomp/indicators.c | 848 +- xkbcomp/indicators.h | 85 xkbcomp/install-sh | 517 + xkbcomp/keycodes.c | 1321 ++- xkbcomp/keycodes.h | 16 xkbcomp/keymap.c | 247 xkbcomp/keytypes.c | 1908 ++--- xkbcomp/listing.c | 547 - xkbcomp/misc.c | 804 +- xkbcomp/misc.h | 171 xkbcomp/missing | 104 xkbcomp/parseutils.c | 1092 +-- xkbcomp/parseutils.h | 330 xkbcomp/symbols.c | 3547 +++++----- xkbcomp/tokens.h | 6 xkbcomp/utils.c | 353 - xkbcomp/utils.h | 221 xkbcomp/vmod.c | 321 xkbcomp/vmod.h | 85 xkbcomp/xkbcomp.c | 1818 ++--- xkbcomp/xkbcomp.h | 430 - xkbcomp/xkbcomp.man | 9 xkbcomp/xkbparse.c | 470 - xkbcomp/xkbparse.y | 60 xkbcomp/xkbpath.c | 498 - xkbcomp/xkbpath.h | 66 xkbcomp/xkbscan.c | 1003 +- xkbcomp/ylwrap | 222 xkbevd/COPYING | 30 xkbevd/ChangeLog | 433 + xkbevd/INSTALL | 143 xkbevd/Makefile.am | 43 xkbevd/Makefile.in | 535 - xkbevd/README | 24 xkbevd/aclocal.m4 | 2464 ++++--- xkbevd/cfgparse.c | 855 +- xkbevd/cfgscan.c | 4 xkbevd/compile | 142 xkbevd/config.guess | 299 xkbevd/config.h.in | 42 xkbevd/config.sub | 223 xkbevd/configure | 5595 +++++++++------ xkbevd/configure.ac | 24 xkbevd/depcomp | 172 xkbevd/install-sh | 517 + xkbevd/missing | 104 xkbevd/mkinstalldirs | 158 xkbevd/utils.c | 43 xkbevd/utils.h | 2 xkbevd/xkbevd.c | 32 xkbevd/xkbevd.cf | 7 xkbevd/xkbevd.man | 2 xkbevd/ylwrap | 222 xkbprint/COPYING | 51 xkbprint/ChangeLog | 256 xkbprint/INSTALL | 236 xkbprint/Makefile.am | 14 xkbprint/Makefile.in | 419 - xkbprint/README | 26 xkbprint/aclocal.m4 | 1847 ++--- xkbprint/compile | 142 xkbprint/config.guess | 107 xkbprint/config.h.in | 39 xkbprint/config.sub | 128 xkbprint/configure | 4984 ++++++++++---- xkbprint/configure.ac | 12 xkbprint/depcomp | 172 xkbprint/install-sh | 517 + xkbprint/missing | 104 xkbprint/mkinstalldirs | 158 xkbprint/psgeom.c | 10 xkbprint/utils.c | 44 xkbprint/utils.h | 2 xkbprint/xkbprint.c | 6 xkbprint/xkbprint.man | 2 xkbutils/COPYING | 72 xkbutils/ChangeLog | 400 + xkbutils/INSTALL | 143 xkbutils/LED.c | 8 xkbutils/Makefile.am | 35 xkbutils/Makefile.in | 506 + xkbutils/README | 31 xkbutils/aclocal.m4 | 2143 ++++-- xkbutils/compile | 21 xkbutils/config.guess | 1505 ++++ xkbutils/config.h.in | 45 xkbutils/config.sub | 1739 ++++ xkbutils/configure | 5975 ++++++++++------- xkbutils/configure.ac | 30 xkbutils/depcomp | 172 xkbutils/install-sh | 517 + xkbutils/missing | 104 xkbutils/mkinstalldirs | 158 xkbutils/utils.c | 41 xkbutils/utils.h | 6 xkbutils/xkbbell.c | 2 xkbutils/xkbbell.man | 75 xkbutils/xkbvleds.c | 18 xkbutils/xkbvleds.man | 77 xkbutils/xkbwatch.c | 5 xkbutils/xkbwatch.man | 26 160 files changed, 53663 insertions(+), 32576 deletions(-)
New commits: commit 660147ec70aea3b0bb63035c80247e78771b2349 Author: Robert Hooker <sarv...@ubuntu.com> Date: Tue Nov 2 18:12:19 2010 -0400 Add xutils-dev to build deps. diff --git a/debian/changelog b/debian/changelog index 26dfd0c..9d3cecc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ x11-xkb-utils (7.6+1) UNRELEASED; urgency=low - xkbcomp 1.2.0 - xkbevd 1.1.1 - xkbutils 1.0.3 + * Add xutils-dev to build deps. -- Robert Hooker <sarv...@ubuntu.com> Tue, 02 Nov 2010 18:07:37 -0400 diff --git a/debian/control b/debian/control index ca93554..8df649d 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: libxkbfile-dev (>= 1:1.0.6-2), bison, quilt, + xutils-dev (>= 1:7.5+4) # Reasons for build-depends: # debhelper for the packaging, pkg-config needed by configure scripts # Individual apps: commit 973a5ebe13f30692efe4e9d0c4d60f43e07caf08 Author: Robert Hooker <sarv...@ubuntu.com> Date: Tue Nov 2 18:09:10 2010 -0400 Update changelog. diff --git a/debian/changelog b/debian/changelog index 5f06cc8..26dfd0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +x11-xkb-utils (7.6+1) UNRELEASED; urgency=low + + * New upstream releases: + - setxkbmap 1.2.0 + - xkbcomp 1.2.0 + - xkbevd 1.1.1 + - xkbutils 1.0.3 + + -- Robert Hooker <sarv...@ubuntu.com> Tue, 02 Nov 2010 18:07:37 -0400 + x11-xkb-utils (7.5+5) unstable; urgency=low * One more xkbcomp fix, this time to be able to detect EOF on architectures commit 6e4c1160307a605e7c64b52bf2f035c0727f4e7e Author: Robert Hooker <sarv...@ubuntu.com> Date: Tue Nov 2 18:02:10 2010 -0400 xkbutils 1.0.3 diff --git a/xkbutils/AUTHORS b/xkbutils/AUTHORS deleted file mode 100644 index e69de29..0000000 diff --git a/xkbutils/COPYING b/xkbutils/COPYING index 7f33cbf..9bba684 100644 --- a/xkbutils/COPYING +++ b/xkbutils/COPYING @@ -1,12 +1,68 @@ -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) 1993, 1995 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 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. diff --git a/xkbutils/ChangeLog b/xkbutils/ChangeLog index 026c193..058b94a 100644 --- a/xkbutils/ChangeLog +++ b/xkbutils/ChangeLog @@ -1,3 +1,182 @@ +commit 820d9be7cf4e501c931c4e31b38ddd2d55209ce2 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sat Oct 30 10:14:38 2010 -0700 + + xkbutils 1.0.3 + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 19b8c1dfc637245e306b34a3aef69370cfe8059b +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Fri Oct 1 17:36:33 2010 -0400 + + config: update direct dependencies for xkbvleds and xkbwatch + + Depends on xproto through the inclusion of X.h. + Depends on x11 through the inclusion of Xlib.h. + Depends on Xaw through the inclusion of XawInit.h + Depends on Xt through the inclusion of IntrinsicP.h + + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 73401c0d6679ff6a1c06d732c192a69cf70a27fc +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Fri Oct 1 17:34:53 2010 -0400 + + config: update direct dependencies for xkbbell + + Depends on xproto through the inclusion of Xproto.h. + Depends on inputproto through the inclusion of XI.h + Depends on x11 through the inclusion of Xlib.h. + Does not depend on xkbfile for headers or libs. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 5778996d90d7ddee169e1dbf48a11896ee2fd34c +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Sun Aug 8 10:55:06 2010 -0400 + + LED.c: remove unrequired X11/Xmu includes + + This removes a direct dependencies which was not reflected + in configure.ac. + Xaw privatly requires Xmu. + + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 1f08410c81e7b9bb1fc5ac9e40e37c26906bfd0c +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Thu Sep 23 20:46:12 2010 -0700 + + 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.coopersm...@oracle.com> + +commit b7de2aa690fbf033e74427d1d37ffa49cbfd031a +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Thu Sep 23 20:10:43 2010 -0700 + + 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.coopersm...@oracle.com> + +commit 03459ea3c60c19703c958b1f7199021168c49cdd +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Tue Jul 20 18:45:18 2010 -0400 + + 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 <mems...@videotron.ca> + +commit 5b5542b8a581754a87ba0d466e403e1f47e17103 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Aug 6 09:19:28 2010 -0700 + + Sun copyrights are now owned by Oracle + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 7aa41989a5aede80b97a1306bd782842baf35bce +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Aug 6 09:17:10 2010 -0700 + + Add DEC notice from utils.c to COPYING + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit bd94930d9082095886f469965264dc352f0bbbb2 +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Thu Jan 14 22:46:10 2010 -0800 + + Add missing notices to COPYING file + + Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com> + +commit 5bed941fa0064823bfbe21c37729df02a5aa9b97 +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Thu Jan 14 22:18:41 2010 -0800 + + Update Sun license notices to current X.Org standard form + + Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com> + +commit d2d6d39c60fa224752066b9d0791306c5fd4efad +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Thu Jan 7 21:58:57 2010 -0500 + + COPYING: replace stub with actual copyright notice + + Refer to xkbwatch.c + Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit a8b01ac9a898ba8a5f273f1a0b50485b4ff61e2a +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 81f74707c1d2638c911067ba81356696f73c6d0c +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 5786d1deeab8fe6c6ed0481220e487e9ec5cfdf4 +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 fac7fddbd5df94789d78cd0847dcd8684486d668 +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 2ad523460c93e29d24a531894a7719b3b0b87e90 +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 33383dca28dc60473f677a302962413d504fc4f3 Author: Alan Coopersmith <alan.coopersm...@sun.com> Date: Fri Oct 16 18:46:53 2009 -0700 diff --git a/xkbutils/INSTALL b/xkbutils/INSTALL index e69de29..8b82ade 100644 --- a/xkbutils/INSTALL +++ b/xkbutils/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/xkbutils/LED.c b/xkbutils/LED.c index 2856329..b463074 100644 --- a/xkbutils/LED.c +++ b/xkbutils/LED.c @@ -31,8 +31,6 @@ #include <X11/Xos.h> #include <X11/Xaw/XawInit.h> #include "LEDP.h" -#include <X11/Xmu/Converters.h> -#include <X11/Xmu/Drawing.h> #include <stdio.h> #include <ctype.h> /* needed for abs() */ diff --git a/xkbutils/Makefile.am b/xkbutils/Makefile.am index 3bfdf36..44eeb87 100644 --- a/xkbutils/Makefile.am +++ b/xkbutils/Makefile.am @@ -50,37 +50,22 @@ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:m...@app_man_suffix@) -EXTRA_DIST = $(appman_PRE) ChangeLog +EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -MAINTAINERCLEANFILES = ChangeLog - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -SED = sed - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL diff --git a/xkbutils/Makefile.in b/xkbutils/Makefile.in index 857fea0..5849887 100644 --- a/xkbutils/Makefile.in +++ b/xkbutils/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 = xkbvleds$(EXEEXT) xkbwatch$(EXEEXT) xkbbell$(EXEEXT) subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - compile config.guess config.sub depcomp install-sh missing + $(top_srcdir)/configure COPYING ChangeLog INSTALL compile \ + config.guess config.sub depcomp install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -152,6 +152,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@ @@ -184,6 +185,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@ @@ -196,6 +198,7 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MAN_SUBSTS = @MAN_SUBSTS@ MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ MKDIR_P = @MKDIR_P@ @@ -205,9 +208,11 @@ 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@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -218,6 +223,7 @@ XKBVLEDS_CFLAGS = @XKBVLEDS_CFLAGS@ XKBVLEDS_LIBS = @XKBVLEDS_LIBS@ XKBWATCH_CFLAGS = @XKBWATCH_CFLAGS@ XKBWATCH_LIBS = @XKBWATCH_LIBS@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -237,7 +243,6 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ -distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ @@ -290,27 +295,9 @@ xkbwatch_LDADD = $(XKBWATCH_LIBS) appman_PRE = xkbbell.man xkbvleds.man xkbwatch.man appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:m...@app_man_suffix@) -EXTRA_DIST = $(appman_PRE) ChangeLog +EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -MAINTAINERCLEANFILES = ChangeLog - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ -XORGMANNAME = X Version 11 -SED = sed -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -323,15 +310,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 \ @@ -665,7 +652,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 {} {} \; \ @@ -709,17 +697,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) ;;\ -- 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/e1pdp6m-00062h...@alioth.debian.org