Hello community,
here is the log from the commit of package xorg-x11
checked in at Fri Aug 10 17:21:16 CEST 2007.
--------
--- xorg-x11/xorg-x11.changes 2007-08-07 08:16:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2007-08-10 15:15:01.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Aug 10 15:13:33 CEST 2007 - sndirsch@suse.de
+
+- xsetroot 1.0.2
+ * Typo, it's xsetroot, not setroot.
+- xmessage 1.0.2
+ * minor build changes
+
+-------------------------------------------------------------------
Old:
----
xmessage-X11R7.0-1.0.1.tar.bz2
xsetroot-X11R7.0-1.0.1.tar.bz2
New:
----
xmessage-1.0.2.tar.bz2
xsetroot-1.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.e18091/_old 2007-08-10 17:20:54.000000000 +0200
+++ /var/tmp/diff_new_pack.e18091/_new 2007-08-10 17:20:54.000000000 +0200
@@ -18,7 +18,7 @@
%endif
URL: http://xorg.freedesktop.org/
Version: 7.2
-Release: 108
+Release: 109
License: X11/MIT, xc/fonts/scaled/Type1/Copyright
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -97,7 +97,7 @@
Source65: xlsfonts-1.0.2.tar.bz2
Source66: xmag-X11R7.0-1.0.1.tar.bz2
Source67: xman-X11R7.1-1.0.2.tar.bz2
-Source68: xmessage-X11R7.0-1.0.1.tar.bz2
+Source68: xmessage-1.0.2.tar.bz2
Source69: xmh-X11R7.0-1.0.1.tar.bz2
Source70: xmodmap-1.0.3.tar.bz2
Source71: xmore-X11R7.0-1.0.1.tar.bz2
@@ -113,7 +113,7 @@
Source81: xset-X11R7.1-1.0.2.tar.bz2
Source82: xsetmode-X11R7.0-1.0.0.tar.bz2
Source83: xsetpointer-X11R7.0-1.0.0.tar.bz2
-Source84: xsetroot-X11R7.0-1.0.1.tar.bz2
+Source84: xsetroot-1.0.2.tar.bz2
Source85: xsm-X11R7.0-1.0.1.tar.bz2
Source86: xstdcmap-X11R7.0-1.0.1.tar.bz2
Source87: xtrap-X11R7.1-1.0.2.tar.bz2
@@ -455,6 +455,11 @@
/var/lib/xdm/authdir/
%changelog
+* Fri Aug 10 2007 - sndirsch@suse.de
+- xsetroot 1.0.2
+ * Typo, it's xsetroot, not setroot.
+- xmessage 1.0.2
+ * minor build changes
* Tue Aug 07 2007 - sndirsch@suse.de
- xclock 1.0.3
* X.Org Bug 10775: xclock does not set _NET_WM_PID
++++++ xmessage-X11R7.0-1.0.1.tar.bz2 -> xmessage-1.0.2.tar.bz2 ++++++
++++ 6795 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/xmessage-X11R7.0-1.0.1/ChangeLog new/xmessage-1.0.2/ChangeLog
--- old/xmessage-X11R7.0-1.0.1/ChangeLog 2005-12-21 03:29:52.000000000 +0100
+++ new/xmessage-1.0.2/ChangeLog 2007-08-10 11:23:54.000000000 +0200
@@ -1,31 +1,228 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 24f1760790a9d2f73cac94bc00d8137fefac9f38
+Author: Matthieu Herrb
+Date: Fri Aug 10 11:18:12 2007 +0200
- * configure.ac:
- Update package version for X11R7 release.
+ Bump version
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit db559a38a8bc954c6fd54866193a683d5c78bffa
+Author: Matthieu Herrb
+Date: Tue Apr 24 22:07:48 2007 +0200
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ fill in this generated file.
-2005-12-07 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit aabd047545359c82eb0035f8aa77864b362e7f0e
+Author: Matthieu Herrb
+Date: Tue Apr 24 22:04:09 2007 +0200
- * Makefile.am:
- * configure.ac:
- Change to use the app-defaults default dir configured in libXt.
+ Add rules to generate ChangeLog.
+
+ (this file was missed in a previous commit - sorry).
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 821d4603d701efcb09fcbdd246d6f7d9c3a24f28
+Author: Matthieu Herrb
+Date: Sun Apr 15 19:13:36 2007 +0200
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Untabify message before inserting it.
+
+ From Kevin Ryde in Debian BTS, via bugzilla #10575, Brice Goglin.
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit ed3f8aa0b66e5829836b576e6096bd645e87c50e
+Author: Matthieu Herrb
+Date: Sun Apr 15 19:05:45 2007 +0200
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Add emacs droppings to the list of ignored files.
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 1635803a5f719b0f8b5af8208819d63166990c5b
+Author: Matthieu Herrb
+Date: Sun Apr 15 19:04:51 2007 +0200
- * configure.ac:
- Update package version number for RC1 release.
+ Modernize build
+
+ - replace ChangeLog by a generated file
+ - rename .cvsignore -> .gitignore
+commit 238767cb31e02d75bb7880f0b9c79e27992c3155
+Author: Kevin E Martin
+Date: Wed Dec 21 02:29:52 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 6b7b94f799c71278065bbf589108f1e2f7b25671
+Author: Adam Jackson
+Date: Mon Dec 19 16:22:46 2005 +0000
+
+ Stub COPYING files
+
+commit ffde028f5a2f865a411b6b63c9785e339c4d9a3c
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:09 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit ff03086d9069fcd5f2b952709737dae7d51d80ef
+Author: Kevin E Martin
+Date: Wed Dec 7 16:18:01 2005 +0000
+
+ Change to use the app-defaults default dir configured in libXt.
+
+commit c3dddcf94c8ec3c4d483e1d568ea8fb69aa468a0
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:24 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit bab54eda6bb0b6680580b27ee0b5e268b97cb8ad
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:26 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 94622fedb20d9454d728628f190cf5280ed9a066
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:01:44 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 5464c0f2adf34213f21137d1f819254ed50626e5
+Author: Eric Anholt
+Date: Mon Nov 21 10:35:05 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 4d5dfb99f50bd1d9577d17426d1cabe8ea29a2a0
+Author: Eric Anholt
+Date: Sun Nov 20 22:08:54 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit b71de113e311e10e59c3b6fbdc1ff63c90c8324d
+Author: Kevin E Martin
+Date: Wed Oct 19 02:47:56 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit b70f6692231e994bb57b4e51c09ab5535241713c
+Author: Alan Coopersmith
+Date: Tue Oct 18 00:32:55 2005 +0000
+
+ Change default install dir for app-default files from
+ $(sysconfdir)/X11/app-defaults to $(libdir)/X11/app-defaults to match
+ the monolith & allow localization
+
+commit 630e728f987a8fcd53d1a0076bca0834d45e132f
+Author: Alan Coopersmith
+Date: Mon Oct 17 23:56:24 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 557c649ffb5bbfed8533b3d93ea1dbedaa0fc0ac
+Author: Alan Coopersmith
+Date: Fri Oct 14 00:25:47 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit eb77492515f7944b530550950a0143c8fb5b45cf
+Author: Alan Coopersmith
+Date: Mon Aug 1 20:25:30 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit 28253816f0a35c12ba6e5eea660e6d89424a78be
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:36 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit fa1d1593fe790d08a2e6e1f4e16f86f923b7aeb5
+Author: Alan Coopersmith
+Date: Tue Jul 26 15:44:03 2005 +0000
+
+ Replace more GNU make-ism's with more portable macros
+
+commit a4ea5c92e64b3cf7a0df17705c27e8a7abdb2f8b
+Author: Matthieu Herrb
+Date: Sun Jul 24 10:26:39 2005 +0000
+
+ fix GNU-make only app-defaults rule
+
+commit 48a77ca80a31851bf02cec6ab510d9f1458311a5
+Author: Adam Jackson
+Date: Wed Jul 20 19:32:02 2005 +0000
+
+ Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
+ configure cache, you cache it, and the cached value is probably wrong.
+
+commit 665ba4b9cf9a7c94782637051eb8e0d735bbaf7c
+Author: Søren Sandmann Pedersen
+Date: Tue Jul 5 22:51:11 2005 +0000
+
+ Add build systems for xlogo, xlsatoms, xlsclients, xmag, xman, xmessage,
+ xmh, xmore. lib/Xaw/xaw.m4: Add an AM_CONDITIONAL and a shell variable
+ xaw_use_xprint symlink.sh: add some extra files for xgc, xinit,
+ xkbcomp, xlogo, xmb, and xmodmap xc/programs/xmore/xmore.c:
+ Conditionalize use of xprint
+
+commit 78f5d29fcde2813dfed4474a3cce4ef77c592580
+Author: Egbert Eich
+Date: Fri Apr 23 19:54:58 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit e5660a70027feb61532e8ab84d41ea6eed085cab
+Author: Egbert Eich
+Date: Sun Mar 14 08:35:40 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 39acb07c37ed1df6d3ee3f332c9d817018b2c2e5
+Author: Egbert Eich
+Date: Wed Mar 3 12:13:15 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 7879a743821a3984c29c0172450c1eedf6a4d730
+Author: Egbert Eich
+Date: Thu Feb 26 13:36:26 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 795b4a0de2c473b11901107585f7d8a85abfd193
+Author: Egbert Eich
+Date: Thu Feb 26 09:24:14 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 9ba02b5d7b34eba8356dfcb83694698dbc550073
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:29:15 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 6dcad3b7ba5983633e4303c22446c3de8922c003
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:29:15 2003 +0000
+
+ Initial revision
+
+commit 0e47985a1de54c6ac4f09831a7a81c83c43fc577
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:49:23 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit e87b0d408c8bef387afb069e25028d9a52c58a62
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:49:23 2003 +0000
+
+ Initial revision
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/xmessage-X11R7.0-1.0.1/compile new/xmessage-1.0.2/compile
--- old/xmessage-X11R7.0-1.0.1/compile 2005-12-21 08:30:34.000000000 +0100
+++ new/xmessage-1.0.2/compile 2007-08-10 11:23:04.000000000 +0200
@@ -1,8 +1,9 @@
#! /bin/sh
-
# Wrapper for compilers which do not understand `-c -o'.
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Written by Tom Tromey .
#
# This program is free software; you can redistribute it and/or modify
@@ -17,83 +18,125 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# Usage:
-# compile PROGRAM [ARGS]...
-# `-o FOO.o' is removed from the args passed to the actual compile.
-
-prog=$1
-shift
+# This file is maintained in Automake, please report
+# bugs to or send patches to
+# .
+
+case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to .
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+esac
ofile=
cfile=
-args=
-while test $# -gt 0; do
- case "$1" in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we do something ugly here.
- ofile=$2
- shift
- case "$ofile" in
- *.o | *.obj)
- ;;
- *)
- args="$args -o $ofile"
- ofile=
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- args="$args $1"
- ;;
- *)
- args="$args $1"
- ;;
- esac
- shift
+eat=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as `compile cc -o foo foo.c'.
+ # So we strip `-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
done
if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$prog" $args
+ # If no `-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # `.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
fi
# Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
# Create the lock directory.
# Note: use `[/.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
while true; do
- if mkdir $lockdir > /dev/null 2>&1; then
- break
- fi
- sleep 1
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
+trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
-"$prog" $args
-status=$?
+"$@"
+ret=$?
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ mv "${cofile}bj" "$ofile"
fi
-rmdir $lockdir
-exit $status
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
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/xmessage-X11R7.0-1.0.1/config.h.in new/xmessage-1.0.2/config.h.in
--- old/xmessage-X11R7.0-1.0.1/config.h.in 2005-12-21 08:30:33.000000000 +0100
+++ new/xmessage-1.0.2/config.h.in 2007-08-10 11:22:34.000000000 +0200
@@ -18,5 +18,14 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Version number of package */
#undef 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/xmessage-X11R7.0-1.0.1/configure.ac new/xmessage-1.0.2/configure.ac
--- old/xmessage-X11R7.0-1.0.1/configure.ac 2005-12-21 03:29:52.000000000 +0100
+++ new/xmessage-1.0.2/configure.ac 2007-08-10 11:22:34.000000000 +0200
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xmessage,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xmessage)
+AC_INIT(xmessage,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xmessage)
AM_INIT_AUTOMAKE([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/xmessage-X11R7.0-1.0.1/INSTALL new/xmessage-1.0.2/INSTALL
--- old/xmessage-X11R7.0-1.0.1/INSTALL 2005-07-06 00:51:11.000000000 +0200
+++ new/xmessage-1.0.2/INSTALL 2007-08-10 11:23:04.000000000 +0200
@@ -0,0 +1,236 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system. If you're
+ using `csh' on an old version of System V, you might need to type
+ `sh ./configure' instead to prevent `csh' from trying to execute
+ `configure' itself.
+
+ Running `configure' takes awhile. While running, it prints some
+ messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory. After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script). Here is a another example:
+
+ /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+ Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff -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/xmessage-X11R7.0-1.0.1/Makefile.am new/xmessage-1.0.2/Makefile.am
--- old/xmessage-X11R7.0-1.0.1/Makefile.am 2005-12-07 17:18:01.000000000 +0100
+++ new/xmessage-1.0.2/Makefile.am 2007-08-10 11:22:34.000000000 +0200
@@ -60,7 +60,8 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST += $(appman_PRE)
-CLEANFILES += $(appman_DATA)
+CLEANFILES += $(appman_DATA) ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
SED = sed
@@ -85,3 +86,10 @@
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
diff -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/xmessage-X11R7.0-1.0.1/missing new/xmessage-1.0.2/missing
--- old/xmessage-X11R7.0-1.0.1/missing 2005-12-21 08:30:34.000000000 +0100
+++ new/xmessage-1.0.2/missing 2007-08-10 11:23:04.000000000 +0200
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2005-06-08.21
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -15,8 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -38,18 +42,24 @@
configure_ac=configure.in
fi
+msg="missing on your system"
+
case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -74,11 +84,15 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to ."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,14 +101,44 @@
exit 1
;;
- aclocal*)
+esac
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
@@ -102,13 +146,8 @@
;;
autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
@@ -116,13 +155,8 @@
;;
autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -140,13 +174,8 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -156,14 +185,9 @@
;;
autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
@@ -185,7 +209,7 @@
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
@@ -215,7 +239,7 @@
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
@@ -237,13 +261,8 @@
;;
help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
@@ -262,32 +281,30 @@
;;
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
+ # The file to touch is that specified with -o ...
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -323,8 +340,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +351,10 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
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/xmessage-X11R7.0-1.0.1/xmessage.c new/xmessage-1.0.2/xmessage.c
--- old/xmessage-X11R7.0-1.0.1/xmessage.c 2004-04-23 21:54:58.000000000 +0200
+++ new/xmessage-1.0.2/xmessage.c 2007-04-24 21:55:34.000000000 +0200
@@ -30,6 +30,7 @@
*/
/* $XFree86: xc/programs/xmessage/xmessage.c,v 1.4 2000/02/17 16:53:03 dawes Exp $ */
+#include
#include
#include
#include
@@ -154,6 +155,60 @@
exit(default_exitstatus);
}
+/* Convert tabs to spaces in *messagep,*lengthp, copying to a new block of
+ memory. */
+void
+detab (char **messagep, int *lengthp)
+{
+ int i, n, col, psize;
+ char *p;
+
+ /* count how many tabs there are */
+ n = 0;
+ for (i = 0; i < *lengthp; i++)
+ if ((*messagep)[i] == '\t')
+ n++;
+
+ /* length increases by at most seven extra spaces for each tab */
+ psize = *lengthp + n*7 + 1;
+ p = XtMalloc (psize);
+
+ /* convert tabs to spaces, copying into p */
+ n = 0;
+ col = 0;
+ for (i = 0; i < *lengthp; i++)
+ {
+ switch ((*messagep)[i]) {
+ case '\n':
+ p[n++] = '\n';
+ col = 0;
+ break;
+ case '\t':
+ do
+ {
+ p[n++] = ' ';
+ col++;
+ }
+ while ((col % 8) != 0);
+ break;
+ default:
+ p[n++] = (*messagep)[i];
+ col++;
+ break;
+ }
+ }
+
+ assert (n < psize);
+
+ /* null-terminator needed by Label widget */
+ p[n] = '\0';
+
+ free (*messagep);
+
+ *messagep = p;
+ *lengthp = n;
+}
+
static XtActionsRec actions_list[] = {
{"exit", exit_action},
{"default-exit", default_exit_action},
@@ -304,6 +359,8 @@
XtAppAddActions(app_con, actions_list, XtNumber(actions_list));
XtOverrideTranslations(top, XtParseTranslationTable(top_trans));
+ detab (&message_str, &message_len);
+
/*
* create the query form; this is where most of the real work is done
*/
++++++ xsetroot-X11R7.0-1.0.1.tar.bz2 -> xsetroot-1.0.2.tar.bz2 ++++++
++++ 6659 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/xsetroot-X11R7.0-1.0.1/autogen.sh new/xsetroot-1.0.2/autogen.sh
--- old/xsetroot-X11R7.0-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/xsetroot-1.0.2/autogen.sh 2007-08-10 10:53:05.000000000 +0200
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-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/xsetroot-X11R7.0-1.0.1/ChangeLog new/xsetroot-1.0.2/ChangeLog
--- old/xsetroot-X11R7.0-1.0.1/ChangeLog 2005-12-21 03:29:54.000000000 +0100
+++ new/xsetroot-1.0.2/ChangeLog 2007-08-10 10:56:54.000000000 +0200
@@ -1,31 +1,198 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit ba9fbd14258ab44c794bb1a6dd9af51c5f4c01ff
+Author: Matthieu Herrb
+Date: Fri Aug 10 10:45:46 2007 +0200
- * configure.ac:
- Update package version for X11R7 release.
+ Bump version for release
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit d1658d389d7fbad0c2ec2ea5e8563c3d06ed2a47
+Author: Matthieu Herrb
+Date: Mon Jul 30 21:17:42 2007 +0200
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Add option to check code with lint/sparse/etc.
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 9282a4aa79b3cb4ae091a594de61dfc2ecfd9ea3
+Author: Matthieu Herrb
+Date: Mon Jul 30 21:11:20 2007 +0200
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Change xsetroot_CFLAGS to AM_CFLAGS to avoid automake-1.10 warning
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit fe4a33713aca2ce32053f2c8356423efd1f534e1
+Author: Matthieu Herrb
+Date: Mon Jul 30 21:08:00 2007 +0200
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ - Replace static ChangeLog with disthook to generate from git log
+ - generate INSTALL
-2005-11-20 Alan Coopersmith
+commit f479fd29a876d445291d7e55de9e9a22bac419b6
+Author: Matthieu Herrb
+Date: Mon Jul 30 21:07:05 2007 +0200
- * configure.ac:
- Change dependency from xmu to xmuu since the full xmu
- (with all its baggage like Xt) is not needed here.
+ - renamed .cvsignore -> .gitignore
+ - Replace static ChangeLog with disthook to generate from git log
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 382e52e07a110628efa0784b64088f6f64ae3112
+Author: Marc Balmer
+Date: Mon Jul 30 20:47:53 2007 +0200
- * configure.ac:
- Update package version number for RC1 release.
+ Typo, it's xsetroot, not setroot.
+commit e43e2cc868cff003d3e69c17a69bb7440393c359
+Author: Kevin E Martin
+Date: Wed Dec 21 02:29:54 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 3c3dc25e901fe4a93d308a4456d00783d6fff252
+Author: Adam Jackson
+Date: Mon Dec 19 16:22:47 2005 +0000
+
+ Stub COPYING files
+
+commit 4e633038f484b9955fe6aa80fdbbcc4d827fa4f3
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:11 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit aa60171a0cf04a787a29e1af3551976652d8ce84
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:26 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit a3844b7b2f68e295f69e9a8dbf45f311b717362b
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:28 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit a5056d61df9bc78b10ad200a7fc250842f034204
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:01:47 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit bfc05c358c4c8698292e40729ede000939cfe4a8
+Author: Eric Anholt
+Date: Mon Nov 21 10:35:08 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 9826f19633f549f2282702f19e33f7e51c4c5e9e
+Author: Alan Coopersmith
+Date: Mon Nov 21 03:14:16 2005 +0000
+
+ Change dependency from xmu to xmuu since the full xmu (with all its baggage
+ like Xt) is not needed here.
+
+commit d6817bf87bfcd2be3215ea9e28e6d13b1d438657
+Author: Eric Anholt
+Date: Sun Nov 20 22:08:55 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit 86145da43db031adc122f8bf9baacd45be5e7d84
+Author: Kevin E Martin
+Date: Wed Oct 19 02:47:57 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit cb52055c08c845309c126a2763bacaba5798ed65
+Author: Alan Coopersmith
+Date: Mon Oct 17 23:56:25 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit a10e876217a9354dd26935fd013cae57882369fa
+Author: Alan Coopersmith
+Date: Fri Oct 14 00:25:48 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 7b3f04619ecaec58e16a68037c435363ab27f447
+Author: Alan Coopersmith
+Date: Mon Aug 1 20:25:32 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit 63dc3c29b9f7af53efe466a7ed1476b4f4f17228
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:38 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit d5e74073175fbfb70a6f859d565262af09938642
+Author: Adam Jackson
+Date: Wed Jul 20 19:32:04 2005 +0000
+
+ Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
+ configure cache, you cache it, and the cached value is probably wrong.
+
+commit 0cc65bf4e9e0522422a9bd5824dc21dd05bf0368
+Author: Søren Sandmann Pedersen
+Date: Fri Jul 15 16:49:26 2005 +0000
+
+ Add dependency on xbitmaps
+
+commit 2f3ed0d66595b15a2893098d0c0b05a568fb01e7
+Author: Søren Sandmann Pedersen
+Date: Fri Jul 1 20:09:06 2005 +0000
+
+ xtrap.pc.in: s/Xfixes/XTrap/ xi.pc.in: s/Xt/Xi/ Xv/src/Makefile.am: remove
+ whitespace after backslash modularizeapp.sh: s/destkop/desktop/
+ modular/symlink.sh: Add bitmaps for xeyes, system.xsm for xsm, and
+ Xvidtune.cpp for xvidtune. Also comment out non-existing mga_bios.h
+ Check in buildsystems for xsetroot, xsm, xstdcmap, xtrap, and xvinfo
+
+commit da9e01ac6c7199ea2d7cac40af7587192c23aff2
+Author: Egbert Eich
+Date: Fri Apr 23 19:55:06 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 7cc5582a833e643be56bc5154e86eea988d537a9
+Author: Egbert Eich
+Date: Sun Mar 14 08:35:45 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit cb915ca7ff57ceabc129556e9771c2fd2c401a76
+Author: Egbert Eich
+Date: Wed Mar 3 12:13:18 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 10edd9087ebd46ca19500b987054d11f1c8e53fe
+Author: Egbert Eich
+Date: Thu Feb 26 13:36:26 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 0976043e2f31f6bad969c3f996961c59fc953d84
+Author: Egbert Eich
+Date: Thu Feb 26 09:24:17 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 133f2a1c164a945366816cb4a71419ebe5c575ea
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:49:23 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 500a078602d5db1e420a07c81dada5a676e0cc90
+Author: Kaleb Keithley
+Date: Fri Nov 14 15:54:55 2003 +0000
+
+ R6.6 is the Xorg base-line
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/xsetroot-X11R7.0-1.0.1/compile new/xsetroot-1.0.2/compile
--- old/xsetroot-X11R7.0-1.0.1/compile 2005-12-21 08:33:21.000000000 +0100
+++ new/xsetroot-1.0.2/compile 1970-01-01 01:00:00.000000000 +0100
@@ -1,99 +0,0 @@
-#! /bin/sh
-
-# Wrapper for compilers which do not understand `-c -o'.
-
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-# Written by Tom Tromey .
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Usage:
-# compile PROGRAM [ARGS]...
-# `-o FOO.o' is removed from the args passed to the actual compile.
-
-prog=$1
-shift
-
-ofile=
-cfile=
-args=
-while test $# -gt 0; do
- case "$1" in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we do something ugly here.
- ofile=$2
- shift
- case "$ofile" in
- *.o | *.obj)
- ;;
- *)
- args="$args -o $ofile"
- ofile=
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- args="$args $1"
- ;;
- *)
- args="$args $1"
- ;;
- esac
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$prog" $args
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir $lockdir > /dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
-
-# Run the compile.
-"$prog" $args
-status=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-fi
-
-rmdir $lockdir
-exit $status
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/xsetroot-X11R7.0-1.0.1/config.h.in new/xsetroot-1.0.2/config.h.in
--- old/xsetroot-X11R7.0-1.0.1/config.h.in 2005-12-21 08:33:20.000000000 +0100
+++ new/xsetroot-1.0.2/config.h.in 2007-08-10 10:56:33.000000000 +0200
@@ -18,5 +18,14 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Version number of package */
#undef 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/xsetroot-X11R7.0-1.0.1/configure.ac new/xsetroot-1.0.2/configure.ac
--- old/xsetroot-X11R7.0-1.0.1/configure.ac 2005-12-21 03:29:54.000000000 +0100
+++ new/xsetroot-1.0.2/configure.ac 2007-08-10 10:53:05.000000000 +0200
@@ -22,12 +22,16 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xsetroot,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xsetroot)
+AC_INIT(xsetroot,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xsetroot)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
+# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.1)
+
AC_PROG_CC
AC_PROG_INSTALL
@@ -36,6 +40,7 @@
AC_SUBST(XSETROOT_CFLAGS)
AC_SUBST(XSETROOT_LIBS)
+XORG_WITH_LINT
XORG_MANPAGE_SECTIONS
XORG_RELEASE_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/xsetroot-X11R7.0-1.0.1/INSTALL new/xsetroot-1.0.2/INSTALL
--- old/xsetroot-X11R7.0-1.0.1/INSTALL 2005-07-01 22:09:06.000000000 +0200
+++ new/xsetroot-1.0.2/INSTALL 2007-08-10 10:56:34.000000000 +0200
@@ -0,0 +1,236 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system. If you're
+ using `csh' on an old version of System V, you might need to type
+ `sh ./configure' instead to prevent `csh' from trying to execute
+ `configure' itself.
+
+ Running `configure' takes awhile. While running, it prints some
+ messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory. After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script). Here is a another example:
+
+ /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+ Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff -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/xsetroot-X11R7.0-1.0.1/Makefile.am new/xsetroot-1.0.2/Makefile.am
--- old/xsetroot-X11R7.0-1.0.1/Makefile.am 2005-12-06 23:48:26.000000000 +0100
+++ new/xsetroot-1.0.2/Makefile.am 2007-08-10 10:53:05.000000000 +0200
@@ -21,7 +21,7 @@
bin_PROGRAMS = xsetroot
-xsetroot_CFLAGS = $(XSETROOT_CFLAGS)
+AM_CFLAGS = $(XSETROOT_CFLAGS)
xsetroot_LDADD = $(XSETROOT_LIBS)
xsetroot_SOURCES = \
@@ -35,9 +35,18 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
CLEANFILES = $(appman_DATA)
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
+
SED = sed
# Strings to replace in man pages
@@ -61,3 +70,10 @@
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+lint:
+ $(LINT) $(ALL_LINT_FLAGS) $(xsetroot_SOURCES)
+endif LINT
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/xsetroot-X11R7.0-1.0.1/missing new/xsetroot-1.0.2/missing
--- old/xsetroot-X11R7.0-1.0.1/missing 2005-12-21 08:33:21.000000000 +0100
+++ new/xsetroot-1.0.2/missing 2007-08-10 10:56:34.000000000 +0200
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2005-06-08.21
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -15,8 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -38,18 +42,24 @@
configure_ac=configure.in
fi
+msg="missing on your system"
+
case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -74,11 +84,15 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to ."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,14 +101,44 @@
exit 1
;;
- aclocal*)
+esac
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
@@ -102,13 +146,8 @@
;;
autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
@@ -116,13 +155,8 @@
;;
autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -140,13 +174,8 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -156,14 +185,9 @@
;;
autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
@@ -185,7 +209,7 @@
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
@@ -215,7 +239,7 @@
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
@@ -237,13 +261,8 @@
;;
help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
@@ -262,32 +281,30 @@
;;
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
+ # The file to touch is that specified with -o ...
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -323,8 +340,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +351,10 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
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/xsetroot-X11R7.0-1.0.1/xsetroot.man new/xsetroot-1.0.2/xsetroot.man
--- old/xsetroot-X11R7.0-1.0.1/xsetroot.man 2004-04-23 21:55:06.000000000 +0200
+++ new/xsetroot-1.0.2/xsetroot.man 2007-08-10 10:53:05.000000000 +0200
@@ -38,7 +38,7 @@
[-solid \fIcolor\fP] [-name \fIstring\fP]
.SH DESCRIPTION
The
-.I setroot
+.I xsetroot
program
allows you to tailor the appearance of the background ("root")
window on a workstation display running X. Normally, you experiment with
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org