Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Fri Nov 12 14:35:05 CET 2010.
--------
--- xorg-x11/xorg-x11.changes 2010-11-09 10:30:25.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2010-11-11 10:17:40.000000000 +0100
@@ -1,0 +2,28 @@
+Thu Nov 11 09:03:33 UTC 2010 - sndirsch@novell.com
+
+- xkill 1.0.3
+ * This minor maintenance release provides some hopefully very
+ non-dangerous build configuration improvements and janitorial
+ cleanups.
+- xrdb 1.0.7
+ * This minor maintenance release provides the usual recent
+ collection of build configuration improvements and janitorial
+ cleanups.
+- xrefresh 1.0.4
+ * This minor maintenance release refreshes the tarball with the
+ usual recent collection of build configuration improvements
+ and janitorial cleanups.
+- xset 1.2.1
+ * This minor maintenance release provides the usual recent
+ collection of build configuration improvements and janitorial
+ cleanups, plus some more unusual cleanups specific to xset.
+- xinput 1.5.3
+ * This release brings a minor fix when checking for the device
+ mode. Out-of-proximity device could report the wrong mode.
+ The UI has two minor improvements. First, it doesn't interpret
+ random strings as "relative" anymore when switching modes.
+ Second, valuators are printed on separate lines now with the
+ valuator number prefixed. This is helpful for devices that
+ don't always report continuous valuator ranges.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xinput-1.5.2.tar.bz2
xkill-1.0.2.tar.bz2
xrdb-1.0.6.tar.bz2
xrefresh-1.0.3.tar.bz2
xset-1.2.0.tar.bz2
New:
----
xinput-1.5.3.tar.bz2
xkill-1.0.3.tar.bz2
xrdb-1.0.7.tar.bz2
xrefresh-1.0.4.tar.bz2
xset-1.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.ZruXu7/_old 2010-11-12 14:32:25.000000000 +0100
+++ /var/tmp/diff_new_pack.ZruXu7/_new 2010-11-12 14:32:25.000000000 +0100
@@ -23,7 +23,7 @@
BuildRequires: bison
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 31
+Release: 32
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -91,7 +91,7 @@
Source57: xkbevd-1.1.1.tar.bz2
Source58: xkbprint-1.0.2.tar.bz2
Source59: xkbutils-1.0.3.tar.bz2
-Source60: xkill-1.0.2.tar.bz2
+Source60: xkill-1.0.3.tar.bz2
Source61: xload-1.1.0.tar.bz2
Source62: xlogo-1.0.3.tar.bz2
Source63: xlsatoms-1.1.0.tar.bz2
@@ -108,10 +108,10 @@
Source75: xprehashprinterlist-X11R7.0-1.0.1.tar.bz2
Source76: xprop-1.2.0.tar.bz2
Source77: xrandr-1.3.4.tar.bz2
-Source78: xrdb-1.0.6.tar.bz2
-Source79: xrefresh-1.0.3.tar.bz2
+Source78: xrdb-1.0.7.tar.bz2
+Source79: xrefresh-1.0.4.tar.bz2
Source80: xrx-1.0.4.tar.bz2
-Source81: xset-1.2.0.tar.bz2
+Source81: xset-1.2.1.tar.bz2
Source82: xsetmode-X11R7.0-1.0.0.tar.bz2
Source83: xsetpointer-1.0.1.tar.bz2
Source84: xsetroot-1.1.0.tar.bz2
@@ -126,7 +126,7 @@
Source93: mkcomposecache-1.2.1.tar.bz2
Source94: rendercheck-1.3.tar.bz2
Source96: xbacklight-1.1.1.tar.bz2
-Source97: xinput-1.5.2.tar.bz2
+Source97: xinput-1.5.3.tar.bz2
Source98: xcompmgr-1.1.5.tar.bz2
Source99: xrestop-0.4.tar.bz2
Source100: xscope-1.3.tar.bz2
++++++ xinput-1.5.2.tar.bz2 -> xinput-1.5.3.tar.bz2 ++++++
++++ 10579 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/xinput-1.5.2/ChangeLog new/xinput-1.5.3/ChangeLog
--- old/xinput-1.5.2/ChangeLog 2010-06-04 03:11:27.000000000 +0200
+++ new/xinput-1.5.3/ChangeLog 2010-11-11 05:00:08.000000000 +0100
@@ -1,3 +1,48 @@
+commit 13d9a0906acca18a268b8898addc1a192c5a2b12
+Author: Peter Hutterer
+Date: Thu Nov 11 13:56:22 2010 +1000
+
+ xinput 1.5.3
+
+ Signed-off-by: Peter Hutterer
+
+commit 84798d18421535f47a00f4bc43787432f6725032
+Author: Peter Hutterer
+Date: Mon Oct 11 13:46:54 2010 +1000
+
+ Print an error if mode is neither ABSOLUTE nor RELATIVE.
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Julien Cristau
+
+commit 6a794ab3ceb6d3527c0a87f610bc1d6cf26971ba
+Author: Chase Douglas
+Date: Thu Jul 1 18:36:42 2010 -0400
+
+ xinput: Split XI2 valuators and print index of events
+
+ XI2 events support bitmask selected valuators. When printing masked
+ events, we need to also print the index of the valuator value. This
+ change prints each valuator on its own line, prefixed by its index
+
+ Signed-off-by: Chase Douglas
+ Signed-off-by: Peter Hutterer
+
+commit a5c9b0ffb969f71ec73a6c65f5135f5aa7805a38
+Author: Peter Hutterer
+Date: Wed Jun 9 15:52:31 2010 +1000
+
+ list: only check the last bit in the device mode.
+
+ This works around a bug in X servers 1.7.x, 1.8.0 and 1.8.1 where the device
+ mode could sometimes be binary OR'd with the OutOfProximity flag. The result
+ was a value of 0b10 for relative and 0b11 for Absolute, both of which were
+ interpreted as relative by this code.
+
+ Affected is only the XIQueryDevice call, not the XListInputDevices call.
+
+ Signed-off-by: Peter Hutterer
+
commit 3778f707cca0b9f023a8a5fc86e26776ef6e1b6c
Author: Peter Hutterer
Date: Fri Jun 4 11:11:03 2010 +1000
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/xinput-1.5.2/config.h.in new/xinput-1.5.3/config.h.in
--- old/xinput-1.5.2/config.h.in 2010-04-07 07:55:36.000000000 +0200
+++ new/xinput-1.5.3/config.h.in 2010-11-11 05:00:08.000000000 +0100
@@ -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/xinput-1.5.2/configure.ac new/xinput-1.5.3/configure.ac
--- old/xinput-1.5.2/configure.ac 2010-06-04 03:07:22.000000000 +0200
+++ new/xinput-1.5.3/configure.ac 2010-11-11 04:54:53.000000000 +0100
@@ -2,7 +2,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xinput,[1.5.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinput)
+AC_INIT(xinput,[1.5.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinput)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
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/xinput-1.5.2/src/list.c new/xinput-1.5.3/src/list.c
--- old/xinput-1.5.2/src/list.c 2009-10-08 00:48:02.000000000 +0200
+++ new/xinput-1.5.3/src/list.c 2010-06-09 07:52:25.000000000 +0200
@@ -163,6 +163,10 @@
XIValuatorClassInfo *v = (XIValuatorClassInfo*)classes[i];
char *name = v->label ? XGetAtomName(display, v->label) : NULL;
+ /* XXX: Bug in X servers 1.7..1.8.1, mode was |
+ OutOfProximity. Remove this once 1.9 is out. */
+ v->mode &= DeviceMode;
+
printf("\t\tDetail for Valuator %d:\n", v->number);
printf("\t\t Label: %s\n", (name) ? name : "None");
printf("\t\t Range: %f - %f\n", v->min, v->max);
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/xinput-1.5.2/src/setmode.c new/xinput-1.5.3/src/setmode.c
--- old/xinput-1.5.2/src/setmode.c 2010-03-08 00:11:11.000000000 +0100
+++ new/xinput-1.5.3/src/setmode.c 2010-10-11 05:46:38.000000000 +0200
@@ -49,8 +49,11 @@
if (strcmp(argv[1], "ABSOLUTE") == 0) {
mode = Absolute;
- } else {
+ } else if (strcmp(argv[1], "RELATIVE") == 0) {
mode = Relative;
+ } else {
+ fprintf(stderr, "Invalid mode, use ABSOLUTE or RELATIVE.\n");
+ return EXIT_FAILURE;
}
device = XOpenDevice(display, info->id);
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/xinput-1.5.2/src/test_xi2.c new/xinput-1.5.3/src/test_xi2.c
--- old/xinput-1.5.2/src/test_xi2.c 2010-04-29 07:42:19.000000000 +0200
+++ new/xinput-1.5.3/src/test_xi2.c 2010-07-02 03:16:51.000000000 +0200
@@ -65,13 +65,12 @@
printf(" group: locked %#x latched %#x base %#x effective: %#x\n",
event->group.locked, event->group.latched,
event->group.base, event->group.effective);
- printf(" valuators:");
+ printf(" valuators:\n");
val = event->valuators.values;
for (i = 0; i < event->valuators.mask_len * 8; i++)
if (XIMaskIsSet(event->valuators.mask, i))
- printf(" %.2f", *val++);
- printf("\n");
+ printf(" %i: %.2f\n", i, *val++);
printf(" windows: root 0x%lx event 0x%lx child 0x%ld\n",
event->root, event->event, event->child);
++++++ xkill-1.0.2.tar.bz2 -> xkill-1.0.3.tar.bz2 ++++++
++++ 8664 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/xkill-1.0.2/ChangeLog new/xkill-1.0.3/ChangeLog
--- old/xkill-1.0.2/ChangeLog 2009-10-13 06:08:03.000000000 +0200
+++ new/xkill-1.0.3/ChangeLog 2010-11-11 04:26:39.000000000 +0100
@@ -1,3 +1,140 @@
+commit 6f00d84fb6d44bc76e50c111f8afc1c961778d7c
+Author: Alan Coopersmith
+Date: Wed Nov 10 19:26:12 2010 -0800
+
+ xkill 1.0.3
+
+ Signed-off-by: Alan Coopersmith
+
+commit ea276533fbc9da4588d4707c1a21a9d480924b3c
+Author: Alan Coopersmith
+Date: Tue Nov 9 10:30:07 2010 -0800
+
+ Simplify options list for usage from array to constant string
+
+ Signed-off-by: Alan Coopersmith
+
+commit e3c094aa41b2ca724ded1c33fe2ecec9b4155dc7
+Author: Alan Coopersmith
+Date: Tue Nov 9 10:22:57 2010 -0800
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM sttaements under the Automake initialization section.
+ Add missing AC_CONFIG_SRCDIR
+
+ Signed-off-by: Alan Coopersmith
+
+commit dfd1f9ddc40dc8082010cd6b649812e57c4542bf
+Author: Alan Coopersmith
+Date: Tue Nov 9 10:20:25 2010 -0800
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith
+
+commit 649f4494e956e58c5dc440047f55c19117334590
+Author: Alan Coopersmith
+Date: Tue Nov 9 10:19:46 2010 -0800
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ Enables use of platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith
+
+commit e945e97c2bf5d03f6ad154c20cae7c870db2e73e
+Author: Gaetan Nadon
+Date: Tue Nov 9 10:19:29 2010 -0800
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+ Signed-off-by: Alan Coopersmith
+
+commit 40fe5f11c024ac28f10b9f82efb734b11957c952
+Author: Jesse Adkins
+Date: Tue Sep 28 13:29:49 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins
+
+commit 6678df25e56029d312e80252b80229ab2821c4da
+Author: Gaetan Nadon
+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 3dd4335f634a4db4392ded6807e05f1b393e047b
+Author: Gaetan Nadon
+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 e6f1691628bcdee1c090933957e41b11515d9678
+Author: Gaetan Nadon
+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 4fe9b5706aef7e95e9db699e341bd5d1f3368905
+Author: Gaetan Nadon
+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 e923b9e70dbc2a1b1efdecab5804e4445ec53d1c
+Author: Jeremy Huddleston
+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
+
commit 5ac1abf7369fc81a07df94e26f4ae21c05610285
Author: Alan Coopersmith
Date: Mon Oct 12 21:01:06 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/xkill-1.0.2/config.h.in new/xkill-1.0.3/config.h.in
--- old/xkill-1.0.2/config.h.in 2009-10-13 06:01:26.000000000 +0200
+++ new/xkill-1.0.3/config.h.in 2010-11-11 04:26:26.000000000 +0100
@@ -42,6 +42,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/xkill-1.0.2/configure.ac new/xkill-1.0.3/configure.ac
--- old/xkill-1.0.2/configure.ac 2009-10-13 05:58:53.000000000 +0200
+++ new/xkill-1.0.3/configure.ac 2010-11-11 04:26:04.000000000 +0100
@@ -21,26 +21,24 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(xkill, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkill)
-AM_INIT_AUTOMAKE([dist-bzip2])
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([xkill], [1.0.3],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xkill])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
+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)
-
-AM_CONFIG_HEADER(config.h)
-
-AC_PROG_CC
-AC_PROG_INSTALL
-
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XKILL, x11 xmuu)
-AC_SUBST(XKILL_CFLAGS)
-AC_SUBST(XKILL_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/xkill-1.0.2/INSTALL new/xkill-1.0.3/INSTALL
--- old/xkill-1.0.2/INSTALL 2006-07-11 04:53:20.000000000 +0200
+++ new/xkill-1.0.3/INSTALL 2010-11-11 04:26:39.000000000 +0100
@@ -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 `' 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 -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/xkill-1.0.2/Makefile.am new/xkill-1.0.3/Makefile.am
--- old/xkill-1.0.2/Makefile.am 2009-10-13 05:52:03.000000000 +0200
+++ new/xkill-1.0.3/Makefile.am 2010-11-09 19:19:46.000000000 +0100
@@ -36,38 +36,22 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff -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/xkill-1.0.2/xkill.c new/xkill-1.0.3/xkill.c
--- old/xkill-1.0.2/xkill.c 2009-01-24 23:53:58.000000000 +0100
+++ new/xkill-1.0.3/xkill.c 2010-11-09 19:33:47.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: xkill.c,v 1.5 2001/02/09 02:05:54 xorgcvs Exp $ */
/*
Copyright 1988, 1998 The Open Group
@@ -26,7 +25,6 @@
from The Open Group.
*/
-/* $XFree86: xc/programs/xkill/xkill.c,v 1.5 2001/04/01 14:00:22 tsi Exp $ */
/*
* xkill - simple program for destroying unwanted clients
@@ -75,22 +73,18 @@
static void
usage(void)
{
- static char *options[] = {
-"where options include:",
-" -display displayname X server to contact",
-" -id resource resource whose client is to be killed",
-" -frame don't ignore window manager frames",
-" -button number specific button to be pressed to select window",
-" -all kill all clients with top level windows",
-"",
-NULL};
+ const char *options =
+"where options include:\n"
+" -display displayname X server to contact\n"
+" -id resource resource whose client is to be killed\n"
+" -frame don't ignore window manager frames\n"
+" -button number specific button to be pressed to select window\n"
+" -all kill all clients with top level windows\n"
+"\n";
char **cpp;
- fprintf (stderr, "usage: %s [-option ...]\n",
- ProgramName);
- for (cpp = options; *cpp; cpp++) {
- fprintf (stderr, "%s\n", *cpp);
- }
+ fprintf (stderr, "usage: %s [-option ...]\n%s",
+ ProgramName, options);
Exit (1);
}
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/xkill-1.0.2/xkill.man new/xkill-1.0.3/xkill.man
--- old/xkill-1.0.2/xkill.man 2006-07-11 04:53:20.000000000 +0200
+++ new/xkill-1.0.3/xkill.man 2010-10-07 05:36:26.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Xorg: xkill.man,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $
.\" Copyright 1988, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,8 +22,6 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xkill.man,v 1.8 2001/12/14 20:02:06 dawes Exp $
-.\"
.TH XKILL 1 __xorgversion__
.SH NAME
xkill - kill a client by its X resource
++++++ xrdb-1.0.6.tar.bz2 -> xrdb-1.0.7.tar.bz2 ++++++
++++ 9181 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/xrdb-1.0.6/ChangeLog new/xrdb-1.0.7/ChangeLog
--- old/xrdb-1.0.6/ChangeLog 2009-10-13 00:07:50.000000000 +0200
+++ new/xrdb-1.0.7/ChangeLog 2010-11-11 04:32:27.000000000 +0100
@@ -1,3 +1,133 @@
+commit 6606863fc8467bcbc829cea63764be0d283c4b8a
+Author: Alan Coopersmith
+Date: Wed Nov 10 19:32:04 2010 -0800
+
+ xrdb 1.0.7
+
+ Signed-off-by: Alan Coopersmith
+
+commit 3a1f0f784bfd537096d4d37a77b7be7904bb88aa
+Author: Alan Coopersmith
+Date: Tue Nov 9 16:26:45 2010 -0800
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM sttaements under the Automake initialization section.
+ Add missing AC_CONFIG_SRCDIR
+
+ Signed-off-by: Alan Coopersmith
+
+commit 4139da28b7c9bb5bd35933e28a6f0f6e325d921e
+Author: Alan Coopersmith
+Date: Tue Nov 9 16:25:38 2010 -0800
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith
+
+commit a6ca7c4c8b330bfd8a1a225afe826d7dbfa820fb
+Author: Alan Coopersmith
+Date: Tue Nov 9 16:24:37 2010 -0800
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ Enables use of platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith
+
+commit 0720655ecd3c8f3bc8c8bcb97863c02d73cae674
+Author: Gaetan Nadon
+Date: Tue Nov 9 16:24:08 2010 -0800
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+ Signed-off-by: Alan Coopersmith
+
+commit da50b50cc1befae114dd8f9ce67b2aa034bcedf3
+Author: Jesse Adkins
+Date: Tue Sep 28 13:29:50 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins
+ Signed-off-by: Alan Coopersmith
+
+commit 532959ec60149589a72f027d96cb57f1368cdf89
+Author: Gaetan Nadon
+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 0fa4fd255c494b8d9551453c07521fc7473fc2b6
+Author: Gaetan Nadon
+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 b90564dc7339082f8325d06edb28264f1b6e8bb6
+Author: Gaetan Nadon
+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 aa5fd3d4dded23b6045e93ac220edb13b68a4658
+Author: Gaetan Nadon
+Date: Thu Oct 22 12:34:16 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 cf6bd9d305726420905f2aa7c7471665f5e70f7c
+Author: Jeremy Huddleston
+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
+
commit b3a7a1fb2356d6fba676746f60176f1a69b9a72a
Author: Alan Coopersmith
Date: Mon Oct 12 15:04:50 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/xrdb-1.0.6/config.h.in new/xrdb-1.0.7/config.h.in
--- old/xrdb-1.0.6/config.h.in 2009-10-13 00:05:14.000000000 +0200
+++ new/xrdb-1.0.7/config.h.in 2010-11-11 04:32:21.000000000 +0100
@@ -54,6 +54,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/xrdb-1.0.6/configure.ac new/xrdb-1.0.7/configure.ac
--- old/xrdb-1.0.6/configure.ac 2009-10-13 00:04:42.000000000 +0200
+++ new/xrdb-1.0.7/configure.ac 2010-11-11 04:31:42.000000000 +0100
@@ -20,20 +20,21 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(xrdb, [1.0.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xrdb)
-AM_INIT_AUTOMAKE([dist-bzip2])
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([xrdb], [1.0.7],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xrdb])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-AM_CONFIG_HEADER(config.h)
-# 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)
-
-AC_PROG_CC
-AC_PROG_INSTALL
-
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AC_CHECK_FUNC([mkstemp],
@@ -83,7 +84,5 @@
# Checks for pkg-config packages
PKG_CHECK_MODULES(XRDB, xmuu x11)
-AC_SUBST(XRDB_CFLAGS)
-AC_SUBST(XRDB_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/xrdb-1.0.6/INSTALL new/xrdb-1.0.7/INSTALL
--- old/xrdb-1.0.6/INSTALL 2006-07-11 04:54:07.000000000 +0200
+++ new/xrdb-1.0.7/INSTALL 2010-11-11 04:32:27.000000000 +0100
@@ -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 `' 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 -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/xrdb-1.0.6/Makefile.am new/xrdb-1.0.7/Makefile.am
--- old/xrdb-1.0.6/Makefile.am 2009-10-12 23:40:07.000000000 +0200
+++ new/xrdb-1.0.7/Makefile.am 2010-11-10 01:24:24.000000000 +0100
@@ -34,37 +34,22 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE) ChangeLog
+EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-MAINTAINERCLEANFILES=ChangeLog
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
-
-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'
+dist-hook: ChangeLog INSTALL
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) < $< > $@
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/xrdb-1.0.6/xrdb.c new/xrdb-1.0.7/xrdb.c
--- old/xrdb-1.0.6/xrdb.c 2009-01-28 03:21:22.000000000 +0100
+++ new/xrdb-1.0.7/xrdb.c 2010-10-07 05:38:04.000000000 +0200
@@ -1,8 +1,6 @@
/*
* xrdb - X resource manager database utility
*
- * $Xorg: xrdb.c,v 1.6 2000/08/17 19:54:56 cpqbld Exp $
- * $XdotOrg: app/xrdb/xrdb.c,v 1.5 2006/04/03 18:23:14 alanc Exp $
*/
/*
@@ -31,7 +29,6 @@
* used in advertising or publicity pertaining to distribution of the software
* without specific, written prior permission.
*/
-/* $XFree86: xc/programs/xrdb/xrdb.c,v 3.16tsi Exp $ */
/*
* this program is used to load, or dump the resource manager database
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/xrdb-1.0.6/xrdb.man new/xrdb-1.0.7/xrdb.man
--- old/xrdb-1.0.6/xrdb.man 2007-04-12 00:31:46.000000000 +0200
+++ new/xrdb-1.0.7/xrdb.man 2010-10-07 05:38:04.000000000 +0200
@@ -1,5 +1,3 @@
-.\" $XdotOrg: $
-.\" $Xorg: xrdb.man,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $
.\" Copyright 1991, Digital Equipment Corporation.
.\" Copyright 1991, 1994, 1998 The Open Group
.\"
@@ -25,8 +23,6 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/xrdb/xrdb.man,v 1.7 2001/01/27 18:21:22 dawes Exp $
-.\"
.TH XRDB 1 __xorgversion__
.SH NAME
xrdb - X server resource database utility
++++++ xrefresh-1.0.3.tar.bz2 -> xrefresh-1.0.4.tar.bz2 ++++++
++++ 8621 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/xrefresh-1.0.3/ChangeLog new/xrefresh-1.0.4/ChangeLog
--- old/xrefresh-1.0.3/ChangeLog 2009-10-17 04:25:58.000000000 +0200
+++ new/xrefresh-1.0.4/ChangeLog 2010-11-11 04:47:16.000000000 +0100
@@ -1,3 +1,118 @@
+commit 631be2568befbd4aee98a3cd4849403554db79d7
+Author: Alan Coopersmith
+Date: Wed Nov 10 19:46:37 2010 -0800
+
+ xrefresh 1.0.4
+
+ Signed-off-by: Alan Coopersmith
+
+commit 6d3d5b90e0ab621cd215b007936dc3bc2a8c0053
+Author: Alan Coopersmith
+Date: Tue Nov 9 17:01:30 2010 -0800
+
+ man page: change (3X) to (__libmansuffix__)
+
+ Signed-off-by: Alan Coopersmith
+
+commit 5b487ce8e51dec698b7c71d978d8666a098eb3f4
+Author: Alan Coopersmith
+Date: Tue Nov 9 16:35:11 2010 -0800
+
+ Purge CVS version tags
+
+ Signed-off-by: Alan Coopersmith
+
+commit 724fd273618e44ec181cee670a16afcbe1e4f3fc
+Author: Alan Coopersmith
+Date: Tue Nov 9 16:31:31 2010 -0800
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM sttaements under the Automake initialization section.
+ Add missing AC_CONFIG_SRCDIR
+
+ Signed-off-by: Alan Coopersmith
+
+commit 894a6fdd37ff5c14f53db08f77bbec4a1387c9a2
+Author: Alan Coopersmith
+Date: Tue Nov 9 16:29:37 2010 -0800
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith
+
+commit 09a8377a96411bd62a08a4f0e921a18162ef669e
+Author: Alan Coopersmith
+Date: Tue Nov 9 16:28:57 2010 -0800
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ Enables use of platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith
+
+commit 3344c9d26e243e5a79cf7437606ca496c3b7042f
+Author: Gaetan Nadon
+Date: Tue Nov 9 16:28:53 2010 -0800
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+ Signed-off-by: Alan Coopersmith
+
+commit 3f2443358056f366adc1f95d8d41fe690e336aac
+Author: Gaetan Nadon
+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 98885558f39792425d6579fe063517da1a241665
+Author: Gaetan Nadon
+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 20ce8ee10701e53b3b18d73a68827d1c6f1278a3
+Author: Gaetan Nadon
+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 d82a88edd20f9e0ef00f7d6ffcf83e6533c3f0a8
+Author: Gaetan Nadon
+Date: Thu Oct 22 12:34:16 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 d940fdcf80c5e5d71f5fce071a6301420de85607
Author: Alan Coopersmith
Date: Fri Oct 16 19:20:34 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/xrefresh-1.0.3/config.h.in new/xrefresh-1.0.4/config.h.in
--- old/xrefresh-1.0.3/config.h.in 2009-10-17 04:20:53.000000000 +0200
+++ new/xrefresh-1.0.4/config.h.in 2010-11-11 04:47:08.000000000 +0100
@@ -42,6 +42,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/xrefresh-1.0.3/configure.ac new/xrefresh-1.0.4/configure.ac
--- old/xrefresh-1.0.3/configure.ac 2009-10-17 04:20:26.000000000 +0200
+++ new/xrefresh-1.0.4/configure.ac 2010-11-11 04:45:46.000000000 +0100
@@ -21,26 +21,24 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(xrefresh, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xrefresh)
-AM_INIT_AUTOMAKE([dist-bzip2])
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([xrefresh], [1.0.4],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xrefresh])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
+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)
-
-AM_CONFIG_HEADER(config.h)
-
-AC_PROG_CC
-AC_PROG_INSTALL
-
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XREFRESH, x11)
-AC_SUBST(XREFRESH_CFLAGS)
-AC_SUBST(XREFRESH_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/xrefresh-1.0.3/INSTALL new/xrefresh-1.0.4/INSTALL
--- old/xrefresh-1.0.3/INSTALL 2006-07-11 04:54:09.000000000 +0200
+++ new/xrefresh-1.0.4/INSTALL 2010-11-11 04:47:15.000000000 +0100
@@ -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 `' 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 -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/xrefresh-1.0.3/Makefile.am new/xrefresh-1.0.4/Makefile.am
--- old/xrefresh-1.0.3/Makefile.am 2009-10-17 04:18:04.000000000 +0200
+++ new/xrefresh-1.0.4/Makefile.am 2010-11-10 01:34:32.000000000 +0100
@@ -36,38 +36,22 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff -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/xrefresh-1.0.3/xrefresh.c new/xrefresh-1.0.4/xrefresh.c
--- old/xrefresh-1.0.3/xrefresh.c 2009-01-28 03:21:24.000000000 +0100
+++ new/xrefresh-1.0.4/xrefresh.c 2010-11-10 01:34:45.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XdotOrg: $ */
/***********************************************************
Copyright 1987, 1988, 1998 The Open Group
@@ -47,12 +46,9 @@
******************************************************************/
/*
- * $Xorg: xrefresh.c,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $
- *
* Kitchen sink version, useful for clearing small areas and flashing the
* screen.
*/
-/* $XFree86: xc/programs/xrefresh/xrefresh.c,v 3.5 2001/07/25 15:05:28 dawes Exp $ */
#include
#include
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/xrefresh-1.0.3/xrefresh.man new/xrefresh-1.0.4/xrefresh.man
--- old/xrefresh-1.0.3/xrefresh.man 2006-07-11 04:54:09.000000000 +0200
+++ new/xrefresh-1.0.4/xrefresh.man 2010-11-10 02:01:05.000000000 +0100
@@ -1,4 +1,3 @@
-.\" $Xorg: xrefresh.man,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $
.\" Copyright 1988, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,8 +22,6 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/xrefresh/xrefresh.man,v 1.7 2001/01/27 18:21:22 dawes Exp $
-.\"
.TH XREFRESH 1 __xorgversion__
.SH NAME
xrefresh - refresh all or part of an X screen
@@ -81,7 +78,7 @@
The
.I xrefresh
program uses the routine
-.I XGetDefault(3X)
+.I XGetDefault(__libmansuffix__)
to read defaults, so its resource names are all capitalized.
.PP
.TP 8
++++++ xset-1.2.0.tar.bz2 -> xset-1.2.1.tar.bz2 ++++++
++++ 3985 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/xset-1.2.0/ChangeLog new/xset-1.2.1/ChangeLog
--- old/xset-1.2.0/ChangeLog 2010-08-06 05:15:26.000000000 +0200
+++ new/xset-1.2.1/ChangeLog 2010-11-11 05:02:46.000000000 +0100
@@ -1,3 +1,116 @@
+commit 8a3ad532fc8e00ea5066355a783cb270315596fe
+Author: Alan Coopersmith
+Date: Wed Nov 10 20:02:19 2010 -0800
+
+ xset 1.2.1
+
+ Signed-off-by: Alan Coopersmith
+
+commit d75ab3dcae8bcb022e87fd73c9f798421d040c46
+Author: Alan Coopersmith
+Date: Tue Nov 9 18:16:27 2010 -0800
+
+ Strip trailing whitespace
+
+ Generated via: perl -i -p -e 's{\s+$}{\n}' *
+
+ Signed-off-by: Alan Coopersmith
+
+commit 33580bb84fb5ca6d1a49c1f1ac7b785fe4f92d11
+Author: Alan Coopersmith
+Date: Tue Nov 9 18:13:51 2010 -0800
+
+ Restore man page copyright accidentally removed in ce3f6a73c2beef
+
+ Signed-off-by: Alan Coopersmith
+
+commit 0d807d97e8387a38b6a9324912b9c65662949038
+Author: Alan Coopersmith
+Date: Tue Nov 9 17:13:41 2010 -0800
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM sttaements under the Automake initialization section.
+ Add missing AC_CONFIG_SRCDIR
+
+ Signed-off-by: Alan Coopersmith
+
+commit edeb291f81424ec04798618379ad252c122377ec
+Author: Alan Coopersmith
+Date: Tue Nov 9 17:11:42 2010 -0800
+
+ config: AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit 5b4a8121b1cb2c0dc643460ee7c9363dc0d83a38
+Author: Gaetan Nadon
+Date: Tue Nov 9 17:09:45 2010 -0800
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+ Signed-off-by: Alan Coopersmith
+
+commit ce3f6a73c2beef0c486575f7797d92b44a718973
+Author: Jesse Adkins
+Date: Tue Sep 28 13:29:50 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins
+ Signed-off-by: Alan Coopersmith
+
+commit 41743c6fbea9f58dff4e9fe200837fe718eefc9d
+Author: Bryce Harrington
+Date: Tue Aug 10 12:46:14 2010 -0400
+
+ Spelling fix in help docs.
+
+ Reviewed-by: Robert Hooker
+ Signed-off-by: Bryce Harrington
+ Signed-off-by: Peter Hutterer
+
+commit 5948a0e2095c4e032dd93e22a65077ff81288666
+Author: Yaakov Selkowitz
+Date: Fri Aug 6 00:26:48 2010 -0500
+
+ Use silent rules
+
+ Signed-off-by: Yaakov Selkowitz
+ Reviewed-by: Peter Hutterer
+ Signed-off-by: Peter Hutterer
+
+commit d36afd69f0c5129b6b50c9062257560342d81ebd
+Author: Yaakov Selkowitz
+Date: Fri Aug 6 00:26:47 2010 -0500
+
+ Use AC_PROG_SED and MAN_SUBSTS in macros-1.8
+
+ Signed-off-by: Yaakov Selkowitz
+ Reviewed-by: Peter Hutterer
+ Signed-off-by: Peter Hutterer
+
+commit 0ac4f20a863d69b99193da26d468397827c672a1
+Author: Yaakov Selkowitz
+Date: Fri Aug 6 00:26:46 2010 -0500
+
+ Remove unused variable warning with !XF86MISC
+
+ xset.c: In function 'query':
+ xset.c:1317: warning: unused variable 'dummy'
+
+ Signed-off-by: Yaakov Selkowitz
+ Reviewed-by: Peter Hutterer
+ Signed-off-by: Peter Hutterer
+
commit c963b0cb393630962e9094e849b291c539b655ca
Author: Peter Hutterer
Date: Fri Aug 6 13:10:36 2010 +1000
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/xset-1.2.0/configure.ac new/xset-1.2.1/configure.ac
--- old/xset-1.2.0/configure.ac 2010-08-06 05:10:27.000000000 +0200
+++ new/xset-1.2.1/configure.ac 2010-11-11 05:01:57.000000000 +0100
@@ -1,5 +1,5 @@
dnl Copyright 2005 Red Hat, Inc.
-dnl
+dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
dnl documentation for any purpose is hereby granted without fee, provided that
dnl the above copyright notice appear in all copies and that both that
@@ -9,7 +9,7 @@
dnl specific, written prior permission. Red Hat makes no
dnl representations about the suitability of this software for any purpose. It
dnl is provided "as is" without express or implied warranty.
-dnl
+dnl
dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -20,21 +20,22 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(xset,[1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xset)
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([xset], [1.2.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xset])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require xorg-macros: 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)
XORG_DEFAULT_OPTIONS
-AM_CONFIG_HEADER(config.h)
-
-AC_PROG_CC
-AC_PROG_INSTALL
-
# Checks for system functions
AC_CHECK_FUNCS([usleep])
@@ -51,16 +52,16 @@
AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include ])
CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-PKG_CHECK_MODULES(SET_XKB, x11,
+PKG_CHECK_MODULES(SET_XKB, x11,
[SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS"
AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include ])
CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-AC_ARG_WITH(xf86misc, AC_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]),
+AC_ARG_WITH(xf86misc, AC_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]),
[USE_XF86MISC="$withval"], [USE_XF86MISC="yes"])
if test "x$USE_XF86MISC" != "xno" ; then
- PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc,
+ PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc,
[SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $SET_XF86MISC_CFLAGS $SET_X11_CFLAGS"
AC_CHECK_HEADERS([X11/extensions/xf86misc.h X11/extensions/xf86mscstr.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/xset-1.2.0/Makefile.am new/xset-1.2.1/Makefile.am
--- old/xset-1.2.0/Makefile.am 2010-08-06 05:07:57.000000000 +0200
+++ new/xset-1.2.1/Makefile.am 2010-11-10 03:15:26.000000000 +0100
@@ -1,6 +1,6 @@
-#
+#
# Copyright 2005 Red Hat, 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
@@ -10,7 +10,7 @@
# specific, written prior permission. Red Hat makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
-#
+#
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -35,7 +35,7 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE)
MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
@@ -49,26 +49,11 @@
dist-hook: ChangeLog INSTALL
-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
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(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/xset-1.2.0/xset.c new/xset-1.2.1/xset.c
--- old/xset-1.2.0/xset.c 2010-08-06 05:07:57.000000000 +0200
+++ new/xset-1.2.1/xset.c 2010-11-10 03:15:26.000000000 +0100
@@ -1,7 +1,3 @@
-/*
- * $Xorg: xset.c,v 1.6 2001/02/09 02:05:58 xorgcvs Exp $
- */
-
/*
Copyright 1985, 1998 The Open Group
@@ -27,7 +23,6 @@
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/programs/xset/xset.c,v 3.31 2003/05/27 22:27:09 tsi Exp $ */
/* Modified by Stephen so keyboard rate is set using XKB extensions */
#ifdef HAVE_CONFIG_H
@@ -573,7 +568,7 @@
*
* On OS/2, use _sleep2()
*/
-
+
#ifdef HAVE_USLEEP
# define Usleep(us) usleep((us))
#else
@@ -934,7 +929,7 @@
}
/*
- * parse the path list. If before or after is non-zero, we'll need
+ * parse the path list. If before or after is non-zero, we'll need
* the current value.
*/
@@ -1314,7 +1309,6 @@
XKeyboardState values;
int acc_num, acc_denom, threshold;
int timeout, interval, prefer_blank, allow_exp;
- int dummy;
#ifdef XF86MISC
XF86MiscKbdSettings kbdinfo;
@@ -1425,10 +1419,14 @@
#endif
#endif
#ifdef XF86MISC
- if (XF86MiscQueryExtension(dpy, &dummy, &dummy) &&
- XF86MiscGetKbdSettings(dpy, &kbdinfo))
- printf(" auto repeat delay: %d repeat rate: %d\n",
- kbdinfo.delay, kbdinfo.rate);
+ {
+ int dummy;
+
+ if (XF86MiscQueryExtension(dpy, &dummy, &dummy) &&
+ XF86MiscGetKbdSettings(dpy, &kbdinfo))
+ printf(" auto repeat delay: %d repeat rate: %d\n",
+ kbdinfo.delay, kbdinfo.rate);
+ }
#endif
printf(" auto repeating keys: ");
for (i = 0; i < 4; i++) {
@@ -1657,8 +1655,8 @@
#ifdef FONTCACHE
fprintf(stderr, " To control font cache:\n");
fprintf(stderr, "\t fc [hi-mark [low-mark [balance]]]\n");
- fprintf(stderr, "\t both mark values spcecified in KB\n");
- fprintf(stderr, "\t balance value spcecified in percent (10 - 90)\n");
+ fprintf(stderr, "\t both mark values specified in KB\n");
+ fprintf(stderr, "\t balance value specified in percent (10 - 90)\n");
fprintf(stderr, " Show font cache statistics:\n");
fprintf(stderr, "\t fc s\n");
#endif
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/xset-1.2.0/xset.man new/xset-1.2.1/xset.man
--- old/xset-1.2.0/xset.man 2009-12-20 23:25:33.000000000 +0100
+++ new/xset-1.2.1/xset.man 2010-11-10 03:15:26.000000000 +0100
@@ -1,15 +1,14 @@
-.\" $Xorg: xset.man,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $
.\" Copyright 1988, 1998 The Open Group
-.\"
+.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
.\" documentation for any purpose is hereby granted without fee, provided that
.\" the above copyright notice appear in all copies and that both that
.\" copyright notice and this permission notice appear in supporting
.\" documentation.
-.\"
+.\"
.\" The above copyright notice and this permission notice shall be included
.\" in all copies or substantial portions of the Software.
-.\"
+.\"
.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -17,14 +16,12 @@
.\" 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/xset/xset.man,v 3.14 2001/12/14 20:02:22 dawes Exp $
-.\"
+.\"
.TH XSET 1 __xorgversion__
.SH NAME
xset - user preference utility for X
@@ -40,27 +37,27 @@
.br
[+dpms] [-dpms]
.br
- [dpms \fIstandby\fP [\fI suspend\fP [\fI off\fP]]]
+ [dpms \fIstandby\fP [\fI suspend\fP [\fI off\fP]]]
[dpms force {standby|suspend|off|on}]
.br
-[fp=\fIpathlist\fP]
-[-fp=\fIpathlist\fP]
-[+fp=\fIpathlist\fP]
-[fp-\fIpathlist\fP]
-[fp+\fIpathlist\fP]
+[fp=\fIpathlist\fP]
+[-fp=\fIpathlist\fP]
+[+fp=\fIpathlist\fP]
+[fp-\fIpathlist\fP]
+[fp+\fIpathlist\fP]
.br
[fp default] [fp rehash]
.br
[-led [\fIinteger\fP|named \fIindicator\fP]]
[led [\fIinteger\fP|named \fIindicator\fP]]
-.br
+.br
[led {on|off}]
.br
[mouse [\fIaccel_mult\fP[/\fIaccel_div\fP] [\fIthreshold\fP]]] [mouse default]
.br
[p \fIpixel\fP \fIcolor\fP]
.br
-[-r [keycode]] [r [keycode]]
+[-r [keycode]] [r [keycode]]
[r {on|off}] [r rate \fIdelay\fP [\fIrate\fP]]
.br
[s [\fIlength\fP [\fIperiod\fP]]] [s {blank|noblank}]
@@ -163,8 +160,8 @@
.PP
.TP 8
.B "\+fp \fRor\fP fp\+"
-This \fB\+fp\fP and \fBfp\+\fP options prepend and append elements to the
-current font path, respectively. They must be followed by a comma-separated
+This \fB\+fp\fP and \fBfp\+\fP options prepend and append elements to the
+current font path, respectively. They must be followed by a comma-separated
list of entries.
.PP
.TP 8
@@ -200,7 +197,7 @@
transition range. This way, the pointing device can be used for precise
alignment when it is moved slowly, yet it can be set to travel across
the screen in a flick of the wrist when desired. One or both
-parameters for the
+parameters for the
.B m
option can be omitted, but if only one is
given, it will be interpreted as the acceleration.
@@ -243,14 +240,14 @@
not typically valid for this command. Example: "\fBxset\ -r\ 10\fP" will
disable autorepeat for the "1" key on the top row of an IBM PC keyboard.
-If the server supports the XFree86-Misc extension, or the XKB extension,
+If the server supports the XFree86-Misc extension, or the XKB extension,
then a parameter
of 'rate' is accepted and should be followed by zero, one or two numeric
values. The first specifies the delay before autorepeat starts and
the second specifies the repeat rate. In the case that the server
supports the XKB extension, the delay is the number of milliseconds
before autorepeat starts, and the rate is the number of repeats
-per second. If the rate or delay is not given, it will be set
+per second. If the rate or delay is not given, it will be set
to the default value.
.PP
.TP 8
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org