Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Mon Sep 27 00:50:38 CEST 2010. -------- --- xorg-x11/xorg-x11.changes 2010-09-24 09:04:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2010-09-25 05:59:57.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Sep 24 23:18:42 CEST 2010 - sndirsch@suse.de + +- xmodmap 1.0.5 + * This minor maintenance release features improvements to the + man page, as well as the usual recent rounds of build + configuration improvements and janitorial cleanups. + +------------------------------------------------------------------- +Fri Sep 24 18:08:03 UTC 2010 - sndirsch@novell.com + +- xlsclients 1.1.1 + * This minor maintenance release ensures the tarballs correctly + include the strnlen.h header for systems without that function + provided in the system libraries, and updates the build + configuration to the latest X.Org standards. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xlsclients-1.1.0.tar.bz2 xmodmap-1.0.4.tar.bz2 New: ---- xlsclients-1.1.1.tar.bz2 xmodmap-1.0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.PFxUgA/_old 2010-09-27 00:50:10.000000000 +0200 +++ /var/tmp/diff_new_pack.PFxUgA/_new 2010-09-27 00:50:10.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: ConsoleKit-devel fontconfig-devel freetype2-devel libXi6-devel libpng-devel ncurses-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 21 +Release: 22 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -94,13 +94,13 @@ Source61: xload-1.0.2.tar.bz2 Source62: xlogo-1.0.2.tar.bz2 Source63: xlsatoms-1.1.0.tar.bz2 -Source64: xlsclients-1.1.0.tar.bz2 +Source64: xlsclients-1.1.1.tar.bz2 Source65: xlsfonts-1.0.3.tar.bz2 Source66: xmag-1.0.3.tar.bz2 Source67: xman-1.1.0.tar.bz2 Source68: xmessage-1.0.3.tar.bz2 Source69: xmh-X11R7.0-1.0.1.tar.bz2 -Source70: xmodmap-1.0.4.tar.bz2 +Source70: xmodmap-1.0.5.tar.bz2 Source71: xmore-1.0.2.tar.bz2 Source73: xplsprinters-X11R7.0-1.0.1.tar.bz2 Source74: xpr-1.0.3.tar.bz2 ++++++ xlsclients-1.1.0.tar.bz2 -> xlsclients-1.1.1.tar.bz2 ++++++ ++++ 2837 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xlsclients-1.1.0/ChangeLog new/xlsclients-1.1.1/ChangeLog --- old/xlsclients-1.1.0/ChangeLog 2010-06-04 01:06:00.000000000 +0200 +++ new/xlsclients-1.1.1/ChangeLog 2010-09-24 18:44:48.000000000 +0200 @@ -1,3 +1,69 @@ +commit 29ad1d40dbd77d6efedd5d7db53e35650732dd6e +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Sep 24 09:43:42 2010 -0700 + + xlsclients 1.1.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 050eb2ca576e11cf5781af38db1442f2c9dd2f56 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Sep 24 09:23:51 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.coopersmith@oracle.com> + +commit ca8d92fe63776474f3aa166bbedd9220ec560177 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Sep 24 09:11:05 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.coopersmith@oracle.com> + +commit ffdf25c57b0e1b040523789b1e21fb24c0ec2e07 +Author: Gaetan Nadon <memsize@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 <memsize@videotron.ca> + +commit a8bd97c46f9671a02ad0d436142c9ff80cd5bc15 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Wed Jun 23 21:07:39 2010 -0700 + + strnlen.h should be added to EXTRA_DIST, not overwrite it + + Fixes 'make distcheck' failure found by tinderbox: + make[2]: *** No rule to make target `xlsclients.1', needed by `all-am'. Stop. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit f30f41b8dc37e775279835c97f2bea83a513dc10 +Author: Jeremy Huddleston <jeremyhu@apple.com> +Date: Fri Jun 4 22:14:23 2010 -0700 + + Add strnlen.h to EXTRA_DIST + + Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> + commit cc6dbd2c1e7966b32e333142ab7630ed19700414 Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Thu Jun 3 16:05:20 2010 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xlsclients-1.1.0/Makefile.am new/xlsclients-1.1.1/Makefile.am --- old/xlsclients-1.1.0/Makefile.am 2009-11-30 08:03:39.000000000 +0100 +++ new/xlsclients-1.1.1/Makefile.am 2010-09-24 18:11:05.000000000 +0200 @@ -39,27 +39,9 @@ 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) < $< > $@ @@ -73,3 +55,5 @@ $(CHANGELOG_CMD) dist-hook: ChangeLog INSTALL + +EXTRA_DIST += strnlen.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xlsclients-1.1.0/configure.ac new/xlsclients-1.1.1/configure.ac --- old/xlsclients-1.1.0/configure.ac 2010-06-04 01:04:50.000000000 +0200 +++ new/xlsclients-1.1.1/configure.ac 2010-09-24 18:42:23.000000000 +0200 @@ -21,23 +21,20 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xlsclients, [1.1.0], +AC_PREREQ([2.60]) +AC_INIT([xlsclients], [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - xlsclients) + [xlsclients]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) AM_CONFIG_HEADER(config.h) -AC_PROG_CC -AC_PROG_INSTALL - # Check for functional strnlen AC_USE_SYSTEM_EXTENSIONS AC_FUNC_STRNLEN @@ -49,7 +46,5 @@ # Checks for pkg-config packages PKG_CHECK_MODULES(XLSCLIENTS, xcb xcb-atom) -AC_SUBST(XLSCLIENTS_CFLAGS) -AC_SUBST(XLSCLIENTS_LIBS) AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xlsclients-1.1.0/strnlen.h new/xlsclients-1.1.1/strnlen.h --- old/xlsclients-1.1.0/strnlen.h 1970-01-01 01:00:00.000000000 +0100 +++ new/xlsclients-1.1.1/strnlen.h 2009-10-21 21:53:34.000000000 +0200 @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2009 Apple Inc. + * + * 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 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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. + */ + + /* + * Author: Jeremy Huddleston, Apple Inc. + */ + +#ifndef __STRNLEN_H__ +#define __STRNLEN_H__ 1 +#include <stdlib.h> + +extern size_t strnlen(const char *s, size_t maxlen); +#endif /* __STRNLEN_H__ */ ++++++ xmodmap-1.0.4.tar.bz2 -> xmodmap-1.0.5.tar.bz2 ++++++ ++++ 10546 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmodmap-1.0.4/COPYING new/xmodmap-1.0.5/COPYING --- old/xmodmap-1.0.4/COPYING 2006-07-11 04:53:47.000000000 +0200 +++ new/xmodmap-1.0.5/COPYING 2010-09-22 03:11:04.000000000 +0200 @@ -1,3 +1,24 @@ +Copyright (c) 1987, 2010, 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. + Copyright 1988, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -21,33 +42,3 @@ 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 1987 by Sun Microsystems, Inc. Mountain View, CA. - - 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 no- -tice appear in all copies and that both that copyright no- -tice and this permission notice appear in supporting docu- -mentation, and that the name of Sun not be used in -advertising or publicity pertaining to distribution of the -software without specific prior written permission. Sun -makes no representations about the suitability of this -software for any purpose. It is provided "as is" without any -express or implied warranty. - -SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT- -NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE LI- -ABLE 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. - -Author: Jim Fulton, MIT X Consortium; derived from parts of the -original xmodmap, written by David Rosenthal, of Sun Microsystems. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmodmap-1.0.4/ChangeLog new/xmodmap-1.0.5/ChangeLog --- old/xmodmap-1.0.4/ChangeLog 2009-10-06 05:42:36.000000000 +0200 +++ new/xmodmap-1.0.5/ChangeLog 2010-09-24 20:54:34.000000000 +0200 @@ -1,3 +1,186 @@ +commit 3fe64746bb6c3ede67c9967ebd216a8a39cdb2ea +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Sep 24 11:53:40 2010 -0700 + + xmodmap 1.0.5 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit f6919f5958acc59d0b1936cc49900ea781bf2355 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Sep 24 11:52:18 2010 -0700 + + man page: Add setxkbmap & XStringToKeysym to the See Also list + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 663b798d1464be003b9659bbd00112d8b63f6f6f +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Sep 24 11:43:33 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.coopersmith@oracle.com> + +commit 7ff4acd4c8cf2d97d321276d2616d199f81c7e16 +Author: Gaetan Nadon <memsize@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 <memsize@videotron.ca> + +commit 22189c5be96e864b60f9c4cb8a0d9c3f142e849a +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Sep 21 18:12:09 2010 -0700 + + Sun's copyrights now belong to Oracle + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit d1091f9fee901b5cdc589aa544c0a5616bf99d9d +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Sep 14 00:45:57 2010 -0700 + + Attempt to further improve keysym name info in man page + + - Move it to the top of the grammar section since it applies to + multiple commands, not just the keysym KEYSYMNAME = KEYSYMNAME command + - Note that XKeysymDB supplements keysymdef.h, doesn't stand in place + of it. + - Add note about automatic mapping of Unicode characters to keysyms + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit ffadc2376ede14285e2df8c43230d0d4ecca354f +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Fri Aug 20 10:53:44 2010 -0400 + + 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 + Use the appropriate platform version of sed + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 5b493fd2d6edfca06113b09e6cbd6d6f1776399a +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Fri Jan 15 13:08:54 2010 -0800 + + Update Sun license notices to current X.Org standard form + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit bca4e6fdbe0e4f43c1c57dd9434c42741061407a +Author: Julien Cristau <jcristau@debian.org> +Date: Sun Dec 6 14:00:34 2009 +0100 + + Fix XKeysymDB path in manpage again + + commit 4da097462b0b899e1790fd5a5f5e8ec811623c3d "Bug 21675 xmodmap + manpage states the wrong path to XKeysymDB" made it use the right path, + but had trailing whitespace in Makefile.am so the manpage ended up with + "/usr/share/X11 /XKeysymDB". + +commit 584cc13735613f7788e033707ff756937a787bfa +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 27388cde37b85a4efe1e19715de4b574e350b81e +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 817f5345cf42ba4c903c62b5ff814e9c9e3fed3f +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 775727681868d51ba82b7da429ca91f3af3783a0 +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 ea18aba03dc1a8f14d63b43e1ce960f3cda2d7ea +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Thu Oct 22 16:14:12 2009 -0400 + + Makefile.am: do not include autogen.sh in distribution #24183 + + This is a private build script that should not be distributed + +commit 719ab352112d53c113b45ed691e39c4411b8f653 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Thu Oct 22 10:16:12 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 3a95c2e779ab94ad76a35f5800d2b72b5b73da45 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Nov 7 15:11:33 2009 -0800 + + Add note to man page about mapping pointer buttons to 0 to disable + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit 95af7f0fa995ef1dd3a770c48ee3442f6279e936 +Author: Jeremy Huddleston <jeremyhu@freedesktop.org> +Date: Wed Oct 21 12:47:21 2009 -0700 + + This is not a GNU project, so declare it foreign. + + On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: + > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: + > > I noticed an INSTALL file in xlsclients and libXvMC today, and it + > > was quite annoying to work around since 'autoreconf -fvi' replaces + > > it and git wants to commit it. Should these files even be in git? + > > Can I nuke them for the betterment of humanity and since they get + > > created by autoreconf anyways? + > + > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 + + As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with + AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation + of the INSTALL file. It is also part of the 24206 solution. + + Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org> + commit 3f5223b0bc87b0b55d91ba8f1a8cedce0e25f974 Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Mon Oct 5 20:41:49 2009 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmodmap-1.0.4/INSTALL new/xmodmap-1.0.5/INSTALL --- old/xmodmap-1.0.4/INSTALL 2009-10-06 05:42:12.000000000 +0200 +++ new/xmodmap-1.0.5/INSTALL 2010-09-24 20:54:34.000000000 +0200 @@ -2,7 +2,7 @@ ************************* Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +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. @@ -159,7 +159,7 @@ CC is not installed, it is recommended to use the following options in order to use an ANSI C compiler: - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + ./configure CC="cc -Ae" and if that doesn't work, install pre-built binaries of GCC for HP-UX. @@ -174,16 +174,6 @@ ./configure CC="cc -nodtk" - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - Specifying the System Type ========================== @@ -199,8 +189,7 @@ where SYSTEM can have one of these forms: - OS - KERNEL-OS + 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmodmap-1.0.4/Makefile.am new/xmodmap-1.0.5/Makefile.am --- old/xmodmap-1.0.4/Makefile.am 2009-10-06 05:35:18.000000000 +0200 +++ new/xmodmap-1.0.5/Makefile.am 2010-09-14 09:49:23.000000000 +0200 @@ -19,6 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS=man bin_PROGRAMS = xmodmap AM_CFLAGS = $(CWARNFLAGS) $(XMODMAP_CFLAGS) @@ -32,56 +33,21 @@ xmodmap.c \ xmodmap.h -appman_PRE = \ - xmodmap.man - EXTRA_DIST = \ - ChangeLog \ - autogen.sh \ + autogen.sh \ swap.km -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST += $(appman_PRE) -CLEANFILES = $(appman_DATA) - -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -X11_DATADIR=$(datadir)/X11 # Where libX11 installs XKeysymDB - -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|__X11datadir__|$(X11_DATADIR)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ +MAINTAINERCLEANFILES = ChangeLog INSTALL -MAINTAINERCLEANFILES = ChangeLog +.PHONY: ChangeLog INSTALL -.PHONY: ChangeLog +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL if LINT ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmodmap-1.0.4/config.h.in new/xmodmap-1.0.5/config.h.in --- old/xmodmap-1.0.4/config.h.in 2009-10-06 05:42:10.000000000 +0200 +++ new/xmodmap-1.0.5/config.h.in 2010-09-24 20:54:15.000000000 +0200 @@ -45,6 +45,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmodmap-1.0.4/configure.ac new/xmodmap-1.0.5/configure.ac --- old/xmodmap-1.0.4/configure.ac 2009-10-06 05:41:33.000000000 +0200 +++ new/xmodmap-1.0.5/configure.ac 2010-09-24 20:53:10.000000000 +0200 @@ -21,30 +21,30 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xmodmap,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xmodmap) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([xmodmap], + [1.0.5], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], + [xmodmap]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) -AC_PROG_CC -AC_PROG_INSTALL - -XORG_DEFAULT_OPTIONS - AC_CHECK_FUNCS([strncasecmp]) # Checks for pkg-config packages PKG_CHECK_MODULES(XMODMAP, x11) -AC_SUBST(XMODMAP_CFLAGS) -AC_SUBST(XMODMAP_LIBS) dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([Makefile + man/Makefile]) +AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmodmap-1.0.4/exec.c new/xmodmap-1.0.5/exec.c --- old/xmodmap-1.0.4/exec.c 2006-07-11 04:53:47.000000000 +0200 +++ new/xmodmap-1.0.5/exec.c 2010-09-22 03:11:23.000000000 +0200 @@ -29,31 +29,29 @@ */ /* - * Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. + * Copyright (c) 1987, Oracle and/or its affiliates. All rights reserved. * - * 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 no- - * tice appear in all copies and that both that copyright no- - * tice and this permission notice appear in supporting docu- - * mentation, and that the name of Sun not be used in - * advertising or publicity pertaining to distribution of the - * software without specific prior written permission. Sun - * makes no representations about the suitability of this - * software for any purpose. It is provided "as is" without any - * express or implied warranty. - * - * SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT- - * NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE LI- - * ABLE 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. + * 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. + */ + +/* * Author: Jim Fulton, MIT X Consortium; derived from parts of the * original xmodmap, written by David Rosenthal, of Sun Microsystems. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmodmap-1.0.4/man/Makefile.am new/xmodmap-1.0.5/man/Makefile.am --- old/xmodmap-1.0.4/man/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/xmodmap-1.0.5/man/Makefile.am 2010-09-14 09:49:23.000000000 +0200 @@ -0,0 +1,40 @@ +# +# Copyright (c) 2010, 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. +# + +appmandir = $(APP_MAN_DIR) +appman_PRE = xmodmap.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +# Where libX11 installs XKeysymDB +# Assuming both xmodmap and libX11 are installed under the same $prefix +X11_DATADIR=$(datadir)/X11 + +MAN_SUBSTS += -e 's|__X11datadir__|$(X11_DATADIR)|g' + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmodmap-1.0.4/man/xmodmap.man new/xmodmap-1.0.5/man/xmodmap.man --- old/xmodmap-1.0.4/man/xmodmap.man 1970-01-01 01:00:00.000000000 +0100 +++ new/xmodmap-1.0.5/man/xmodmap.man 2010-09-24 20:50:25.000000000 +0200 @@ -0,0 +1,339 @@ +.\" $Xorg: xmodmap.man,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ +.\" +.\" Copyright (c) 1987, 2010, 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. +.\" +.\" Copyright 1988, 1989, 1990, 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. +.\" +.\" $XFree86: xc/programs/xmodmap/xmodmap.man,v 1.11 2002/10/12 16:06:48 herrb Exp $ +.\" +.de EX \"Begin example +.ne 5 +.if n .sp 1 +.if t .sp .5 +.nf +.in +.5i +.. +.de EE +.fi +.in -.5i +.if n .sp 1 +.if t .sp .5 +.. +.TH XMODMAP 1 __xorgversion__ +.SH NAME +xmodmap - utility for modifying keymaps and pointer button mappings in X +.SH SYNOPSIS +.B xmodmap +[-options ...] [filename] +.SH DESCRIPTION +.PP +The \fIxmodmap\fP program is used to edit and display the +keyboard \fImodifier map\fP and \fIkeymap table\fP that are used by client +applications to convert event keycodes into keysyms. It is usually run from +the user's session startup script to configure the keyboard according to +personal tastes. +.SH OPTIONS +.PP +The following options may be used with \fIxmodmap\fP: +.TP 8 +.B \-display \fIdisplay\fP +This option specifies the host and display to use. +.TP 8 +.B \-help +This option indicates that a brief description of the command line arguments +should be printed on the standard error channel. This will be done whenever an +unhandled argument is given to +.I xmodmap. +.TP 8 +.B \-grammar +This option indicates that a help message describing the expression grammar +used in files and with \-e expressions should be printed on the standard error. +.TP 8 +.B \-verbose +This option indicates that +.I xmodmap +should print logging information as it parses its input. +.TP 8 +.B \-quiet +This option turns off the verbose logging. This is the default. +.TP 8 +.B \-n +This option indicates that +.I xmodmap +should not change the mappings, but should display what it would do, like +\fImake(1)\fP does when given this option. +.TP 8 +.B \-e \fIexpression\fB +This option specifies an expression to be executed. Any number of expressions +may be specified from the command line. +.TP 8 +.B \-pm +This option indicates that the current modifier map should be printed on the +standard output. This is the default mode of operation if no other mode +options are specified. +.TP 8 +.B \-pk +This option indicates that the current keymap table should be printed on the +standard output. +.TP 8 +.B \-pke +This option indicates that the current keymap table should be printed on the +standard output in the form of expressions that can be fed back to +\fIxmodmap\fP. +.TP 8 +.B \-pp +This option indicates that the current pointer map should be printed on the +standard output. +.TP 8 +.B \- +A lone dash means that the standard input should be used as the input file. +.PP +The \fIfilename\fP specifies a file containing \fIxmodmap\fP expressions +to be executed. This file is usually kept in the user's home directory with +a name like \fI.xmodmaprc\fP. +.SH EXPRESSION GRAMMAR +.PP +The +.I xmodmap +program reads a list of expressions and parses them all before attempting +to execute any of them. This makes it possible to refer to keysyms that are +being redefined in a natural way without having to worry as much about name +conflicts. +.PP +The list of keysym names may be found in the header file +\fI<X11/keysymdef.h>\fP (without the \fIXK_\fP prefix), +supplemented by the keysym database \fI __X11datadir__/XKeysymDB\fP. +Keysyms matching Unicode characters may be specified as "U0020" to "U007E" +and "U00A0" to "U10FFFF" for all possible Unicode characters. +.TP 8 +.B keycode \fINUMBER\fP = \fIKEYSYMNAME ...\fP +The list of keysyms is assigned to the indicated keycode +(which may be specified in decimal, hex or octal and can be determined by +running the +.I xev +program). Up to eight keysyms may be attached to a key, however the last four +are not used in any major X server implementation. The first keysym is used +when no modifier key is pressed in conjunction with this key, the second with +Shift, the third when the Mode_switch key is used with this key and the fourth +when both the Mode_switch and Shift keys are used. +.TP 8 +.B keycode any = \fIKEYSYMNAME ...\fP +If no existing key has the specified list of keysyms assigned to it, +a spare key on the keyboard is selected and the keysyms are assigned to it. +The list of keysyms may be specified in decimal, hex or octal. +.TP 8 +.B keysym \fIKEYSYMNAME\fP = \fIKEYSYMNAME ...\fP +The \fIKEYSYMNAME\fP on the left hand side is translated into matching keycodes +used to perform the corresponding set of \fBkeycode\fP expressions. Note that +if the same keysym is bound to multiple keys, the expression is executed +for each matching keycode. +.TP 8 +.B clear \fIMODIFIERNAME\fP +This removes all entries in the modifier map for the given modifier, where +valid name are: +.BR Shift , +.BR Lock , +.BR Control , +.BR Mod1 , +.BR Mod2 , +.BR Mod3 , +.BR Mod4 , +and \fBMod5\fP (case +does not matter in modifier names, although it does matter for all other +names). For example, ``clear Lock'' will remove +all any keys that were bound to the shift lock modifier. +.TP 8 +.B add \fIMODIFIERNAME\fP = \fIKEYSYMNAME ...\fP +This adds all keys containing the given keysyms to the indicated modifier map. +The keysym names +are evaluated after all input expressions are read to make it easy to write +expressions to swap keys (see the EXAMPLES section). +.TP 8 +.B remove \fIMODIFIERNAME\fP = \fIKEYSYMNAME ...\fP +This removes all keys containing the given keysyms from the indicated +modifier map. Unlike +.B add, +the keysym names are evaluated as the line is read in. This allows you to +remove keys from a modifier without having to worry about whether or not they +have been reassigned. +.TP 8 +.B "pointer = default" +This sets the pointer map back to its default settings (button 1 generates a +code of 1, button 2 generates a 2, etc.). +.TP 8 +.B pointer = \fINUMBER ...\fP +This sets the pointer map to contain the indicated button codes. The list +always starts with the first physical button. Setting a button code to 0 +disables events from that button. +.PP +Lines that begin with an exclamation point (!) are taken as comments. +.PP +If you want to change the binding of a modifier key, you must also remove it +from the appropriate modifier map. +.SH EXAMPLES +.PP +Many pointers are designed such that the first button is pressed using the +index finger of the right hand. People who are left-handed frequently find +that it is more comfortable to reverse the button codes that get generated +so that the primary button is pressed using the index finger of the left hand. +This could be done on a 3 button pointer as follows: +.EX +% xmodmap -e "pointer = 3 2 1" +.EE +.PP +Many applications support the notion of Meta keys (similar to Control +keys except that Meta is held down instead of Control). However, +some servers do not have a Meta keysym in the default keymap table, so one +needs to be added by hand. +The following command will attach Meta to the Multi-language key (sometimes +labeled Compose Character). It also takes advantage of the fact that +applications that need a Meta key simply need to get the keycode and don't +require the keysym to be in the first column of the keymap table. This +means that applications that are looking for a Multi_key (including the +default modifier map) won't notice any change. +.EX +% xmodmap -e "keysym Multi_key = Multi_key Meta_L" +.EE +.PP +Similarly, some keyboards have an Alt key but no Meta key. +In that case the following may be useful: +.EX +% xmodmap -e "keysym Alt_L = Meta_L Alt_L" +.EE +.PP +One of the more simple, yet convenient, uses of \fIxmodmap\fP is to set the +keyboard's "rubout" key to generate an alternate keysym. This frequently +involves exchanging Backspace with Delete to be more comfortable to the user. +If the \fIttyModes\fP resource in \fIxterm\fP is set as well, all terminal +emulator windows will use the same key for erasing characters: +.EX +% xmodmap -e "keysym BackSpace = Delete" +% echo "XTerm*ttyModes: erase ^?" | xrdb -merge +.EE +.PP +Some keyboards do not automatically generate less than and greater than +characters when the comma and period keys are shifted. This can be remedied +with \fIxmodmap\fP by resetting the bindings for the comma and period with +the following scripts: +.EX +! +! make shift-, be < and shift-. be > +! +keysym comma = comma less +keysym period = period greater +.EE +.PP +One of the more irritating differences between keyboards is the location of the +Control and Shift Lock keys. A common use of \fIxmodmap\fP is to swap these +two keys as follows: +.EX +! +! Swap Caps_Lock and Control_L +! +remove Lock = Caps_Lock +remove Control = Control_L +keysym Control_L = Caps_Lock +keysym Caps_Lock = Control_L +add Lock = Caps_Lock +add Control = Control_L +.EE +.PP +This example can be run again to swap the keys back to their previous +assignments. +.PP +The \fIkeycode\fP command is useful for assigning the same keysym to +multiple keycodes. Although unportable, it also makes it possible to write +scripts that can reset the keyboard to a known state. The following script +sets the backspace key to generate Delete (as shown above), flushes all +existing caps lock bindings, makes the CapsLock +key be a control key, make F5 generate Escape, and makes Break/Reset be a +shift lock. +.EX +! +! On the HP, the following keycodes have key caps as listed: +! +! 101 Backspace +! 55 Caps +! 14 Ctrl +! 15 Break/Reset +! 86 Stop +! 89 F5 +! +keycode 101 = Delete +keycode 55 = Control_R +clear Lock +add Control = Control_R +keycode 89 = Escape +keycode 15 = Caps_Lock +add Lock = Caps_Lock +.EE +.SH ENVIRONMENT +.PP +.TP 8 +.B DISPLAY +to get default host and display number. +.SH SEE ALSO +X(__miscmansuffix__), xev(__appmansuffix__), setxkbmap(__appmansuffix__), +XStringToKeysym(__libmansuffix__), +\fIXlib\fP documentation on key and pointer events +.SH BUGS +.PP +Every time a \fBkeycode\fP expression is evaluated, the server generates +a \fIMappingNotify\fP event on every client. This can cause some thrashing. +All of the changes should be batched together and done at once. +Clients that receive keyboard input and ignore \fIMappingNotify\fP events +will not notice any changes made to keyboard mappings. +.PP +.I Xmodmap +should generate "add" and "remove" expressions automatically +whenever a keycode that is already bound to a modifier is changed. +.PP +There should be a way to have the +.I remove +expression accept keycodes as well as keysyms for those times when you really +mess up your mappings. +.SH AUTHOR +Jim Fulton, MIT X Consortium, rewritten from an earlier version by +David Rosenthal of Sun Microsystems. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmodmap-1.0.4/xmodmap.man new/xmodmap-1.0.5/xmodmap.man --- old/xmodmap-1.0.4/xmodmap.man 2009-05-11 19:11:44.000000000 +0200 +++ new/xmodmap-1.0.5/xmodmap.man 1970-01-01 01:00:00.000000000 +0100 @@ -1,312 +0,0 @@ -.\" $Xorg: xmodmap.man,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ -.\" Copyright 1988, 1989, 1990, 1998 The Open Group -.\" Copyright 1987 Sun Microsystems, Inc. -.\" -.\" 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. -.\" -.\" $XFree86: xc/programs/xmodmap/xmodmap.man,v 1.11 2002/10/12 16:06:48 herrb Exp $ -.\" -.de EX \"Begin example -.ne 5 -.if n .sp 1 -.if t .sp .5 -.nf -.in +.5i -.. -.de EE -.fi -.in -.5i -.if n .sp 1 -.if t .sp .5 -.. -.TH XMODMAP 1 __xorgversion__ -.SH NAME -xmodmap - utility for modifying keymaps and pointer button mappings in X -.SH SYNOPSIS -.B xmodmap -[-options ...] [filename] -.SH DESCRIPTION -.PP -The \fIxmodmap\fP program is used to edit and display the -keyboard \fImodifier map\fP and \fIkeymap table\fP that are used by client -applications to convert event keycodes into keysyms. It is usually run from -the user's session startup script to configure the keyboard according to -personal tastes. -.SH OPTIONS -.PP -The following options may be used with \fIxmodmap\fP: -.TP 8 -.B \-display \fIdisplay\fP -This option specifies the host and display to use. -.TP 8 -.B \-help -This option indicates that a brief description of the command line arguments -should be printed on the standard error channel. This will be done whenever an -unhandled argument is given to -.I xmodmap. -.TP 8 -.B \-grammar -This option indicates that a help message describing the expression grammar -used in files and with \-e expressions should be printed on the standard error. -.TP 8 -.B \-verbose -This option indicates that -.I xmodmap -should print logging information as it parses its input. -.TP 8 -.B \-quiet -This option turns off the verbose logging. This is the default. -.TP 8 -.B \-n -This option indicates that -.I xmodmap -should not change the mappings, but should display what it would do, like -\fImake(1)\fP does when given this option. -.TP 8 -.B \-e \fIexpression\fB -This option specifies an expression to be executed. Any number of expressions -may be specified from the command line. -.TP 8 -.B \-pm -This option indicates that the current modifier map should be printed on the -standard output. This is the default mode of operation if no other mode -options are specified. -.TP 8 -.B \-pk -This option indicates that the current keymap table should be printed on the -standard output. -.TP 8 -.B \-pke -This option indicates that the current keymap table should be printed on the -standard output in the form of expressions that can be fed back to -\fIxmodmap\fP. -.TP 8 -.B \-pp -This option indicates that the current pointer map should be printed on the -standard output. -.TP 8 -.B \- -A lone dash means that the standard input should be used as the input file. -.PP -The \fIfilename\fP specifies a file containing \fIxmodmap\fP expressions -to be executed. This file is usually kept in the user's home directory with -a name like \fI.xmodmaprc\fP. -.SH EXPRESSION GRAMMAR -.PP -The -.I xmodmap -program reads a list of expressions and parses them all before attempting -to execute any of them. This makes it possible to refer to keysyms that are -being redefined in a natural way without having to worry as much about name -conflicts. -.TP 8 -.B keycode \fINUMBER\fP = \fIKEYSYMNAME ...\fP -The list of keysyms is assigned to the indicated keycode -(which may be specified in decimal, hex or octal and can be determined by -running the -.I xev -program). Up to eight keysyms may be attached to a key, however the last four -are not used in any major X server implementation. The first keysym is used -when no modifier key is pressed in conjunction with this key, the second with -Shift, the third when the Mode_switch key is used with this key and the fourth -when both the Mode_switch and Shift keys are used. -.TP 8 -.B keycode any = \fIKEYSYMNAME ...\fP -If no existing key has the specified list of keysyms assigned to it, -a spare key on the keyboard is selected and the keysyms are assigned to it. -The list of keysyms may be specified in decimal, hex or octal. -.TP 8 -.B keysym \fIKEYSYMNAME\fP = \fIKEYSYMNAME ...\fP -The \fIKEYSYMNAME\fP on the left hand side is translated into matching keycodes -used to perform the corresponding set of \fBkeycode\fP expressions. -The list of keysym names may be -found in the header file \fI<X11/keysymdef.h>\fP (without the \fIXK_\fP prefix) -or the keysym database \fI __X11datadir__/XKeysymDB\fP. Note that -if the same keysym is bound to multiple keys, the expression is executed -for each matching keycode. -.TP 8 -.B clear \fIMODIFIERNAME\fP -This removes all entries in the modifier map for the given modifier, where -valid name are: -.BR Shift , -.BR Lock , -.BR Control , -.BR Mod1 , -.BR Mod2 , -.BR Mod3 , -.BR Mod4 , -and \fBMod5\fP (case -does not matter in modifier names, although it does matter for all other -names). For example, ``clear Lock'' will remove -all any keys that were bound to the shift lock modifier. -.TP 8 -.B add \fIMODIFIERNAME\fP = \fIKEYSYMNAME ...\fP -This adds all keys containing the given keysyms to the indicated modifier map. -The keysym names -are evaluated after all input expressions are read to make it easy to write -expressions to swap keys (see the EXAMPLES section). -.TP 8 -.B remove \fIMODIFIERNAME\fP = \fIKEYSYMNAME ...\fP -This removes all keys containing the given keysyms from the indicated -modifier map. Unlike -.B add, -the keysym names are evaluated as the line is read in. This allows you to -remove keys from a modifier without having to worry about whether or not they -have been reassigned. -.TP 8 -.B "pointer = default" -This sets the pointer map back to its default settings (button 1 generates a -code of 1, button 2 generates a 2, etc.). -.TP 8 -.B pointer = \fINUMBER ...\fP -This sets the pointer map to contain the indicated button codes. The list -always starts with the first physical button. -.PP -Lines that begin with an exclamation point (!) are taken as comments. -.PP -If you want to change the binding of a modifier key, you must also remove it -from the appropriate modifier map. -.SH EXAMPLES -.PP -Many pointers are designed such that the first button is pressed using the -index finger of the right hand. People who are left-handed frequently find -that it is more comfortable to reverse the button codes that get generated -so that the primary button is pressed using the index finger of the left hand. -This could be done on a 3 button pointer as follows: -.EX -% xmodmap -e "pointer = 3 2 1" -.EE -.PP -Many applications support the notion of Meta keys (similar to Control -keys except that Meta is held down instead of Control). However, -some servers do not have a Meta keysym in the default keymap table, so one -needs to be added by hand. -The following command will attach Meta to the Multi-language key (sometimes -labeled Compose Character). It also takes advantage of the fact that -applications that need a Meta key simply need to get the keycode and don't -require the keysym to be in the first column of the keymap table. This -means that applications that are looking for a Multi_key (including the -default modifier map) won't notice any change. -.EX -% xmodmap -e "keysym Multi_key = Multi_key Meta_L" -.EE -.PP -Similarly, some keyboards have an Alt key but no Meta key. -In that case the following may be useful: -.EX -% xmodmap -e "keysym Alt_L = Meta_L Alt_L" -.EE -.PP -One of the more simple, yet convenient, uses of \fIxmodmap\fP is to set the -keyboard's "rubout" key to generate an alternate keysym. This frequently -involves exchanging Backspace with Delete to be more comfortable to the user. -If the \fIttyModes\fP resource in \fIxterm\fP is set as well, all terminal -emulator windows will use the same key for erasing characters: -.EX -% xmodmap -e "keysym BackSpace = Delete" -% echo "XTerm*ttyModes: erase ^?" | xrdb -merge -.EE -.PP -Some keyboards do not automatically generate less than and greater than -characters when the comma and period keys are shifted. This can be remedied -with \fIxmodmap\fP by resetting the bindings for the comma and period with -the following scripts: -.EX -! -! make shift-, be < and shift-. be > -! -keysym comma = comma less -keysym period = period greater -.EE -.PP -One of the more irritating differences between keyboards is the location of the -Control and Shift Lock keys. A common use of \fIxmodmap\fP is to swap these -two keys as follows: -.EX -! -! Swap Caps_Lock and Control_L -! -remove Lock = Caps_Lock -remove Control = Control_L -keysym Control_L = Caps_Lock -keysym Caps_Lock = Control_L -add Lock = Caps_Lock -add Control = Control_L -.EE -.PP -This example can be run again to swap the keys back to their previous -assignments. -.PP -The \fIkeycode\fP command is useful for assigning the same keysym to -multiple keycodes. Although unportable, it also makes it possible to write -scripts that can reset the keyboard to a known state. The following script -sets the backspace key to generate Delete (as shown above), flushes all -existing caps lock bindings, makes the CapsLock -key be a control key, make F5 generate Escape, and makes Break/Reset be a -shift lock. -.EX -! -! On the HP, the following keycodes have key caps as listed: -! -! 101 Backspace -! 55 Caps -! 14 Ctrl -! 15 Break/Reset -! 86 Stop -! 89 F5 -! -keycode 101 = Delete -keycode 55 = Control_R -clear Lock -add Control = Control_R -keycode 89 = Escape -keycode 15 = Caps_Lock -add Lock = Caps_Lock -.EE -.SH ENVIRONMENT -.PP -.TP 8 -.B DISPLAY -to get default host and display number. -.SH SEE ALSO -X(__miscmansuffix__), xev(1), \fIXlib\fP documentation on key and pointer events -.SH BUGS -.PP -Every time a \fBkeycode\fP expression is evaluated, the server generates -a \fIMappingNotify\fP event on every client. This can cause some thrashing. -All of the changes should be batched together and done at once. -Clients that receive keyboard input and ignore \fIMappingNotify\fP events -will not notice any changes made to keyboard mappings. -.PP -.I Xmodmap -should generate "add" and "remove" expressions automatically -whenever a keycode that is already bound to a modifier is changed. -.PP -There should be a way to have the -.I remove -expression accept keycodes as well as keysyms for those times when you really -mess up your mappings. -.SH AUTHOR -Jim Fulton, MIT X Consortium, rewritten from an earlier version by -David Rosenthal of Sun Microsystems. - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org