Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Thu Sep 9 16:07:26 CEST 2010.
--------
--- xorg-x11/xorg-x11.changes 2010-09-02 02:12:58.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2010-09-05 12:57:43.000000000 +0200
@@ -1,0 +2,75 @@
+Sun Sep 5 09:59:06 UTC 2010 - sndirsch@novell.com
+
+- xscope 1.2 (*new*)
+ xscope 1.2 is the grand unification release of xscope, finishing
+ the three way merge of the MIT-licensed version from the original
+ author, James Peterson of MCC, the extensions from Keith Packard,
+ and the fork Sun Microsystems maintained in Solaris releases.
+ Features from James Peterson's version:
+ * Core X11 protocol decoding
+ * TCP/IPv4 socket support
+ Features from Keith Packard's version:
+ * Interactive debugging mode with breakpoints & single stepping for
+ core protocol
+ * X11 extension protocol decoding for:
+ BIGREQUESTS NCD-WinCenterPro
+ LBX RANDR 1.0
+ MIT-SHM RENDER 0.4
+ * Decoding of bigrequest-encoded requests
+ * NAS audio protocol decoding
+ * Unix domain socket support
+ * -S option to toggle output on SIGUSR1
+ * -t option to terminate when all clients close
+ * xstats program to generate statistics from xscope logs
+ (not built by default)
+ Features from Solaris version:
+ * SVR4 platform support
+ * Use of xtrans to get all normally supported transports, including IPv6
+ * IPv6 address decoding in hosts requests
+ * -r option to dump raw packet data
+ New features in this release:
+ * Support for setting breakpoints on X11 extension requests
+ * Decoding of GenericEvents & ServerInterpreted host addresses
+ * Update RENDER extension decoding to protocol version 0.11
+ Removed features:
+ * X11 extension protocol decoding for PEX extension
+ * DECnet support
+- appres 1.0.2
+- bitmap 1.0.4
+- editres 1.0.4
+- listres 1.0.2
+- mkcomposecache 1.2.1
+- sessreg 1.0.6
+- viewres 1.0.2
+- xbiff 1.0.2
+- xcalc 1.0.3
+- xclipboard 1.1.0
+- xclock 1.0.4
+- xcompmgr 1.1.5
+- xditview 1.0.2
+- xdm 1.1.10
+- xeyes 1.1.0
+- xgc 1.0.2
+- xinit 1.2.1
+- xinput 1.5.2
+- xkbprint 1.0.2
+- xlogo 1.0.2
+- xlsatoms 1.1.0
+- xlsclients 1.1.0
+- xlsfonts 1.0.3
+- xman 1.1.0
+- xmessage 1.0.3
+- xmore 1.0.2
+- xrandr 1.3.3
+- xscope 1.2
+- xset 1.2.0
+- xvidtune 1.0.2
+- adjusted patches
+ * xinit.diff
+- obsolete patches
+ * xset-spurious-xprint.patch
+ * xvidtune.diff
+ * xdm-add-support-for-clients-that-sent-ipv4-addresses.diff
+ * xdm-greeter_fix_logging_of_failed_login_attempts.patch
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
appres-1.0.1.tar.bz2
bitmap-1.0.3.tar.bz2
editres-1.0.3.tar.bz2
listres-X11R7.0-1.0.1.tar.bz2
mkcomposecache-1.2.tar.bz2
sessreg-1.0.5.tar.bz2
viewres-X11R7.0-1.0.1.tar.bz2
xbiff-X11R7.0-1.0.1.tar.bz2
xcalc-1.0.2.tar.bz2
xclipboard-X11R7.0-1.0.1.tar.bz2
xclock-1.0.3.tar.bz2
xcompmgr-1.1.4.tar.bz2
xditview-X11R7.0-1.0.1.tar.bz2
xdm-1.1.9.tar.bz2
xdm-add-support-for-clients-that-sent-ipv4-addresses.diff
xdm-greeter_fix_logging_of_failed_login_attempts.patch
xeyes-X11R7.0-1.0.1.tar.bz2
xgc-X11R7.0-1.0.1.tar.bz2
xinit-1.1.1.tar.bz2
xinput-1.5.0.tar.bz2
xkbprint-X11R7.0-1.0.1.tar.bz2
xlogo-X11R7.0-1.0.1.tar.bz2
xlsatoms-1.0.2.tar.bz2
xlsclients-1.0.2.tar.bz2
xlsfonts-1.0.2.tar.bz2
xman-1.0.3.tar.bz2
xmessage-1.0.2.tar.bz2
xmore-X11R7.0-1.0.1.tar.bz2
xrandr-1.3.2.tar.bz2
xset-1.1.0.tar.bz2
xset-spurious-xprint.patch
xvidtune.diff
xvidtune-X11R7.0-1.0.1.tar.bz2
New:
----
appres-1.0.2.tar.bz2
bitmap-1.0.4.tar.bz2
editres-1.0.4.tar.bz2
listres-1.0.2.tar.bz2
mkcomposecache-1.2.1.tar.bz2
sessreg-1.0.6.tar.bz2
viewres-1.0.2.tar.bz2
xbiff-1.0.2.tar.bz2
xcalc-1.0.3.tar.bz2
xclipboard-1.1.0.tar.bz2
xclock-1.0.4.tar.bz2
xcompmgr-1.1.5.tar.bz2
xditview-1.0.2.tar.bz2
xdm-1.1.10.tar.bz2
xeyes-1.1.0.tar.bz2
xgc-1.0.2.tar.bz2
xinit-1.2.1.tar.bz2
xinput-1.5.2.tar.bz2
xkbprint-1.0.2.tar.bz2
xlogo-1.0.2.tar.bz2
xlsatoms-1.1.0.tar.bz2
xlsclients-1.1.0.tar.bz2
xlsfonts-1.0.3.tar.bz2
xman-1.1.0.tar.bz2
xmessage-1.0.3.tar.bz2
xmore-1.0.2.tar.bz2
xrandr-1.3.3.tar.bz2
xscope-1.2.tar.bz2
xset-1.2.0.tar.bz2
xvidtune-1.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.tqanYC/_old 2010-09-09 16:06:44.000000000 +0200
+++ /var/tmp/diff_new_pack.tqanYC/_new 2010-09-09 16:06:44.000000000 +0200
@@ -22,7 +22,7 @@
BuildRequires: ConsoleKit-devel fontconfig-devel freetype2-devel libXi6-devel libpng-devel ncurses-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 17
+Release: 18
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -32,18 +32,18 @@
Provides: XFree86 xcompmgr xrestop
Obsoletes: xcompmgr xrestop
Summary: X.Org core and sample applications
-Source0: appres-1.0.1.tar.bz2
+Source0: appres-1.0.2.tar.bz2
Source1: bdftopcf-1.0.2.tar.bz2
Source2: beforelight-1.0.3.tar.bz2
-Source3: bitmap-1.0.3.tar.bz2
-Source4: editres-1.0.3.tar.bz2
+Source3: bitmap-1.0.4.tar.bz2
+Source4: editres-1.0.4.tar.bz2
Source5: fonttosfnt-1.0.4.tar.bz2
Source6: fslsfonts-1.0.2.tar.bz2
Source7: fstobdf-1.0.3.tar.bz2
Source8: iceauth-1.0.3.tar.bz2
Source9: ico-1.0.2.tar.bz2
Source10: lbxproxy-1.0.2.tar.bz2
-Source11: listres-X11R7.0-1.0.1.tar.bz2
+Source11: listres-1.0.2.tar.bz2
Source12: luit-1.0.5.tar.bz2
Source14: mkfontdir-1.0.5.tar.bz2
Source15: mkfontscale-1.0.7.tar.bz2
@@ -52,29 +52,29 @@
Source18: rgb-1.0.3.tar.bz2
Source19: rstart-1.0.3.tar.bz2
Source20: scripts-X11R7.0-1.0.1.tar.bz2
-Source21: sessreg-1.0.5.tar.bz2
+Source21: sessreg-1.0.6.tar.bz2
Source22: setxkbmap-1.1.0.tar.bz2
Source23: showfont-1.0.2.tar.bz2
Source24: smproxy-1.0.3.tar.bz2
Source25: twm-1.0.4.tar.bz2
-Source26: viewres-X11R7.0-1.0.1.tar.bz2
+Source26: viewres-1.0.2.tar.bz2
Source27: x11perf-1.5.1.tar.bz2
Source28: xauth-1.0.4.tar.bz2
-Source29: xbiff-X11R7.0-1.0.1.tar.bz2
-Source30: xcalc-1.0.2.tar.bz2
-Source31: xclipboard-X11R7.0-1.0.1.tar.bz2
-Source32: xclock-1.0.3.tar.bz2
+Source29: xbiff-1.0.2.tar.bz2
+Source30: xcalc-1.0.3.tar.bz2
+Source31: xclipboard-1.1.0.tar.bz2
+Source32: xclock-1.0.4.tar.bz2
Source33: xcmsdb-1.0.2.tar.bz2
Source34: xconsole-1.0.3.tar.bz2
Source35: xcursor-themes-1.0.2.tar.bz2
Source36: xcursorgen-1.0.3.tar.bz2
Source37: xdbedizzy-1.0.2.tar.bz2
-Source38: xditview-X11R7.0-1.0.1.tar.bz2
-Source39: xdm-1.1.9.tar.bz2
+Source38: xditview-1.0.2.tar.bz2
+Source39: xdm-1.1.10.tar.bz2
Source40: xdpyinfo-1.1.0.tar.bz2
Source42: xedit-1.1.2.tar.bz2
Source43: xev-1.0.4.tar.bz2
-Source44: xeyes-X11R7.0-1.0.1.tar.bz2
+Source44: xeyes-1.1.0.tar.bz2
Source45: xf86dga-1.0.2.tar.bz2
Source46: xfd-X11R7.0-1.0.1.tar.bz2
Source47: xfindproxy-X11R7.0-1.0.1.tar.bz2
@@ -83,51 +83,52 @@
Source50: xfsinfo-1.0.2.tar.bz2
Source51: xfwp-X11R7.0-1.0.1.tar.bz2
Source52: xgamma-1.0.3.tar.bz2
-Source53: xgc-X11R7.0-1.0.1.tar.bz2
+Source53: xgc-1.0.2.tar.bz2
Source54: xhost-1.0.3.tar.bz2
-Source55: xinit-1.1.1.tar.bz2
+Source55: xinit-1.2.1.tar.bz2
Source56: xkbcomp-1.1.1.tar.bz2
Source57: xkbevd-1.1.0.tar.bz2
-Source58: xkbprint-X11R7.0-1.0.1.tar.bz2
+Source58: xkbprint-1.0.2.tar.bz2
Source59: xkbutils-1.0.2.tar.bz2
Source60: xkill-1.0.2.tar.bz2
Source61: xload-1.0.2.tar.bz2
-Source62: xlogo-X11R7.0-1.0.1.tar.bz2
-Source63: xlsatoms-1.0.2.tar.bz2
-Source64: xlsclients-1.0.2.tar.bz2
-Source65: xlsfonts-1.0.2.tar.bz2
+Source62: xlogo-1.0.2.tar.bz2
+Source63: xlsatoms-1.1.0.tar.bz2
+Source64: xlsclients-1.1.0.tar.bz2
+Source65: xlsfonts-1.0.3.tar.bz2
Source66: xmag-1.0.3.tar.bz2
-Source67: xman-1.0.3.tar.bz2
-Source68: xmessage-1.0.2.tar.bz2
+Source67: xman-1.1.0.tar.bz2
+Source68: xmessage-1.0.3.tar.bz2
Source69: xmh-X11R7.0-1.0.1.tar.bz2
Source70: xmodmap-1.0.4.tar.bz2
-Source71: xmore-X11R7.0-1.0.1.tar.bz2
+Source71: xmore-1.0.2.tar.bz2
Source73: xplsprinters-X11R7.0-1.0.1.tar.bz2
Source74: xpr-1.0.3.tar.bz2
Source75: xprehashprinterlist-X11R7.0-1.0.1.tar.bz2
Source76: xprop-1.1.0.tar.bz2
-Source77: xrandr-1.3.2.tar.bz2
+Source77: xrandr-1.3.3.tar.bz2
Source78: xrdb-1.0.6.tar.bz2
Source79: xrefresh-1.0.3.tar.bz2
Source80: xrx-1.0.3.tar.bz2
-Source81: xset-1.1.0.tar.bz2
+Source81: xset-1.2.0.tar.bz2
Source82: xsetmode-X11R7.0-1.0.0.tar.bz2
Source83: xsetpointer-1.0.1.tar.bz2
Source84: xsetroot-1.0.3.tar.bz2
Source85: xsm-1.0.1-20100211-4f56a25.tar.bz2
Source86: xstdcmap-X11R7.0-1.0.1.tar.bz2
Source87: xtrap-X11R7.1-1.0.2.tar.bz2
-Source88: xvidtune-X11R7.0-1.0.1.tar.bz2
+Source88: xvidtune-1.0.2.tar.bz2
Source89: xvinfo-1.1.0.tar.bz2
Source90: xwd-1.0.3.tar.bz2
Source91: xwininfo-1.0.5.tar.bz2
Source92: xwud-1.0.2.tar.bz2
-Source93: mkcomposecache-1.2.tar.bz2
+Source93: mkcomposecache-1.2.1.tar.bz2
Source94: rendercheck-1.3.tar.bz2
Source96: xbacklight-1.1.1.tar.bz2
-Source97: xinput-1.5.0.tar.bz2
-Source98: xcompmgr-1.1.4.tar.bz2
+Source97: xinput-1.5.2.tar.bz2
+Source98: xcompmgr-1.1.5.tar.bz2
Source99: xrestop-0.4.tar.bz2
+Source100: xscope-1.2.tar.bz2
Source200: misc.tar.bz2
Source201: twm.tar.bz2
Source202: xdm.tar.bz2
@@ -143,26 +144,22 @@
Patch10: xrx.diff
Patch19: scripts.diff
Patch20: xdm.diff
-Patch21: xvidtune.diff
Patch24: xauth-1.0.2.diff
Patch46: xfd.diff
Patch47: xfs-no_config_file.diff
Patch48: mkfontscale-skip_symlinks.diff
Patch53: xconsole-no-stropts.patch
Patch54: xinit-client-session.patch
-Patch55: xset-spurious-xprint.patch
Patch56: xdm-consolekit.diff
Patch59: xcursorgen-libpng.diff
Patch61: twm-sig11.diff
Patch62: twm-suse.diff
Patch63: xauth-tolerant-hostname-changes.diff
-Patch64: xdm-add-support-for-clients-that-sent-ipv4-addresses.diff
Patch65: xdm-tolerant-hostname-changes.diff
Patch66: xinit-suse.diff
Patch67: xinit-tolerant-hostname-changes.diff
Patch68: xrdb.diff
Patch69: xrdb-traditional-cpp.diff
-Patch70: xdm-greeter_fix_logging_of_failed_login_attempts.patch
%description
This package contains the X.Org core and sample applications.
@@ -273,11 +270,7 @@
pushd xinit-*
%patch54 -p1
popd
-pushd xset-*
-%patch55 -p1
-popd
patch -d scripts-* -p0 -s < %PATCH19
-patch -d xvidtune-* -p0 -s < %PATCH21
patch -d xfs-* -p0 -s < %PATCH47
patch -d mkfontscale-* -p1 -s < %PATCH48
patch -d xdm-* -p1 -s < %PATCH56
@@ -285,13 +278,11 @@
patch -d twm-* -p1 -s < %PATCH61
patch -d twm-* -p1 -s < %PATCH62
patch -d xauth-* -p1 -s < %PATCH63
-patch -d xdm-* -p1 -s < %PATCH64
patch -d xdm-* -p1 -s < %PATCH65
patch -d xinit-* -p1 -s < %PATCH66
patch -d xinit-* -p1 -s < %PATCH67
patch -d xrdb-* -p2 -s < %PATCH68
patch -d xrdb-* -p0 -s < %PATCH69
-patch -d xdm-* -p1 -s < %PATCH70
%build
++++++ appres-1.0.1.tar.bz2 -> appres-1.0.2.tar.bz2 ++++++
++++ 10327 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/appres-1.0.1/appres.c new/appres-1.0.2/appres.c
--- old/appres-1.0.1/appres.c 2006-07-11 04:50:24.000000000 +0200
+++ new/appres-1.0.2/appres.c 2009-01-22 16:08:45.000000000 +0100
@@ -35,9 +35,9 @@
#define NONAME "-AppResTest-"
-char *ProgramName;
+static char *ProgramName;
-XrmQuark XrmQString;
+static XrmQuark XrmQString;
static void
usage (void)
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/appres-1.0.1/ChangeLog new/appres-1.0.2/ChangeLog
--- old/appres-1.0.1/ChangeLog 2007-01-23 03:07:09.000000000 +0100
+++ new/appres-1.0.2/ChangeLog 2009-09-22 03:11:29.000000000 +0200
@@ -1,3 +1,44 @@
+commit a42a18d12a23c763acabea045b22a9efbac3e569
+Author: Alan Coopersmith
+Date: Mon Sep 21 18:10:39 2009 -0700
+
+ appres 1.0.2
+
+ Signed-off-by: Alan Coopersmith
+
+commit 25b170accac2cdd405a9c98be6ffe2122da18083
+Author: Alan Coopersmith
+Date: Mon Sep 21 18:07:57 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit fea57c0200b1dce5b5ea45682f11760911e7a4f1
+Author: Alan Coopersmith
+Date: Mon Sep 21 17:35:44 2009 -0700
+
+ Add pointers to mailing list, bugzilla, wiki & git repo to README
+
+ Signed-off-by: Alan Coopersmith
+
+commit a296f50efe75ae03f5cd0fd2b96645c3d856537a
+Author: Paulo Cesar Pereira de Andrade
+Date: Thu Jan 15 18:15:44 2009 -0200
+
+ Ansification and compile warning fixes.
+
+ This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
+ make distcheck and all gcc 4.3 and sparse warnings.
+
+commit b52a34ccc971f20b09f60b9b8a117652588e7096
+Author: Alan Coopersmith
+Date: Fri Aug 10 15:42:09 2007 -0700
+
+ Change appres_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+
+ Makefile.am:27: compiling `appres.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
+
commit 85be6045ff92bb02d6516f1348fe01c9fa596826
Author: Alan Coopersmith
Date: Mon Jan 22 18:05:40 2007 -0800
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/appres-1.0.1/compile new/appres-1.0.2/compile
--- old/appres-1.0.1/compile 2007-01-12 06:08:02.000000000 +0100
+++ new/appres-1.0.2/compile 1970-01-01 01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-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
-# 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., 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.
-
-# 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=
-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 "$@"
-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.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-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/appres-1.0.1/config.h.in new/appres-1.0.2/config.h.in
--- old/appres-1.0.1/config.h.in 2007-01-23 03:07:09.000000000 +0100
+++ new/appres-1.0.2/config.h.in 2009-09-22 03:11:10.000000000 +0200
@@ -1,5 +1,32 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 if you have the header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_UNISTD_H
+
/* Name of package */
#undef PACKAGE
@@ -27,5 +54,8 @@
/* Patch version of this package */
#undef PACKAGE_VERSION_PATCHLEVEL
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* 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/appres-1.0.1/configure.ac new/appres-1.0.2/configure.ac
--- old/appres-1.0.1/configure.ac 2007-01-23 03:04:50.000000000 +0100
+++ new/appres-1.0.2/configure.ac 2009-09-22 03:10:28.000000000 +0200
@@ -22,21 +22,24 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(appres,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],appres)
+AC_INIT(appres,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],appres)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+
AC_PROG_CC
AC_PROG_INSTALL
+XORG_DEFAULT_OPTIONS
+
# Checks for pkg-config packages
PKG_CHECK_MODULES(APPRES, x11 xt)
AC_SUBST(APPRES_CFLAGS)
AC_SUBST(APPRES_LIBS)
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
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/appres-1.0.1/Makefile.am new/appres-1.0.2/Makefile.am
--- old/appres-1.0.1/Makefile.am 2007-01-02 22:51:52.000000000 +0100
+++ new/appres-1.0.2/Makefile.am 2009-09-22 03:06:50.000000000 +0200
@@ -21,7 +21,7 @@
bin_PROGRAMS = appres
-appres_CFLAGS = $(APPRES_CFLAGS)
+AM_CFLAGS = $(APPRES_CFLAGS) $(CWARNFLAGS)
appres_LDADD = $(APPRES_LIBS)
appres_SOURCES = \
@@ -42,7 +42,7 @@
.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)
+ $(CHANGELOG_CMD)
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/appres-1.0.1/missing new/appres-1.0.2/missing
--- old/appres-1.0.1/missing 2007-01-12 06:08:02.000000000 +0100
+++ new/appres-1.0.2/missing 2009-09-22 03:11:12.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,6 +31,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +44,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +77,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -86,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -103,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# 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)
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -135,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -145,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -154,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -164,7 +175,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -184,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -192,8 +203,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -207,80 +218,78 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
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."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
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."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
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."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -289,11 +298,17 @@
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'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ 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
@@ -303,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -317,13 +332,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -356,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# 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/appres-1.0.1/README new/appres-1.0.2/README
--- old/appres-1.0.1/README 2006-07-11 04:50:24.000000000 +0200
+++ new/appres-1.0.2/README 2009-09-22 02:35:03.000000000 +0200
@@ -2,3 +2,27 @@
subhierarchy of an application) with the specified class and instance
names. It can be used to determine which resources a particular
program will load.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/app/appres
+
+ http://cgit.freedesktop.org/xorg/app/appres
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
++++++ bitmap-1.0.3.tar.bz2 -> bitmap-1.0.4.tar.bz2 ++++++
++++ 13374 lines of diff (skipped)
++++++ editres-1.0.3.tar.bz2 -> editres-1.0.4.tar.bz2 ++++++
++++ 13491 lines of diff (skipped)
++++++ listres-X11R7.0-1.0.1.tar.bz2 -> listres-1.0.2.tar.bz2 ++++++
++++ 17615 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/listres-X11R7.0-1.0.1/ChangeLog new/listres-1.0.2/ChangeLog
--- old/listres-X11R7.0-1.0.1/ChangeLog 2005-12-21 03:29:43.000000000 +0100
+++ new/listres-1.0.2/ChangeLog 2009-12-16 00:08:30.000000000 +0100
@@ -1,25 +1,277 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit ddf8dcba06c2fe3044db1f600de7d5c6e325c4a4
+Author: Alan Coopersmith
+Date: Tue Dec 15 15:05:08 2009 -0800
- * configure.ac:
- Update package version for X11R7 release.
+ listres 1.0.2
+
+ Signed-off-by: Alan Coopersmith
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit b6e0bf5c235199c7682da6b2271f926e6af57e9b
+Author: Alan Coopersmith
+Date: Tue Dec 15 15:04:41 2009 -0800
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Fill in COPYING file with notices from listres.c & listres.man
+
+ Signed-off-by: Alan Coopersmith
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 5720370421014c0b465385e65b94659f044dcec6
+Author: Alan Coopersmith
+Date: Tue Dec 15 15:02:27 2009 -0800
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Apply automake silent rules to manpage generation too
+
+ Signed-off-by: Alan Coopersmith
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 67bf7e0061fc1c778b9fee0f2bb4ce23059c476f
+Author: Alan Coopersmith
+Date: Tue Dec 15 15:01:01 2009 -0800
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Combine pkg-config checks now that we can hardcode xaw7
+
+ Signed-off-by: Alan Coopersmith
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 3112acb4901bf29d2a03913e8d10cba5e621a5e4
+Author: Gaetan Nadon
+Date: Thu Nov 26 09:19:52 2009 -0500
- * configure.ac:
- Update package version number for RC1 release.
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+commit a43957081b6898ef03f99638fdb25e1bb9201a65
+Author: Gaetan Nadon
+Date: Wed Oct 28 14:09:07 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 5244302d83dbbcd243417e309226812a3cf576ec
+Author: Gaetan Nadon
+Date: Tue Oct 27 15:07:24 2009 -0400
+
+ Deploy the new XORG_DEFAULT_OPTIONS #24242
+
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file from
+ future changes.
+
+commit 8fba37e0bc9b15114bbdd920e0efdbb7cf54a9aa
+Author: Gaetan Nadon
+Date: Mon Oct 26 22:08:38 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 f4dda473382b40bfb095a6ccce7d0b97a302ed14
+Author: Gaetan Nadon
+Date: Thu Oct 22 12:34:14 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 cf1bd3ca78ec602e3e776cf575350d2d8430e5d0
+Author: Alan Coopersmith
+Date: Thu Oct 1 14:54:17 2009 -0700
+
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith
+
+commit aa10bf36fa16cb9e832971daecb92a6de3d346d5
+Author: Paulo Cesar Pereira de Andrade
+Date: Mon Jan 12 18:35:55 2009 -0200
+
+ Ansification and compile warning fixes.
+
+ This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
+ make distcheck and all gcc 4.3 and sparse warnings.
+
+commit c1adeeb234f9d47d1639f5223371ac99ac22d565
+Author: James Cloos
+Date: Wed Aug 20 10:32:48 2008 -0400
+
+ xaw8 is gone, use xaw7
+
+commit 29479333c05afc85f85d988f61d8c4b6aef7446d
+Author: James Cloos
+Date: Thu Dec 6 16:37:02 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 90e21df9bfd68b2deb89591aff4d89e7695bafa8
+Author: Alan Coopersmith
+Date: Fri Aug 10 16:45:41 2007 -0700
+
+ Change listres_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+
+commit de65ef12f1749c9d5619dfe8f7605f4df3ac7d48
+Author: Alan Coopersmith
+Date: Fri Aug 10 16:44:49 2007 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 41a2a3f605856d53eb06fb9227538bd6a77f676d
+Author: Kevin E Martin
+Date: Wed Dec 21 02:29:43 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit d29babdb11e5111f4ecf5f5d28a041f94adf54c6
+Author: Adam Jackson
+Date: Mon Dec 19 16:22:40 2005 +0000
+
+ Stub COPYING files
+
+commit 6f713a7747ad00ed3517da35631369562751a18d
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:02 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit a562cac61783c618b6e5b4ad6a0b25f279235b0d
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:17 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 9b83de948d48c6d8528200eebcd62c8774672ef4
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:16 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit c6b6664509b2278635d6e5c4033624ce9868dc58
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:01:37 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 4e708575bf9fc40c3c163a411f8b094b81deb5b9
+Author: Eric Anholt
+Date: Mon Nov 21 10:34:55 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit e7f615b1f0728310873b8f7c33ed3fb376c4d259
+Author: Eric Anholt
+Date: Sun Nov 20 22:08:48 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit fa6d4784e89cc654a2edd61dd80dffae86a02685
+Author: Kevin E Martin
+Date: Wed Oct 19 02:47:48 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit a3266bc7eb3610ad328cbdba04b9fa7c3b53b329
+Author: Alan Coopersmith
+Date: Mon Oct 17 23:56:19 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 9fd4f2493a7ffe373f80162dd4ed5568e37d749e
+Author: Alan Coopersmith
+Date: Fri Oct 14 00:25:41 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit fcc214eb4c7af71599db50276f2a5573946a2943
+Author: Alan Coopersmith
+Date: Mon Aug 1 20:25:28 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit 4a76a45b8fcf5d24248af3c301e0d10b3bcd9aaa
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:29 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 7334df8b1d2aaa3d86ef0edb67138026e154f6b7
+Author: Adam Jackson
+Date: Wed Jul 20 19:31:49 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 8b25b98b1cbe95610a862d75cdecd59cd40bca30
+Author: Søren Sandmann Pedersen
+Date: Thu Jul 14 22:40:14 2005 +0000
+
+ Add _BSD_SOURCE to lots of applications - patch from Stefan Dirsch
+
+commit 0b8defdf67bc0354d90c525bd4d81dff7f397925
+Author: Søren Sandmann Pedersen
+Date: Tue Jun 28 15:09:55 2005 +0000
+
+ Check in build system for listres
+
+commit 9b634330ae19c158d05ebf6f703abe2bebcc1ad6
+Author: Egbert Eich
+Date: Fri Apr 23 19:54:35 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit b2fb640ba34463374bc24f70f8a4aedf6fef1f99
+Author: Egbert Eich
+Date: Sun Mar 14 08:34:53 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit aaf179bdca55ed4191489fb1f040816963fe0a4b
+Author: Egbert Eich
+Date: Wed Mar 3 12:12:53 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 59d9ef519922013e377335916bb6ca5c2fc39d2d
+Author: Egbert Eich
+Date: Thu Feb 26 13:36:15 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit d4a23671859562115b82333812837142a56b72c2
+Author: Egbert Eich
+Date: Thu Feb 26 09:23:54 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 4be27e287b562d724ac1093da25399308a8db083
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:29:02 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit e7e4e9e91e2a65d9b0fadd743d556a8173b62cad
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:57 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 874408d7537bb75aae3716ad7ebafdf155e1ab0f
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:57 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/listres-X11R7.0-1.0.1/compile new/listres-1.0.2/compile
--- old/listres-X11R7.0-1.0.1/compile 2005-12-21 08:21:32.000000000 +0100
+++ new/listres-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/listres-X11R7.0-1.0.1/config.h.in new/listres-1.0.2/config.h.in
--- old/listres-X11R7.0-1.0.1/config.h.in 2005-12-21 08:21:31.000000000 +0100
+++ new/listres-1.0.2/config.h.in 2009-12-16 00:08:24.000000000 +0100
@@ -1,5 +1,32 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 if you have the header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_UNISTD_H
+
/* Name of package */
#undef PACKAGE
@@ -15,8 +42,23 @@
/* 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
+/* 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
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* 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/listres-X11R7.0-1.0.1/configure.ac new/listres-1.0.2/configure.ac
--- old/listres-X11R7.0-1.0.1/configure.ac 2005-12-21 03:29:43.000000000 +0100
+++ new/listres-1.0.2/configure.ac 2009-12-16 00:04:55.000000000 +0100
@@ -22,25 +22,25 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(listres,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],listres)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_INIT(listres, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],listres)
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_PROG_INSTALL
-XAW_CHECK_XPRINT_SUPPORT(XAW)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(LISTRES, x11 xt xmu)
-LISTRES_CFLAGS="$DEP_CFLAGS $XAW_CFLAGS"
-LISTRES_LIBS="$DEP_LIBS $XAW_LIBS"
+PKG_CHECK_MODULES(LISTRES, xaw7 x11 xt xmu)
AC_SUBST(LISTRES_CFLAGS)
AC_SUBST(LISTRES_LIBS)
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
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/listres-X11R7.0-1.0.1/COPYING new/listres-1.0.2/COPYING
--- old/listres-X11R7.0-1.0.1/COPYING 2005-12-19 17:22:40.000000000 +0100
+++ new/listres-1.0.2/COPYING 2009-12-16 00:03:29.000000000 +0100
@@ -1,12 +1,22 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 1989, 1994 X Consortium
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Except as contained in this notice, the name of the X Consortium 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 X Consortium.
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/listres-X11R7.0-1.0.1/INSTALL new/listres-1.0.2/INSTALL
--- old/listres-X11R7.0-1.0.1/INSTALL 2005-06-28 17:09:55.000000000 +0200
+++ new/listres-1.0.2/INSTALL 2009-12-16 00:08:30.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/listres-X11R7.0-1.0.1/listres.c new/listres-1.0.2/listres.c
--- old/listres-X11R7.0-1.0.1/listres.c 2004-04-23 21:54:35.000000000 +0200
+++ new/listres-1.0.2/listres.c 2009-10-16 23:38:20.000000000 +0200
@@ -61,7 +61,7 @@
char *format;
} OptionsRec;
-OptionsRec options;
+static OptionsRec options;
#define Offset(field) XtOffsetOf(OptionsRec, field)
@@ -80,10 +80,10 @@
#undef Offset
-const char *ProgramName;
+static const char *ProgramName;
-void
-usage ()
+static void
+usage (void)
{
fprintf(stderr, "usage: %s [-options...]\n", ProgramName);
fprintf(stderr, "\nwhere options include:\n");
@@ -103,9 +103,7 @@
exit (1);
}
-static void print_tree_level (wn, level)
- register XmuWidgetNode *wn;
- register int level;
+static void print_tree_level (register XmuWidgetNode *wn, register int level)
{
register int i;
@@ -119,7 +117,7 @@
print_tree_level (wn->siblings, level);
}
-static void tree_known_widgets ()
+static void tree_known_widgets (void)
{
register int i;
register XmuWidgetNode *wn;
@@ -136,10 +134,8 @@
* print_classname - print out the superclass-to-subclass hierchy of names
* in the form super\sub\sub....
*/
-static int print_classname (node, topnode, level, showvar)
- XmuWidgetNode *node, *topnode;
- int level;
- Bool showvar;
+static int print_classname (XmuWidgetNode *node, XmuWidgetNode *topnode,
+ int level, Bool showvar)
{
int retval;
@@ -156,7 +152,7 @@
return retval;
}
-static void list_known_widgets ()
+static void list_known_widgets (void)
{
int i;
XmuWidgetNode *wn;
@@ -176,12 +172,9 @@
}
/* ARGSUSED */
-static void print_resources (node, format, topnode, showsuper, showvar)
- XmuWidgetNode *node;
- const char *format;
- XmuWidgetNode *topnode;
- Bool showsuper;
- Bool showvar;
+static void print_resources (XmuWidgetNode *node, const char *format,
+ XmuWidgetNode *topnode, Bool showsuper,
+ Bool showvar)
{
int i;
XtResourceList res = node->resources;
@@ -214,13 +207,9 @@
* which they come
*/
static void
-list_resources (node, format, topnode, toplevel, showsuper, showvar)
- XmuWidgetNode *node;
- const char *format;
- XmuWidgetNode *topnode;
- Widget toplevel;
- Bool showsuper;
- Bool showvar;
+list_resources (XmuWidgetNode *node, const char *format,
+ XmuWidgetNode *topnode, Widget toplevel,
+ Bool showsuper, Bool showvar)
{
static Bool first = True;
@@ -243,9 +232,7 @@
int
-main (argc, argv)
- int argc;
- char **argv;
+main (int argc, char **argv)
{
int i;
XtAppContext appcon;
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/listres-X11R7.0-1.0.1/Makefile.am new/listres-1.0.2/Makefile.am
--- old/listres-X11R7.0-1.0.1/Makefile.am 2005-12-06 23:48:17.000000000 +0100
+++ new/listres-1.0.2/Makefile.am 2009-12-16 00:01:55.000000000 +0100
@@ -21,7 +21,7 @@
bin_PROGRAMS = listres
-listres_CFLAGS = $(LISTRES_CFLAGS) -D_BSD_SOURCE
+AM_CFLAGS = $(CWARNFLAGS) $(LISTRES_CFLAGS) -D_BSD_SOURCE
listres_LDADD = $(LISTRES_LIBS)
listres_SOURCES = \
@@ -36,6 +36,7 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
SED = sed
@@ -60,4 +61,15 @@
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+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/listres-X11R7.0-1.0.1/missing new/listres-1.0.2/missing
--- old/listres-X11R7.0-1.0.1/missing 2005-12-21 08:21:32.000000000 +0100
+++ new/listres-1.0.2/missing 2009-12-16 00:08:25.000000000 +0100
@@ -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=2009-04-28.21; # UTC
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -14,9 +18,7 @@
# 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.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -29,6 +31,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -38,18 +42,24 @@
configure_ac=configure.in
fi
-case "$1" in
+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 "\
@@ -67,6 +77,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -74,11 +85,18 @@
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]
+
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
+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,42 +105,69 @@
exit 1
;;
- aclocal*)
+esac
+
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+# 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). This is about non-GNU programs, so use $1 not
+# $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 $program 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."
touch aclocal.m4
;;
- autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autoconf*)
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."
touch configure
;;
- autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autoheader*)
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."
@@ -130,7 +175,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -140,13 +185,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."
@@ -155,21 +195,16 @@
while read f; do touch "$f"; done
;;
- autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autom4te*)
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."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -183,111 +218,108 @@
fi
;;
- bison|yacc)
+ 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."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
- lex|flex)
+ 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."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
- help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ help2man*)
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."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
+ makeinfo*)
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."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
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)
+ 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
@@ -300,13 +332,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -323,8 +355,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 +366,11 @@
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-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# 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/listres-X11R7.0-1.0.1/README new/listres-1.0.2/README
--- old/listres-X11R7.0-1.0.1/README 2005-06-28 17:09:55.000000000 +0200
+++ new/listres-1.0.2/README 2009-10-16 23:38:20.000000000 +0200
@@ -0,0 +1,26 @@
+The listres program generates a list of X resources for a widget
+in an X client written using a toolkit based on libXt.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/app/listres
+
+ http://cgit.freedesktop.org/xorg/app/listres
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
++++++ mkcomposecache-1.2.tar.bz2 -> mkcomposecache-1.2.1.tar.bz2 ++++++
++++ 14882 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/mkcomposecache-1.2/ChangeLog new/mkcomposecache-1.2.1/ChangeLog
--- old/mkcomposecache-1.2/ChangeLog 2007-01-29 12:56:08.000000000 +0100
+++ new/mkcomposecache-1.2.1/ChangeLog 2009-10-02 05:05:03.000000000 +0200
@@ -1,3 +1,74 @@
+commit 86ebdaad7468ac4a523b8e799616b0704d207532
+Author: Alan Coopersmith
+Date: Thu Oct 1 20:04:13 2009 -0700
+
+ mkcomposecache 1.2.1
+
+ Signed-off-by: Alan Coopersmith
+
+commit 7294fcdefd83f700e9170731a10c86ba1bf05bc9
+Author: Alan Coopersmith
+Date: Thu Oct 1 19:41:39 2009 -0700
+
+ Man page updates
+
+ - use normal Xorg rules for substituting package/system variables
+ - fix typos
+ - correct default libX11 compose cache path
+ - remove Makefile recursion
+
+ Signed-off-by: Alan Coopersmith
+
+commit a8869a7d68755d7cded916dffcbe22d80af701d1
+Author: Alan Coopersmith
+Date: Thu Oct 1 19:24:07 2009 -0700
+
+ Remove CVS directory from git repo
+
+ Signed-off-by: Alan Coopersmith
+
+commit c33d7efc95d0775ad3cd9752c3dfd35d787cdecb
+Author: Alan Coopersmith
+Date: Thu Oct 1 19:01:11 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit 15754397487840db5a36ec4ebf5292ad602ee1b3
+Author: Alan Coopersmith
+Date: Thu Oct 1 18:51:06 2009 -0700
+
+ Add pointers to mailing lists, bugzilla, & git to README
+
+ Signed-off-by: Alan Coopersmith
+
+commit ca02974f722a56d2a2a30a0fcb04e6563d9ebff5
+Author: Alan Coopersmith
+Date: Thu Apr 9 17:45:10 2009 -0700
+
+ Remove use of obsolete -sp X server option
+
+ Signed-off-by: Alan Coopersmith
+
+commit 8ce50a587505b6aa03ad6cde8a958b0a0040073d
+Author: Alan Coopersmith
+Date: Thu Apr 9 17:41:59 2009 -0700
+
+ Use XORG_CWARNFLAGS instead of hardcoding -Wall in Makefile.am
+
+ Also switch changelog generation rule to XORG_CHANGELOG
+
+ Signed-off-by: Alan Coopersmith
+
+commit fbaa81a026aaaf8029487c4e960ef4b8bf58d055
+Author: Alan Coopersmith
+Date: Thu Apr 9 17:38:59 2009 -0700
+
+ Add .gitignore
+
+ Signed-off-by: Alan Coopersmith
+
commit af537f0acbc1bf9db54c10df24246a84bf092277
Author: Matthias Hopf
Date: Mon Jan 29 12:52:27 2007 +0100
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/mkcomposecache-1.2/config.h.in new/mkcomposecache-1.2.1/config.h.in
--- old/mkcomposecache-1.2/config.h.in 2007-01-29 12:56:03.000000000 +0100
+++ new/mkcomposecache-1.2.1/config.h.in 2009-10-02 05:04:41.000000000 +0200
@@ -57,6 +57,15 @@
/* 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
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
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/mkcomposecache-1.2/configure.ac new/mkcomposecache-1.2.1/configure.ac
--- old/mkcomposecache-1.2/configure.ac 2007-01-29 12:27:56.000000000 +0100
+++ new/mkcomposecache-1.2.1/configure.ac 2009-10-02 04:52:46.000000000 +0200
@@ -1,15 +1,19 @@
# -*- Autoconf -*-
AC_PREREQ(2.53)
-AC_INIT([mkcomposecache], [1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([mkcomposecache], [1.2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AC_CONFIG_SRCDIR([mkcomposecache.c])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros 1.3 for XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
AC_PROG_CC
+XORG_DEFAULT_OPTIONS
AC_PROG_INSTALL
PKG_CHECK_MODULES(XLIB, x11)
@@ -18,8 +22,7 @@
AC_CHECK_FUNCS([setlocale], , [AC_MSG_FAILURE("cannot find essential function")])
AC_CHECK_FUNCS([unsetenv])
-
AC_SUBST(XLIB_CFLAGS)
AC_SUBST(XLIB_LIBS)
-AC_OUTPUT([Makefile doc/Makefile])
+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/mkcomposecache-1.2/doc/Makefile.am new/mkcomposecache-1.2.1/doc/Makefile.am
--- old/mkcomposecache-1.2/doc/Makefile.am 2006-07-03 18:19:42.000000000 +0200
+++ new/mkcomposecache-1.2.1/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-EXTRA_DIST = $(man_MANS)
-man_MANS = mkcomposecache.8
-
-MAINTAINERCLEANFILES = Makefile.in
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/mkcomposecache-1.2/doc/mkcomposecache.8 new/mkcomposecache-1.2.1/doc/mkcomposecache.8
--- old/mkcomposecache-1.2/doc/mkcomposecache.8 2006-07-03 18:19:42.000000000 +0200
+++ new/mkcomposecache-1.2.1/doc/mkcomposecache.8 1970-01-01 01:00:00.000000000 +0100
@@ -1,68 +0,0 @@
-.TH MKCOMPOSECACHE 1 "mkcomposecache 1.0" "X Version 11"
-
-.SH NAME
-mkcomposecache \- create a cache file for a compose file explicitely
-
-.SH SYNOPSIS
-.B "mkcomposecache"
-.I locale
-.I compose-file
-.I cache-dir
-[
-.I internal-name
-]
-
-.SH DESCRIPTION
-.I mkcomposecache
-creates a cache file for the specified
-.I compose-file
-used in the given
-.I locale
-and saves it in
-.IR cache-dir .
-If
-.I internal-name
-has been spezified, it is used as the name of the compose table for computing
-the hash values and internal validation. This is necessary if global compose
-cache files shall be created while using
-.I DESTDIR
-during X11 installation.
-
-Notes:
-.TP 2
--
-compose cache files are created by libX11, thus
-an Xserver has to be running and
-.I DISPLAY
-has to be set correctly for creating cache files.
-.TP 2
--
-libX11 will not write compose cache files if run as root or with different
-real and effective uids.
-.TP 2
--
-libX11 will not create compose cache files in directories writable for other
-users.
-
-.SH DIAGNOSTICS
-.I mkcomposecache
-returns with exit status 1 on general errors (no Xserver, invoked as root,
-etc.) and 2 on unsupported locales.
-
-An exit status of 0 does not imply that a cache file is actually written,
-though. This very much depends on the used libX11 and its safety regulations.
-
-.SH EXAMPLES
-.B mkcomposecache
-en_US.UTF-8
-/var/tmp/buildroot/usr/share/X11/locale/en_US.UTF-8/Compose
-/var/tmp/buildroot/var/X11R6/compose_cache
-/usr/share/X11/locale/en_US.UTF-8/Compose
-
-.SH FILES
-.B /var/X11R6/compose_cache
-Location of global compose cache.
-
-.SH AUTHOR
-.B mkcomposecache
-was written by Matthias Hopf .
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/mkcomposecache-1.2/Makefile.am new/mkcomposecache-1.2.1/Makefile.am
--- old/mkcomposecache-1.2/Makefile.am 2007-01-29 12:37:36.000000000 +0100
+++ new/mkcomposecache-1.2.1/Makefile.am 2009-10-02 04:44:33.000000000 +0200
@@ -1,20 +1,43 @@
-SUBDIRS = doc
-
-AM_CFLAGS = @XLIB_CFLAGS@ -Wall
+AM_CFLAGS = @XLIB_CFLAGS@ $(CWARNFLAGS)
sbin_PROGRAMS = mkcomposecache
-EXTRA_DIST = ChangeLog mkallcomposecaches.sh
+
+adminmandir = $(ADMIN_MAN_DIR)
+adminman_PRE = mkcomposecache.man
+adminman_DATA = $(adminman_PRE:man=@ADMIN_MAN_SUFFIX@)
+
+EXTRA_DIST = ChangeLog mkallcomposecaches.sh $(adminman_PRE)
mkcomposecache_SOURCES = mkcomposecache.c
mkcomposecache_LDADD = @XLIB_LIBS@
-CLEANFILES=ChangeLog
+CLEANFILES = $(adminman_DATA)
MAINTAINERCLEANFILES = Makefile.in configure aclocal.m4 config.h.in depcomp install-sh missing 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)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
+SED = sed
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+ XORGMANNAME = X Version 11
+
+MAN_SUBSTS = \
+ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__projectroot__|$(prefix)|g' \
+ -e 's|__apploaddir__|$(appdefaultdir)|' \
+ -e 's|__adminmansuffix__|$(ADMIN_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 = .$(ADMIN_MAN_SUFFIX) .man
+
+.man.$(ADMIN_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/mkcomposecache-1.2/missing new/mkcomposecache-1.2.1/missing
--- old/mkcomposecache-1.2/missing 2007-01-29 12:56:04.000000000 +0100
+++ new/mkcomposecache-1.2.1/missing 2009-10-02 05:04:44.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,6 +31,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +44,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +77,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -86,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -103,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# 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)
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -135,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -145,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -154,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -164,7 +175,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -184,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -192,8 +203,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -207,80 +218,78 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
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."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
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."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
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."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -289,11 +298,17 @@
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'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ 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
@@ -303,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -317,13 +332,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -356,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# 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/mkcomposecache-1.2/mkallcomposecaches.sh new/mkcomposecache-1.2.1/mkallcomposecaches.sh
--- old/mkcomposecache-1.2/mkallcomposecaches.sh 2007-01-26 18:54:11.000000000 +0100
+++ new/mkcomposecache-1.2.1/mkallcomposecaches.sh 2009-04-10 02:43:20.000000000 +0200
@@ -15,7 +15,7 @@
$0 [var=arg] [...] root
e.g. $0 prefix=/usr/X11R7 /tmp/build-xorg
Double quote args with spaces.
- e.g. $0 "xvfbopts='-sp /usr/lib/xserver/SecurityPolicy'" /tmp/build-xorg
+ e.g. $0 "xvfbopts='-fp catalogue:/etc/X11/fontpath.d'" /tmp/build-xorg
Base defaults:
prefix=/usr
@@ -25,8 +25,7 @@
Program + args defaults:
xvfb=\$root\$prefix/bin/Xvfb
xvfbopts='-fp \$root\$prefix/\$libs/X11/fonts/misc/,
- \$root\$prefix/share/fonts/misc
- -sp /dev/null'
+ \$root\$prefix/share/fonts/misc'
xbiff=\$root\$prefix/bin/xbiff
mkcomposecache=\$root\$prefix/sbin/mkcomposecache
@@ -80,7 +79,7 @@
test "x$xbiff" = x && xbiff=$root$prefix/bin/xbiff
test "x$mkcomposecache" = x && mkcomposecache=$root$prefix/sbin/mkcomposecache
test "x$cachedir" = x && cachedir=$root/var/cache/libx11/compose
-test "x$xvfbopts" = x && xvfbopts="-fp $root$prefix/$libs/X11/fonts/misc/,$root$prefix/share/fonts/misc -sp /dev/null"
+test "x$xvfbopts" = x && xvfbopts="-fp $root$prefix/$libs/X11/fonts/misc/,$root$prefix/share/fonts/misc"
test "x$user" = x && user=nobody
test "x`whoami`" = xroot || user=""
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/mkcomposecache-1.2/mkcomposecache.man new/mkcomposecache-1.2.1/mkcomposecache.man
--- old/mkcomposecache-1.2/mkcomposecache.man 1970-01-01 01:00:00.000000000 +0100
+++ new/mkcomposecache-1.2.1/mkcomposecache.man 2009-10-02 04:30:46.000000000 +0200
@@ -0,0 +1,68 @@
+.TH MKCOMPOSECACHE __adminmansuffix__ __xorgversion__
+
+.SH NAME
+mkcomposecache \- create a cache file for a compose file explicitly
+
+.SH SYNOPSIS
+.B "mkcomposecache"
+.I locale
+.I compose-file
+.I cache-dir
+[
+.I internal-name
+]
+
+.SH DESCRIPTION
+.I mkcomposecache
+creates a cache file for the specified
+.I compose-file
+used in the given
+.I locale
+and saves it in
+.IR cache-dir .
+If
+.I internal-name
+has been specified, it is used as the name of the compose table for computing
+the hash values and internal validation. This is necessary if global compose
+cache files shall be created while using
+.I DESTDIR
+during X11 installation.
+
+Notes:
+.TP 2
+-
+compose cache files are created by libX11, thus
+an Xserver has to be running and
+.I DISPLAY
+has to be set correctly for creating cache files.
+.TP 2
+-
+libX11 will not write compose cache files if run as root or with different
+real and effective uids.
+.TP 2
+-
+libX11 will not create compose cache files in directories writable for other
+users.
+
+.SH DIAGNOSTICS
+.I mkcomposecache
+returns with exit status 1 on general errors (no Xserver, invoked as root,
+etc.) and 2 on unsupported locales.
+
+An exit status of 0 does not imply that a cache file is actually written,
+though. This very much depends on the used libX11 and its safety regulations.
+
+.SH EXAMPLES
+.B mkcomposecache
+en_US.UTF-8
+/var/tmp/buildroot/usr/share/X11/locale/en_US.UTF-8/Compose
+/var/tmp/buildroot/var/X11R6/compose_cache
+/usr/share/X11/locale/en_US.UTF-8/Compose
+
+.SH FILES
+.B /var/cache/libx11/compose/
+Location of global compose cache.
+
+.SH AUTHOR
+.B mkcomposecache
+was written by Matthias Hopf .
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/mkcomposecache-1.2/README new/mkcomposecache-1.2.1/README
--- old/mkcomposecache-1.2/README 2006-07-03 18:19:42.000000000 +0200
+++ new/mkcomposecache-1.2.1/README 2009-10-02 03:50:10.000000000 +0200
@@ -2,3 +2,27 @@
Compose cache files help with application startup times and memory usage,
especially in locales with large Compose tables (e.g. all UTF-8 locales).
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/app/mkcomposecache
+
+ http://cgit.freedesktop.org/xorg/app/mkcomposecache
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
++++++ sessreg-1.0.5.tar.bz2 -> sessreg-1.0.6.tar.bz2 ++++++
++++ 11944 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/sessreg-1.0.5/ChangeLog new/sessreg-1.0.6/ChangeLog
--- old/sessreg-1.0.5/ChangeLog 2009-10-12 20:19:36.000000000 +0200
+++ new/sessreg-1.0.6/ChangeLog 2010-06-04 02:33:30.000000000 +0200
@@ -1,3 +1,105 @@
+commit 7f1e17aed0027e4040a1fcc96e6319fca36af233
+Author: Alan Coopersmith
+Date: Thu Jun 3 17:32:57 2010 -0700
+
+ sessreg 1.0.6
+
+ Signed-off-by: Alan Coopersmith
+
+commit 8808c476319fce3e254e3a7df3205ba4205cb13b
+Author: Gaetan Nadon
+Date: Wed Feb 3 14:12:28 2010 -0500
+
+ Add AC_USE_SYSTEM_EXTENSIONS providing needed WTMPX_FILE define
+
+ The WTMPX_FILE is only defined under __USE_GNU conditional
+ compilation. Autoconf provides AC_USE_SYSTEM_EXTENSIONS
+ to enable platform extensions.
+
+ It must be expanded before any other macros that uses the compiler.
+ To reduce the risk of being misplaced, the statements have been
+ grouped (mostly) as per the GNU standard layout.This macro
+ requires Autoconf level 2.60 or later.
+
+ The compilation failed under a GNU-Linux OS.
+
+ Tested-by (on darwin): Jeremy Huddleston
+ Signed-off-by: Gaetan Nadon
+
+commit 9792646873ac0e597cc65ef4a056444fd8f9a7fd
+Author: Ed Schouten
+Date: Sat Jan 16 18:33:53 2010 +0000
+
+ Allow sessreg to be built without .
+
+ As of 9.0, FreeBSD will only support . It only implements the
+ POSIX interface with minor extensions. There is no need to write to
+ wtmp and lastlog separately, because this is already done by
+ pututxline(). Add additional checks to configure.ac to search for the
+ presence of utmpxname() and updwtmpx().
+
+ Signed-off-by: Ed Schouten
+ Signed-off-by: Alan Coopersmith
+
+commit 9ca078f8ffc5ab0c4d0f58be26e885a7ad0b8f39
+Author: Alan Coopersmith
+Date: Mon Jan 11 21:04:28 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith
+
+commit 1b12b1dac6fcb0d1665f3272a899d78c76fd2969
+Author: Gaetan Nadon
+Date: Fri Jan 8 13:30:45 2010 -0500
+
+ COPYING: add missing copyright notice
+
+ Refer to sessreg.h file.
+ Copyright 2005 Sun Microsystems, Inc.
+
+ Signed-off-by: Gaetan Nadon
+ Signed-off-by: Alan Coopersmith
+
+commit 067fef75045931b4b5766ee7e55300d16e6dcc9a
+Author: Gaetan Nadon
+Date: Thu Nov 26 09:19:52 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 94be0a4794dd9e9d9e7f23737c6ccd2d50985b5d
+Author: Gaetan Nadon
+Date: Wed Oct 28 14:09:07 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 88252d8bdccbf5dd3ee077345ccd1569fb4f10e6
+Author: Gaetan Nadon
+Date: Mon Oct 26 22:08:38 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 9ea98936be23de9a2d9e27c5f5af93b0eea276d9
+Author: Gaetan Nadon
+Date: Thu Oct 22 12:34:14 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 eb6ef63fb284cc91c04dcb68fda2ad8ca6fe0e1a
Author: Alan Coopersmith
Date: Mon Oct 12 11:11:42 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/sessreg-1.0.5/config.h.in new/sessreg-1.0.6/config.h.in
--- old/sessreg-1.0.5/config.h.in 2009-10-12 20:12:04.000000000 +0200
+++ new/sessreg-1.0.6/config.h.in 2010-06-04 02:33:17.000000000 +0200
@@ -33,12 +33,21 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to 1 if you have the `updwtmpx' function. */
+#undef HAVE_UPDWTMPX
+
+/* Define to 1 if you have the `utmpxname' function. */
+#undef HAVE_UTMPXNAME
+
/* Define to 1 if you have the header file. */
#undef HAVE_UTMPX_H
/* utmpx structure includes ut_syslen field */
#undef HAVE_UTMPX_UT_SYSLEN
+/* Define to 1 if you have the header file. */
+#undef HAVE_UTMP_H
+
/* Name of package */
#undef PACKAGE
@@ -54,6 +63,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
@@ -69,6 +81,28 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
+/* Enable extensions on AIX 3, Interix. */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
/* Version number of package */
#undef VERSION
@@ -77,3 +111,13 @@
/* Define for large files, on AIX-style hosts. */
#undef _LARGE_FILES
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+ this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
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/sessreg-1.0.5/configure.ac new/sessreg-1.0.6/configure.ac
--- old/sessreg-1.0.5/configure.ac 2009-10-12 20:10:57.000000000 +0200
+++ new/sessreg-1.0.6/configure.ac 2010-06-04 02:32:40.000000000 +0200
@@ -20,26 +20,35 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(sessreg, [1.0.5],
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT(sessreg, [1.0.6],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
sessreg)
-AM_INIT_AUTOMAKE([dist-bzip2])
-AM_MAINTAINER_MODE
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+AC_CANONICAL_HOST
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
-AM_CONFIG_HEADER(config.h)
+# Initialize Automake
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
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.4 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.4)
+XORG_DEFAULT_OPTIONS
+XORG_WITH_LINT
+# Checks for programs.
AC_PROG_CC
+AC_PROG_CC_C99
AC_PROG_INSTALL
-XORG_DEFAULT_OPTIONS
-
-AC_CHECK_HEADERS([lastlog.h utmpx.h sys/param.h])
+# Checks for header files.
+AC_CHECK_HEADERS([lastlog.h utmp.h utmpx.h sys/param.h])
AC_CHECK_MEMBER([struct utmpx.ut_syslen],
HAVE_SYSLEN=1,
HAVE_SYSLEN=0,
@@ -47,13 +56,11 @@
AC_DEFINE_UNQUOTED(HAVE_UTMPX_UT_SYSLEN,$HAVE_SYSLEN,
[utmpx structure includes ut_syslen field])
-AC_SYS_LARGEFILE
+# Checks for typedefs, structures, and compiler characteristics.
+AC_CHECK_FUNCS([updwtmpx utmpxname])
# Checks for pkg-config packages
PKG_CHECK_MODULES(SESSREG, xproto)
AC_SUBST(SESSREG_CFLAGS)
-# Allow checking code with lint, sparse, etc.
-XORG_WITH_LINT
-
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/sessreg-1.0.5/COPYING new/sessreg-1.0.6/COPYING
--- old/sessreg-1.0.5/COPYING 2008-06-11 23:30:54.000000000 +0200
+++ new/sessreg-1.0.6/COPYING 2010-01-12 06:01:16.000000000 +0100
@@ -21,3 +21,24 @@
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from The Open Group.
+
+Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -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/sessreg-1.0.5/INSTALL new/sessreg-1.0.6/INSTALL
--- old/sessreg-1.0.5/INSTALL 2008-06-11 23:30:54.000000000 +0200
+++ new/sessreg-1.0.6/INSTALL 2010-06-04 02:33:30.000000000 +0200
@@ -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/sessreg-1.0.5/Makefile.am new/sessreg-1.0.6/Makefile.am
--- old/sessreg-1.0.5/Makefile.am 2009-10-12 19:43:11.000000000 +0200
+++ new/sessreg-1.0.6/Makefile.am 2009-11-30 07:53:09.000000000 +0100
@@ -32,7 +32,8 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE) filenames.sed.c ChangeLog
+EXTRA_DIST = $(appman_PRE) filenames.sed.c
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA) filenames.sed
SED = sed
@@ -74,11 +75,13 @@
$(LINT) $(ALL_LINT_FLAGS) $(sessreg_SOURCES)
endif LINT
-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/sessreg-1.0.5/sessreg.c new/sessreg-1.0.6/sessreg.c
--- old/sessreg-1.0.5/sessreg.c 2009-10-12 19:52:12.000000000 +0200
+++ new/sessreg-1.0.6/sessreg.c 2010-01-16 20:05:28.000000000 +0100
@@ -28,29 +28,23 @@
/* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, and/or sell copies of the Software, and to permit persons
- * to whom the Software is furnished to do so, provided that the above
- * copyright notice(s) and this permission notice appear in all copies of
- * the Software and that both the above copyright notice(s) and this
- * permission notice appear in supporting documentation.
- *
- * 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
- * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder
- * shall not be used in advertising or otherwise to promote the sale, use
- * or other dealings in this Software without prior written authorization
- * of the copyright holder.
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
*/
/*
@@ -81,7 +75,6 @@
# include
# include
# include
-# include
#if defined(__SVR4) || defined(SVR4) || defined(linux) || defined(__GLIBC__)
# define SYSV
@@ -90,7 +83,10 @@
#include
#define Time_t time_t
-static void set_utmp (struct utmp *u, char *line, char *user, char *host, Time_t date, int addp);
+#ifdef USE_UTMP
+static void set_utmp (struct utmp *u, char *line, char *user, char *host,
+ Time_t date, int addp);
+#endif
#ifdef USE_UTMPX
static void set_utmpx (struct utmpx *u, const char *line, const char *user,
@@ -100,7 +96,12 @@
static int wflag, uflag, lflag;
static char *wtmp_file, *utmp_file, *line;
#ifdef USE_UTMPX
-static char *wtmpx_file = NULL, *utmpx_file = NULL;
+#ifdef HAVE_UPDWTMPX
+static char *wtmpx_file = NULL;
+#endif
+#ifdef HAVE_UTMPXNAME
+static char *utmpx_file = NULL;
+#endif
#endif
static int utmp_none, wtmp_none;
/*
@@ -109,7 +110,9 @@
*/
static int hflag, sflag, xflag, tflag;
static char *host_name = NULL;
+#ifdef USE_UTMP
static int slot_number;
+#endif
static char *xservers_file, *ttys_file;
static char *user_name;
static int aflag, dflag;
@@ -181,7 +184,7 @@
int
main (int argc, char **argv)
{
-#ifndef SYSV
+#if defined(USE_UTMP) && !defined(SYSV)
int utmp;
#endif
char *line_tmp;
@@ -189,7 +192,9 @@
int wtmp;
#endif
Time_t current_time;
+#ifdef USE_UTMP
struct utmp utmp_entry;
+#endif
#ifdef USE_UTMPX
struct utmpx utmpx_entry;
#endif
@@ -224,7 +229,9 @@
host_name = getstring (&argv, &hflag);
break;
case 's':
+#ifdef USE_UTMP
slot_number = atoi (getstring (&argv, &sflag));
+#endif
break;
case 'x':
xservers_file = getstring (&argv, &xflag);
@@ -250,14 +257,14 @@
/* set up default file names */
if (!wflag) {
wtmp_file = WTMP_FILE;
-#ifdef USE_UTMPX
+#if defined(USE_UTMPX) && defined(HAVE_UPDWTMPX)
wtmpx_file = WTMPX_FILE;
#endif
}
#ifndef NO_UTMP
if (!uflag) {
utmp_file = UTMP_FILE;
-#ifdef USE_UTMPX
+#if defined(USE_UTMPX) && defined(HAVE_UTMPXNAME)
utmpx_file = UTMPX_FILE;
#endif
}
@@ -268,7 +275,7 @@
if (!Lflag)
llog_file = LLOG_FILE;
#endif
-#if !defined(SYSV) && !defined(linux) && !defined(__QNX__)
+#if defined(USE_UTMP) && !defined(SYSV) && !defined(linux) && !defined(__QNX__)
if (!tflag)
ttys_file = TTYS_FILE;
if (!sflag && !utmp_none) {
@@ -287,34 +294,42 @@
line = line_tmp;
}
time (¤t_time);
+#ifdef USE_UTMP
set_utmp (&utmp_entry, line, user_name, host_name, current_time, aflag);
+#endif
#ifdef USE_UTMPX
/* need to set utmpxname() before calling set_utmpx() for
UtmpxIdOpen to work */
+# ifdef HAVE_UTMPXNAME
if (utmpx_file != NULL) {
utmpxname (utmpx_file);
}
+# endif
set_utmpx (&utmpx_entry, line, user_name,
host_name, current_time, aflag);
#endif
if (!utmp_none) {
#ifdef USE_UTMPX
- if (utmpx_file != NULL) {
+# ifdef HAVE_UTMPX_NAME
+ if (utmpx_file != NULL)
+# endif
+ {
setutxent ();
(void) getutxid (&utmpx_entry);
pututxline (&utmpx_entry);
endutxent ();
}
#endif
-#ifdef SYSV
+#ifdef USE_UTMP
+# ifdef SYSV
utmpname (utmp_file);
setutent ();
(void) getutid (&utmp_entry);
pututline (&utmp_entry);
endutent ();
-#else
+# else
utmp = open (utmp_file, O_RDWR);
if (utmp != -1) {
syserr ((int) lseek (utmp, (long) slot_number * sizeof (struct utmp), 0), "lseek");
@@ -322,13 +337,16 @@
== sizeof (utmp_entry), "write utmp entry");
close (utmp);
}
-#endif
+# endif
+#endif /* USE_UTMP */
}
if (!wtmp_none) {
#ifdef USE_UTMPX
+# ifdef HAVE_UPDWTMPX
if (wtmpx_file != NULL) {
updwtmpx(wtmpx_file, &utmpx_entry);
}
+# endif
#else
wtmp = open (wtmp_file, O_WRONLY|O_APPEND);
if (wtmp != -1) {
@@ -371,6 +389,7 @@
* fill in the appropriate records of the utmp entry
*/
+#ifdef USE_UTMP
static void
set_utmp (struct utmp *u, char *line, char *user, char *host, Time_t date, int addp)
{
@@ -417,6 +436,7 @@
#endif
u->ut_time = date;
}
+#endif /* USE_UTMP */
#ifdef USE_UTMPX
static int
@@ -424,6 +444,8 @@
{
struct utmpx *u; /* pointer to entry in utmp file */
int status = 1; /* return code */
+
+ setutxent();
while ( (u = getutxent()) != NULL ) {
@@ -435,7 +457,7 @@
}
}
- endutent();
+ endutxent();
return (status);
}
@@ -454,14 +476,16 @@
(void) strncpy (u->ut_line, line, sizeof (u->ut_line));
strncpy(u->ut_host, line, sizeof(u->ut_host));
+#if HAVE_UTMPX_UT_SYSLEN
u->ut_syslen = strlen(line);
+#endif
}
else
bzero (u->ut_line, sizeof (u->ut_line));
if (addp && user)
- (void) strncpy (u->ut_name, user, sizeof (u->ut_name));
+ (void) strncpy (u->ut_user, user, sizeof (u->ut_user));
else
- bzero (u->ut_name, sizeof (u->ut_name));
+ bzero (u->ut_user, sizeof (u->ut_user));
if (line) {
int i;
@@ -520,7 +544,7 @@
}
#endif /* USE_UTMPX */
-#ifndef SYSV
+#if defined(USE_UTMP) && !defined(SYSV)
/*
* compute the slot-number for an X display. This is computed
* by counting the lines in /etc/ttys and adding the line-number
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/sessreg-1.0.5/sessreg.h new/sessreg-1.0.6/sessreg.h
--- old/sessreg-1.0.5/sessreg.h 2008-06-11 23:30:54.000000000 +0200
+++ new/sessreg-1.0.6/sessreg.h 2010-01-16 20:05:28.000000000 +0100
@@ -28,42 +28,38 @@
/* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, and/or sell copies of the Software, and to permit persons
- * to whom the Software is furnished to do so, provided that the above
- * copyright notice(s) and this permission notice appear in all copies of
- * the Software and that both the above copyright notice(s) and this
- * permission notice appear in supporting documentation.
- *
- * 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
- * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder
- * shall not be used in advertising or otherwise to promote the sale, use
- * or other dealings in this Software without prior written authorization
- * of the copyright holder.
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
*/
#include "config.h"
#include
#include
-#include
+
+#ifdef HAVE_UTMP_H
+# include
+# define USE_UTMP
+#endif
#ifdef HAVE_UTMPX_H
-# if HAVE_UTMPX_UT_SYSLEN
-# include
-# define USE_UTMPX
-# endif
+# include
+# define USE_UTMPX
#endif
#ifdef HAVE_SYS_PARAM_H
++++++ viewres-X11R7.0-1.0.1.tar.bz2 -> viewres-1.0.2.tar.bz2 ++++++
++++ 18055 lines of diff (skipped)
++++++ xbiff-X11R7.0-1.0.1.tar.bz2 -> xbiff-1.0.2.tar.bz2 ++++++
++++ 17045 lines of diff (skipped)
++++++ xcalc-1.0.2.tar.bz2 -> xcalc-1.0.3.tar.bz2 ++++++
++++ 15307 lines of diff (skipped)
++++++ xclipboard-X11R7.0-1.0.1.tar.bz2 -> xclipboard-1.1.0.tar.bz2 ++++++
++++ 17186 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/xclipboard-X11R7.0-1.0.1/app-defaults/XClipboard new/xclipboard-1.1.0/app-defaults/XClipboard
--- old/xclipboard-X11R7.0-1.0.1/app-defaults/XClipboard 1970-01-01 01:00:00.000000000 +0100
+++ new/xclipboard-1.1.0/app-defaults/XClipboard 2009-01-13 06:46:49.000000000 +0100
@@ -0,0 +1,126 @@
+! $Xorg: XClipboard.ad,v 1.3 2000/08/17 19:54:12 cpqbld Exp $
+*Command*Font: -*-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-1
+*Label*Font: -*-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-1
+*Text*Font: -*-courier-medium-r-normal--*-120-*-*-*-*-iso8859-1
+
+*quit.label: Quit
+*quit.top: ChainTop
+*quit.bottom: ChainTop
+*quit.left: ChainLeft
+*quit.right: ChainLeft
+*quit.translations: #override \n\
+ <Btn1Down>,<Btn1Up>:Quit() unset()
+
+*delete.label: Delete
+*delete.fromHoriz: quit
+*delete.top: ChainTop
+*delete.bottom: ChainTop
+*delete.left: ChainLeft
+*delete.right: ChainLeft
+*delete.translations: #override \n\
+ <Btn1Down>,<Btn1Up>:DeleteClip() unset()
+
+*new.label: New
+*new.fromHoriz: delete
+*new.top: ChainTop
+*new.bottom: ChainTop
+*new.left: ChainLeft
+*new.right: ChainLeft
+*new.translations: #override \n\
+ <Btn1Down>,<Btn1Up>:NewClip() unset()
+
+*save.label: Save
+*save.fromHoriz: new
+*save.top: ChainTop
+*save.bottom: ChainTop
+*save.left: ChainLeft
+*save.right: ChainLeft
+*save.translations: #override \n\
+ <Btn1Down>,<Btn1Up>:Save() unset()
+
+*next.label: Next
+*next.fromHoriz: save
+*next.top: ChainTop
+*next.bottom: ChainTop
+*next.left: ChainLeft
+*next.right: ChainLeft
+*next.translations: #override \n\
+ <Btn1Down>,<Btn1Up>:NextClip() unset()
+
+*prev.label: Prev
+*prev.fromHoriz: next
+*prev.top: ChainTop
+*prev.bottom: ChainTop
+*prev.left: ChainLeft
+*prev.right: ChainLeft
+*prev.translations: #override \n\
+ <Btn1Down>,<Btn1Up>:PrevClip() unset()
+
+*index.fromHoriz: prev
+*index.top: ChainTop
+*index.bottom: ChainTop
+*index.left: ChainLeft
+*index.right: ChainLeft
+*index.resizable: true
+
+*text.scrollVertical: WhenNeeded
+*text.scrollHorizontal: WhenNeeded
+*text.autoFill: on
+
+*text.fromVert: quit
+*text.top: ChainTop
+*text.bottom: ChainBottom
+*text.left: ChainLeft
+*text.right: ChainRight
+*text.resizable: true
+*text.width: 300
+
+XClipboard.geometry: 300x200
+*ShapeStyle: oval
+XClipboard.baseTranslations: #augment\n\
+ <Message>WM_PROTOCOLS: WMProtocols()\n
+*TransientShell.baseTranslations: #augment\n\
+ <Message>WM_PROTOCOLS: WMProtocols()\n
+
+*fileDialog.label: Save to file:
+*fileDialogShell.allowShellResize: true
+*fileDialogShell.title: File Save
+
+*fileDialog*accept.label: Accept
+*fileDialog*accept.translations: #override\
+ <BtnUp>: AcceptSave() unset()
+*fileDialog*value.translations: #override\
+ <Key>Return: AcceptSave() \n\
+ Ctrl<Key>S: no-op(ring-bell) \n\
+ Ctrl<Key>R: no-op(ring-bell) \n\
+ Ctrl<Key>M: no-op(ring-bell) \n\
+ Ctrl<Key>J: no-op(ring-bell) \n\
+ Meta<Key>I: no-op(ring-bell)
+*fileDialog*value.baseTranslations: #override\
+ <Key>Return: AcceptSave() \n\
+ Ctrl<Key>S: no-op(ring-bell) \n\
+ Ctrl<Key>R: no-op(ring-bell) \n\
+ Ctrl<Key>M: no-op(ring-bell) \n\
+ Ctrl<Key>J: no-op(ring-bell) \n\
+ Meta<Key>I: no-op(ring-bell)
+
+*fileDialog*cancel.label: Cancel
+*fileDialog*cancel.translations: #override\
+ <BtnUp>:CancelSave() unset()
+
+*failDialog*Label.resizable: true
+*failDialog.label: Can't write file
+*failDialogShell.title: Error
+*failDialogShell.allowShellResize: true
+
+*failDialog*continue.label: Continue
+*failDialog*continue.translations: #override\
+ <BtnUp>:FailContinue() unset()
+
+*failDialog*value.translations: #override\
+ <Key>Return: FailContinue() \n\
+ Ctrl<Key>S: no-op(ring-bell) \n\
+ Ctrl<Key>R: no-op(ring-bell) \n\
+ Ctrl<Key>M: no-op(ring-bell) \n\
+ Ctrl<Key>J: no-op(ring-bell) \n\
+ Meta<Key>I: no-op(ring-bell)
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/xclipboard-X11R7.0-1.0.1/ChangeLog new/xclipboard-1.1.0/ChangeLog
--- old/xclipboard-X11R7.0-1.0.1/ChangeLog 2005-12-21 03:29:48.000000000 +0100
+++ new/xclipboard-1.1.0/ChangeLog 2009-10-15 07:38:03.000000000 +0200
@@ -1,31 +1,318 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 96d1fe9241f6b68d52c9b3020dd926319d830558
+Author: Alan Coopersmith
+Date: Wed Oct 14 22:37:17 2009 -0700
- * configure.ac:
- Update package version for X11R7 release.
+ xclipboard 1.1.0
+
+ Signed-off-by: Alan Coopersmith
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit f16c6dd23a132d037e513cd378b2a0e0417ebb8c
+Author: Alan Coopersmith
+Date: Tue Oct 13 19:58:31 2009 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Enable #ifdef XKB code to call XkbStdBell() if libxkbfile is found
+
+ Signed-off-by: Alan Coopersmith
-2005-12-07 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 42432a7776c0cc94c6ec5360c1ab74f484328167
+Author: Alan Coopersmith
+Date: Tue Oct 13 19:51:11 2009 -0700
- * Makefile.am:
- * configure.ac:
- Change to use the app-defaults default dir configured in libXt.
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 458673cf5192f800621bcd2b371eb55be9b5ba50
+Author: Alan Coopersmith
+Date: Thu Oct 1 14:54:21 2009 -0700
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 7d5f24fd8182ac6650d4080f74237c8f3773acb4
+Author: Paulo Cesar Pereira de Andrade
+Date: Mon Jan 12 20:27:18 2009 -0200
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Ansification and compile warning fixes.
+
+ This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
+ make distcheck and most gcc 4.3 and sparse warnings.
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e66bb8c9fb0678cb1086320f931d805491b747f7
+Author: James Cloos
+Date: Wed Aug 20 10:32:49 2008 -0400
- * configure.ac:
- Update package version number for RC1 release.
+ xaw8 is gone, use xaw7
+commit 9f85f47d7cf25fba98207cc8c0a64b2bfc494c14
+Author: Stanislav Maslovski
+Date: Wed Jul 16 14:35:49 2008 -0400
+
+ Fix UTF-8 support.
+
+ * use XA_UTF8_STRING defined in .
+ * add "*international: true" to fallback resources like xedit does.
+ * get rid of a separate InsertClipboardUtf8() and rewrite InsertClipboard()
+ to support proper conversion from UTF-8 with fallbacks to CTEXT or STRING
+ in case of errors.
+ * add COMPOUND_TEXT to the list of supported targets and unify
+ the conversion code for UTF-8, CTEXT and STRING in ConvertSelection().
+ Use a proper default for target TEXT.
+
+ Signed-off-by: James Cloos
+
+commit f7f9265623762bfa06cec5273de11d2ec55d4917
+Author: Stanislav Maslovski
+Date: Fri Jul 11 09:37:45 2008 -0400
+
+ Add UTF-8 support.
+
+ While reading manuals on X selections, xt and xaw I have
+ added support of UTF-8 to xclipboard.
+
+ As is seen from the patch I use “UTF8_STRING” atom
+ in the negotiation of the selection type. There are
+ other possibilities and it seems that there is no
+ real standard on this, right? I have checked that
+ UTF8_STRING works with both GTK+ and QT apps.
+
+ In addition to the patch to enable correct display
+ of international texts in xaw widgets one has to define
+
+ *international: true
+
+ in one’s XRM.
+
+ And enough rich set of bitmap fonts must be also installed.
+
+ From bug 16671.
+
+ Signed-off-by: James Cloos
+
+commit aecddb8eae77fd36acdca88bb7080b875274d47c
+Author: Julien Cristau
+Date: Fri May 16 14:17:52 2008 +0200
+
+ $(builddir) is the current directory
+
+ Apparently automake doesn't always export the builddir variable.
+ This fixes my previous commit.
+
+commit 0013b5aa18798da38e7eb64b8bbb96f16268a474
+Author: Julien Cristau
+Date: Sun Apr 20 19:12:08 2008 +0200
+
+ Fix build with builddir != srcdir
+
+commit 4cd445822a3cc48cde7102cecacc54f6daabe25b
+Author: Julien Cristau
+Date: Sun Apr 20 19:05:17 2008 +0200
+
+ Use AM_CFLAGS instead of {xclipboard,xcutsel}_CFLAGS and remove AM_PROG_CC_C_O
+
+commit 6422151ddd39e50621df2ec4d5c9b52a189b378b
+Author: Jeremy Huddleston
+Date: Thu Mar 27 20:25:18 2008 -0700
+
+ Added missing AM_PROG_CC_C_O
+
+commit 43c7eeef9be867511c2c4ee82aa05ffc925efa65
+Author: Jeremy Huddleston
+Date: Thu Mar 27 20:07:36 2008 -0700
+
+ Build fix for file systems that are not case sensitive
+
+commit 22d6a8b72a1e52c7554e50fd250519d5a79e2816
+Author: James Cloos
+Date: Thu Dec 6 16:37:10 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 8587904b2dd914fa0a52f1246cd09b50a252054d
+Author: James Cloos
+Date: Mon Sep 3 05:51:16 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit c543ac48d51df1f3fc7a85daf962d632cf5be07d
+Author: James Cloos
+Date: Thu Aug 23 19:24:40 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit 9d2fff958be21935020a443b3fb56bd2d41cd789
+Author: Kevin E Martin
+Date: Wed Dec 21 02:29:48 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 63db9d62f56a1429bdc6865337cea064e1c3e55c
+Author: Adam Jackson
+Date: Mon Dec 19 16:22:42 2005 +0000
+
+ Stub COPYING files
+
+commit 3c1e6ab769aaf446951641b560d31f45870c3520
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:05 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit d1c1ebd46e0931bbffb10f3d8d06b18fc1233910
+Author: Kevin E Martin
+Date: Wed Dec 7 16:17:58 2005 +0000
+
+ Change to use the app-defaults default dir configured in libXt.
+
+commit 0481b59715f074a1c105afee876cd62960e124a1
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:19 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 1a7a14e9b097a3fae172d25fa654af72929b7890
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:18 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 21a312bea06be1dda2d64076a87d6ad1324e01d9
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:01:40 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 0245cfa0e04fd73aae23db52f7c424d5c07644f6
+Author: Eric Anholt
+Date: Mon Nov 21 10:34:58 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 75a9ef36c20f318b8da281febf584ce15c10ef35
+Author: Eric Anholt
+Date: Sun Nov 20 22:08:51 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit bbb7e9adb403e7896af68944941ca9229b4bfa3e
+Author: Kevin E Martin
+Date: Wed Oct 19 02:47:52 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 1f5bb8da77add50c72b721d8d63e25d25f99b19e
+Author: Alan Coopersmith
+Date: Tue Oct 18 00:32:54 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 8b5c18ad03870baac75724ee8e674511548ca25d
+Author: Alan Coopersmith
+Date: Mon Oct 17 23:56:21 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 19e2998cd3c424c25aa3780f12da517453428f83
+Author: Alan Coopersmith
+Date: Fri Oct 14 00:25:43 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit c440a0452b998073b2dec8bf8278eca8136675be
+Author: Alan Coopersmith
+Date: Mon Aug 1 20:25:29 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit 5578b4284a0dcfea32cea8dae3992fe509249f84
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:31 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 ed3b3927eccbcf03debd34572285176074bec03b
+Author: Alan Coopersmith
+Date: Tue Jul 26 15:44:01 2005 +0000
+
+ Replace more GNU make-ism's with more portable macros
+
+commit 9caece10b7a09796331f5e6c02696bfb212b2e11
+Author: Adam Jackson
+Date: Wed Jul 20 19:31:51 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 fdc0992af4020cb5230a64058281b6e5aed0d3a1
+Author: Matthieu Herrb
+Date: Sun Jul 17 20:11:02 2005 +0000
+
+ fix rules to work with non-GNU make and outside of $srcdir
+
+commit e0a326f3bd7889da2352a1e534871a64b693545a
+Author: Søren Sandmann Pedersen
+Date: Wed Jul 6 17:30:20 2005 +0000
+
+ Build system for xclipboard and xcutsel
+
+commit 85a4962bf0afd349b3260f68fb29aa06b0117f57
+Author: Egbert Eich
+Date: Fri Apr 23 19:54:39 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 146e4cdd54a23384e879fc814ded63d0d790ba1f
+Author: Egbert Eich
+Date: Sun Mar 14 08:35:00 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 6269527e0703627ca9e0316c82c2159a1c7114f1
+Author: Egbert Eich
+Date: Wed Mar 3 12:12:55 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 538cb471c6767c367fcd1955cf3eac8a8b043c31
+Author: Egbert Eich
+Date: Thu Feb 26 13:36:16 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 52bd64ce38b07c7609434b72b35127b2324a0f73
+Author: Egbert Eich
+Date: Thu Feb 26 09:23:58 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 94abf1754b04b1e6382fe0287b1e7eb2ce6ffdf3
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:29:03 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 63371815b3f48cb8d4793e6a520d2fc4350c5f1f
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:58 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 729ceb19417c61603e659b2eb82d2e02fa388365
+Author: Kaleb Keithley
+Date: Fri Nov 14 15:54:53 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/xclipboard-X11R7.0-1.0.1/compile new/xclipboard-1.1.0/compile
--- old/xclipboard-X11R7.0-1.0.1/compile 2005-12-21 08:24:33.000000000 +0100
+++ new/xclipboard-1.1.0/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/xclipboard-X11R7.0-1.0.1/config.h.in new/xclipboard-1.1.0/config.h.in
--- old/xclipboard-X11R7.0-1.0.1/config.h.in 2005-12-21 08:24:32.000000000 +0100
+++ new/xclipboard-1.1.0/config.h.in 2009-10-15 07:37:41.000000000 +0200
@@ -1,5 +1,32 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 if you have the header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_UNISTD_H
+
/* Name of package */
#undef PACKAGE
@@ -18,5 +45,20 @@
/* 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
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* Version number of package */
#undef VERSION
+
+/* Define to use libxkbfile calls like XKBStdBell() */
+#undef XKB
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/xclipboard-X11R7.0-1.0.1/configure.ac new/xclipboard-1.1.0/configure.ac
--- old/xclipboard-X11R7.0-1.0.1/configure.ac 2005-12-21 03:29:48.000000000 +0100
+++ new/xclipboard-1.1.0/configure.ac 2009-10-15 07:37:03.000000000 +0200
@@ -22,25 +22,41 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xclipboard,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xclipboard)
+AC_INIT(xclipboard, [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xclipboard)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+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
+XORG_DEFAULT_OPTIONS
+
# Checks for pkg-config packages
-XAW_CHECK_XPRINT_SUPPORT(XCLIPBOARD)
+PKG_CHECK_EXISTS([xkbfile], [XKBPKG="xkbfile"], [XKBPKG=""])
+if test x$XKBPKG = xxkbfile ; then
+ AC_DEFINE([XKB], [1], [Define to use libxkbfile calls like XKBStdBell()])
+fi
+PKG_CHECK_MODULES(XCLIPBOARD, [xaw7 xmu xt x11 ${XKBPKG}])
AC_SUBST(XCLIPBOARD_CFLAGS)
AC_SUBST(XCLIPBOARD_LIBS)
PKG_CHECK_MODULES(APPDEFS, xt)
-appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+AC_ARG_WITH(appdefaultdir,
+ AC_HELP_STRING([--with-appdefaultdir=<pathname>],
+ [specify directory for app-defaults files (default is autodetected)]),
+ [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
AC_SUBST(appdefaultdir)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
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/xclipboard-X11R7.0-1.0.1/Makefile.am new/xclipboard-1.1.0/Makefile.am
--- old/xclipboard-X11R7.0-1.0.1/Makefile.am 2005-12-07 17:17:58.000000000 +0100
+++ new/xclipboard-1.1.0/Makefile.am 2009-10-14 04:46:20.000000000 +0200
@@ -21,9 +21,10 @@
bin_PROGRAMS = xclipboard xcutsel
+AM_CFLAGS = $(CWARNFLAGS) $(XCLIPBOARD_CFLAGS)
+
# xclipboard
-xclipboard_CFLAGS = $(XCLIPBOARD_CFLAGS)
xclipboard_LDADD = $(XCLIPBOARD_LIBS)
xclipboard_SOURCES = \
@@ -31,7 +32,6 @@
# xcutsel
-xcutsel_CFLAGS = $(XCLIPBOARD_CFLAGS)
xcutsel_LDADD = $(XCLIPBOARD_LIBS)
xcutsel_SOURCES = \
@@ -45,30 +45,20 @@
# App default files (*.ad)
-appdefaultdir = @appdefaultdir@
-
-
-APPDEFAULTFILES = \
- XClipboard
-
-SUFFIXES = .ad
-
-.ad:
- cp $< $@
+DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
-appdefault_DATA = $(APPDEFAULTFILES)
-
-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad)
+appdefaultdir = @appdefaultdir@
-CLEANFILES = $(APPDEFAULTFILES)
+dist_appdefault_DATA = \
+ app-defaults/XClipboard
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST += $(appman_PRE)
-CLEANFILES += $(appman_DATA)
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
SED = sed
@@ -89,7 +79,17 @@
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-SUFFIXES += .$(APP_MAN_SUFFIX) .man
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+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/xclipboard-X11R7.0-1.0.1/missing new/xclipboard-1.1.0/missing
--- old/xclipboard-X11R7.0-1.0.1/missing 2005-12-21 08:24:33.000000000 +0100
+++ new/xclipboard-1.1.0/missing 2009-10-15 07:37:43.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=2009-04-28.21; # UTC
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -14,9 +18,7 @@
# 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.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -29,6 +31,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -38,18 +42,24 @@
configure_ac=configure.in
fi
-case "$1" in
+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 "\
@@ -67,6 +77,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -74,11 +85,18 @@
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]
+
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
+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,42 +105,69 @@
exit 1
;;
- aclocal*)
+esac
+
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+# 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). This is about non-GNU programs, so use $1 not
+# $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 $program 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."
touch aclocal.m4
;;
- autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autoconf*)
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."
touch configure
;;
- autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autoheader*)
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."
@@ -130,7 +175,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -140,13 +185,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."
@@ -155,21 +195,16 @@
while read f; do touch "$f"; done
;;
- autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autom4te*)
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."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -183,111 +218,108 @@
fi
;;
- bison|yacc)
+ 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."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
- lex|flex)
+ 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."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
- help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ help2man*)
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."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
+ makeinfo*)
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."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
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)
+ 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
@@ -300,13 +332,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -323,8 +355,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 +366,11 @@
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-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# 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/xclipboard-X11R7.0-1.0.1/README new/xclipboard-1.1.0/README
--- old/xclipboard-X11R7.0-1.0.1/README 2005-07-06 19:30:20.000000000 +0200
+++ new/xclipboard-1.1.0/README 2009-10-02 01:00:15.000000000 +0200
@@ -0,0 +1,28 @@
+xclipboard is used to collect and display text selections that are
+sent to the CLIPBOARD by other clients. It is typically used to save
+CLIPBOARD selections for later use. It stores each CLIPBOARD
+selection as a separate string, each of which can be selected.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/app/xclipboard
+
+ http://cgit.freedesktop.org/xorg/app/xclipboard
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
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/xclipboard-X11R7.0-1.0.1/XClipboard.ad new/xclipboard-1.1.0/XClipboard.ad
--- old/xclipboard-X11R7.0-1.0.1/XClipboard.ad 2003-11-14 17:48:58.000000000 +0100
+++ new/xclipboard-1.1.0/XClipboard.ad 1970-01-01 01:00:00.000000000 +0100
@@ -1,126 +0,0 @@
-! $Xorg: XClipboard.ad,v 1.3 2000/08/17 19:54:12 cpqbld Exp $
-*Command*Font: -*-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-1
-*Label*Font: -*-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-1
-*Text*Font: -*-courier-medium-r-normal--*-120-*-*-*-*-iso8859-1
-
-*quit.label: Quit
-*quit.top: ChainTop
-*quit.bottom: ChainTop
-*quit.left: ChainLeft
-*quit.right: ChainLeft
-*quit.translations: #override \n\
- <Btn1Down>,<Btn1Up>:Quit() unset()
-
-*delete.label: Delete
-*delete.fromHoriz: quit
-*delete.top: ChainTop
-*delete.bottom: ChainTop
-*delete.left: ChainLeft
-*delete.right: ChainLeft
-*delete.translations: #override \n\
- <Btn1Down>,<Btn1Up>:DeleteClip() unset()
-
-*new.label: New
-*new.fromHoriz: delete
-*new.top: ChainTop
-*new.bottom: ChainTop
-*new.left: ChainLeft
-*new.right: ChainLeft
-*new.translations: #override \n\
- <Btn1Down>,<Btn1Up>:NewClip() unset()
-
-*save.label: Save
-*save.fromHoriz: new
-*save.top: ChainTop
-*save.bottom: ChainTop
-*save.left: ChainLeft
-*save.right: ChainLeft
-*save.translations: #override \n\
- <Btn1Down>,<Btn1Up>:Save() unset()
-
-*next.label: Next
-*next.fromHoriz: save
-*next.top: ChainTop
-*next.bottom: ChainTop
-*next.left: ChainLeft
-*next.right: ChainLeft
-*next.translations: #override \n\
- <Btn1Down>,<Btn1Up>:NextClip() unset()
-
-*prev.label: Prev
-*prev.fromHoriz: next
-*prev.top: ChainTop
-*prev.bottom: ChainTop
-*prev.left: ChainLeft
-*prev.right: ChainLeft
-*prev.translations: #override \n\
- <Btn1Down>,<Btn1Up>:PrevClip() unset()
-
-*index.fromHoriz: prev
-*index.top: ChainTop
-*index.bottom: ChainTop
-*index.left: ChainLeft
-*index.right: ChainLeft
-*index.resizable: true
-
-*text.scrollVertical: WhenNeeded
-*text.scrollHorizontal: WhenNeeded
-*text.autoFill: on
-
-*text.fromVert: quit
-*text.top: ChainTop
-*text.bottom: ChainBottom
-*text.left: ChainLeft
-*text.right: ChainRight
-*text.resizable: true
-*text.width: 300
-
-XClipboard.geometry: 300x200
-*ShapeStyle: oval
-XClipboard.baseTranslations: #augment\n\
- <Message>WM_PROTOCOLS: WMProtocols()\n
-*TransientShell.baseTranslations: #augment\n\
- <Message>WM_PROTOCOLS: WMProtocols()\n
-
-*fileDialog.label: Save to file:
-*fileDialogShell.allowShellResize: true
-*fileDialogShell.title: File Save
-
-*fileDialog*accept.label: Accept
-*fileDialog*accept.translations: #override\
- <BtnUp>: AcceptSave() unset()
-*fileDialog*value.translations: #override\
- <Key>Return: AcceptSave() \n\
- Ctrl<Key>S: no-op(ring-bell) \n\
- Ctrl<Key>R: no-op(ring-bell) \n\
- Ctrl<Key>M: no-op(ring-bell) \n\
- Ctrl<Key>J: no-op(ring-bell) \n\
- Meta<Key>I: no-op(ring-bell)
-*fileDialog*value.baseTranslations: #override\
- <Key>Return: AcceptSave() \n\
- Ctrl<Key>S: no-op(ring-bell) \n\
- Ctrl<Key>R: no-op(ring-bell) \n\
- Ctrl<Key>M: no-op(ring-bell) \n\
- Ctrl<Key>J: no-op(ring-bell) \n\
- Meta<Key>I: no-op(ring-bell)
-
-*fileDialog*cancel.label: Cancel
-*fileDialog*cancel.translations: #override\
- <BtnUp>:CancelSave() unset()
-
-*failDialog*Label.resizable: true
-*failDialog.label: Can't write file
-*failDialogShell.title: Error
-*failDialogShell.allowShellResize: true
-
-*failDialog*continue.label: Continue
-*failDialog*continue.translations: #override\
- <BtnUp>:FailContinue() unset()
-
-*failDialog*value.translations: #override\
- <Key>Return: FailContinue() \n\
- Ctrl<Key>S: no-op(ring-bell) \n\
- Ctrl<Key>R: no-op(ring-bell) \n\
- Ctrl<Key>M: no-op(ring-bell) \n\
- Ctrl<Key>J: no-op(ring-bell) \n\
- Meta<Key>I: no-op(ring-bell)
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/xclipboard-X11R7.0-1.0.1/xclipboard.c new/xclipboard-1.1.0/xclipboard.c
--- old/xclipboard-X11R7.0-1.0.1/xclipboard.c 2004-04-23 21:54:39.000000000 +0200
+++ new/xclipboard-1.1.0/xclipboard.c 2009-01-13 06:46:49.000000000 +0100
@@ -27,6 +27,7 @@
* Author: Ralph Swick, DEC/Project Athena
* Updated for R4: Chris D. Peterson, MIT X Consortium.
* Reauthored by: Keith Packard, MIT X Consortium.
+ * UTF-8 and CTEXT support: Stanislav Maslovski
*/
/* $XFree86: xc/programs/xclipboard/xclipboard.c,v 1.8tsi Exp $ */
@@ -74,6 +75,11 @@
static void EraseTextWidget ( void );
static void NewCurrentClipContents ( char *data, int len );
+static String fallback_resources[] = {
+ "*international: true",
+ NULL
+};
+
static long
TextLength(Widget w)
{
@@ -130,7 +136,7 @@
newClip = (ClipPtr) malloc (sizeof (ClipRec));
if (!newClip)
return newClip;
- newClip->clip = 0;
+ newClip->clip = NULL;
newClip->avail = 0;
newClip->prev = old;
newClip->next = NULL;
@@ -425,7 +431,7 @@
}
-XtActionsRec xclipboard_actions[] = {
+static XtActionsRec xclipboard_actions[] = {
{ "NewClip", NewCurrentClip },
{ "NextClip", NextCurrentClip },
{ "PrevClip", PrevCurrentClip },
@@ -456,25 +462,70 @@
Atom *type, XtPointer value, unsigned long *length,
int *format)
{
- if (*type != XT_CONVERT_FAIL)
- NewCurrentClipContents ((char *) value, *length);
- else
- {
- Arg arg;
- XtSetArg (arg, XtNlabel, "CLIPBOARD selection conversion failed");
- XtSetValues (failDialog, &arg, 1);
- CenterWidgetOnWidget (failDialogShell, text);
- XtPopup (failDialogShell, XtGrabNone);
+ Display *d = XtDisplay(w);
+ Atom target = (Atom)client_data;
+ Boolean convert_failed = (*type == XT_CONVERT_FAIL);
+
+ if (!convert_failed)
+ {
+ char **list;
+ int i, ret, count;
+
+ XTextProperty prop;
+ prop.value = value;
+ prop.nitems = *length;
+ prop.format = *format;
+ prop.encoding = *type;
+ ret = XmbTextPropertyToTextList(d, &prop, &list, &count);
+ if (ret >= Success)
+ {
+ /* manuals say something about multiple strings in a disjoint
+ text selection (?), it should be harmless to get them all */
+ for (i = 0; i < count; i++)
+ NewCurrentClipContents(list[i], strlen(list[i]));
+ XFreeStringList(list);
+ } else
+ convert_failed = True;
+ XFree(value);
+ }
+
+ if (convert_failed) {
+ /* if UTF8_STRING failed try COMPOUND_TEXT */
+ if (target == XA_UTF8_STRING(d))
+ {
+ XtGetSelectionValue(w, *selection, XA_COMPOUND_TEXT(d),
+ InsertClipboard,
+ (XtPointer)(XA_COMPOUND_TEXT(d)),
+ CurrentTime);
+ return;
+ }
+ /* if COMPOUND_TEXT failed try STRING */
+ else if (target == XA_COMPOUND_TEXT(d))
+ {
+ XtGetSelectionValue(w, *selection, XA_STRING,
+ InsertClipboard,
+ NULL,
+ CurrentTime);
+ return;
+ }
+ /* all conversions failed */
+ else
+ {
+ Arg arg;
+ XtSetArg (arg, XtNlabel, "CLIPBOARD selection conversion failed");
+ XtSetValues (failDialog, &arg, 1);
+ CenterWidgetOnWidget (failDialogShell, text);
+ XtPopup (failDialogShell, XtGrabNone);
#ifdef XKB
- XkbStdBell( XtDisplay(w), XtWindow(w), 0, XkbBI_MinorError );
+ XkbStdBell (d, XtWindow(w), 0, XkbBI_MinorError);
#else
- XBell( XtDisplay(w), 0 );
+ XBell (d, 0);
#endif
+ }
}
XtOwnSelection(top, ClipboardAtom, CurrentTime,
ConvertSelection, LoseSelection, NULL);
- XFree(value);
}
static Boolean
@@ -493,10 +544,12 @@
XmuConvertStandardSelection(w, req->time, selection, target, type,
(XPointer*)&std_targets, &std_length,
format);
- *value = XtMalloc(sizeof(Atom)*(std_length + 5));
+ *value = XtMalloc(sizeof(Atom)*(std_length + 7));
targetP = *(Atom**)value;
*targetP++ = XA_STRING;
*targetP++ = XA_TEXT(d);
+ *targetP++ = XA_UTF8_STRING(d);
+ *targetP++ = XA_COMPOUND_TEXT(d);
*targetP++ = XA_LENGTH(d);
*targetP++ = XA_LIST_LENGTH(d);
*targetP++ = XA_CHARACTER_POSITION(d);
@@ -541,19 +594,38 @@
}
if (*target == XA_STRING ||
- *target == XA_TEXT(d) ||
- *target == XA_COMPOUND_TEXT(d))
- {
- if (*target == XA_COMPOUND_TEXT(d))
- *type = *target;
- else
- *type = XA_STRING;
- *length = TextLength (text);
- *value = _XawTextGetSTRING((TextWidget) text, 0, *length);
- *format = 8;
- return True;
+ *target == XA_TEXT(d) ||
+ *target == XA_UTF8_STRING(d) ||
+ *target == XA_COMPOUND_TEXT(d))
+ {
+ Arg args[1];
+ Widget source;
+ XTextProperty prop;
+ int ret, style = XStdICCTextStyle; /* a safe default for TEXT */
+ char *data;
+
+ source = XawTextGetSource (text);
+ XtSetArg (args[0], XtNstring, &data);
+ XtGetValues (source, args, 1);
+
+ if (*target == XA_UTF8_STRING(d))
+ style = XUTF8StringStyle;
+ else if (*target == XA_COMPOUND_TEXT(d))
+ style = XCompoundTextStyle;
+ else if (*target == XA_STRING)
+ style = XStringStyle;
+
+ ret = XmbTextListToTextProperty (d, &data, 1, style, &prop);
+ if (ret >= Success) {
+ *length = prop.nitems;
+ *value = prop.value;
+ *type = prop.encoding;
+ *format = prop.format;
+ return True;
+ } else
+ return False;
}
-
+
if (XmuConvertStandardSelection(w, req->time, selection, target, type,
(XPointer *) value, length, format))
return True;
@@ -564,8 +636,9 @@
static void
LoseSelection(Widget w, Atom *selection)
{
- XtGetSelectionValue(w, *selection, XA_STRING, InsertClipboard,
- NULL, CurrentTime);
+ Display *d = XtDisplay(w);
+ XtGetSelectionValue(w, *selection, XA_UTF8_STRING(d), InsertClipboard,
+ (XtPointer)(XA_UTF8_STRING(d)), CurrentTime);
}
/*ARGSUSED*/
@@ -592,7 +665,7 @@
#define Offset(field) XtOffsetOf(ResourceData, field)
-XtResource resources[] = {
+static XtResource resources[] = {
{"wrap", "Wrap", XtRBoolean, sizeof(Boolean),
Offset(wrap), XtRImmediate, (XtPointer)False}
};
@@ -610,7 +683,7 @@
XtSetLanguageProc(NULL, NULL, NULL);
top = XtAppInitialize( &xtcontext, "XClipboard", table, XtNumber(table),
- &argc, argv, NULL, NULL, 0);
+ &argc, argv, fallback_resources, NULL, 0);
XtGetApplicationResources(top, (XtPointer)&userOptions, resources,
XtNumber(resources), NULL, 0);
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/xclipboard-X11R7.0-1.0.1/xcutsel.c new/xclipboard-1.1.0/xcutsel.c
--- old/xclipboard-X11R7.0-1.0.1/xcutsel.c 2004-04-23 21:54:39.000000000 +0200
+++ new/xclipboard-1.1.0/xcutsel.c 2009-01-13 06:46:49.000000000 +0100
@@ -62,7 +62,7 @@
int length;
} OptionsRec;
-OptionsRec options;
+static OptionsRec options;
#define Offset(field) XtOffsetOf(OptionsRec, field)
++++++ xclock-1.0.3.tar.bz2 -> xclock-1.0.4.tar.bz2 ++++++
++++ 12230 lines of diff (skipped)
++++++ xcompmgr-1.1.4.tar.bz2 -> xcompmgr-1.1.5.tar.bz2 ++++++
++++ 12957 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/xcompmgr-1.1.4/ChangeLog new/xcompmgr-1.1.5/ChangeLog
--- old/xcompmgr-1.1.4/ChangeLog 2008-03-06 23:01:24.000000000 +0100
+++ new/xcompmgr-1.1.5/ChangeLog 2009-11-03 00:26:12.000000000 +0100
@@ -1,3 +1,102 @@
+commit 2af85f6d21d175c2a16411540d4e44851c803fbe
+Author: Alan Coopersmith
+Date: Mon Nov 2 15:21:09 2009 -0800
+
+ xcompmgr 1.1.5
+
+ Signed-off-by: Alan Coopersmith
+
+commit 664ef69cda82f23a4bdbaff0d7522d81503d3393
+Author: Alan Coopersmith
+Date: Mon Nov 2 14:19:33 2009 -0800
+
+ Add COPYING file with copyright/license notice from xcompmgr.c
+
+ Signed-off-by: Alan Coopersmith
+
+commit 62c0df919bfaf2a379767ad7dc7a0113a8151255
+Author: Alan Coopersmith
+Date: Mon Nov 2 12:55:11 2009 -0800
+
+ Fix formatting of options/arguments in man page
+
+ Signed-off-by: Alan Coopersmith
+
+commit d8068fe9e666bb384a9eeac8983cb1ac8c2824a1
+Author: Alan Coopersmith
+Date: Mon Oct 19 15:48:59 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit 1d7eab63f9aee89767d8083dc971623863173c78
+Author: Alan Coopersmith
+Date: Thu Oct 1 14:54:21 2009 -0700
+
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith
+
+commit f15e054cfb103f78a04ace9eefaecddac8bc70e6
+Author: Yann Droneaud
+Date: Tue Mar 24 12:59:01 2009 +0100
+
+ Try to report current composite manager name
+
+ Try to read NET_WM_CM_Sn owner's NET_WM_NAME (or WM_NAME) property,
+ otherwise report it's window id.
+ Remarks: metacity and kwin currently don't set a window name for
+ NET_WM_CM_Sn owner, but xcompmgr and compiz do. This should be added
+ to wm-spec.
+
+commit 3b6155eb533936f756d9e3e4c5802c188b7db35a
+Author: Yann Droneaud
+Date: Tue Mar 24 12:02:03 2009 +0100
+
+ Check for _NET_WM_CM_Sn before trying to install ourself as composite manager
+
+ Check for a selection owner of _NET_WM_CM_Sn is the first thing to do
+ before taking ownership on it, so clients watching for selection ownership
+ changes won't be disturbed.
+
+commit 56b0b324ae0dbe5dda2bb89ef43427a6c19777bc
+Author: Yann Droneaud
+Date: Tue Mar 24 11:50:20 2009 +0100
+
+ Don't hard code the screen number
+
+commit a78f73b0d01374089ca7fcd838b647f6cfd1663a
+Author: Yann Droneaud
+Date: Thu Mar 26 12:05:30 2009 +0100
+
+ Fix error reporting
+
+ Use the 'name' looked up for extension errors
+ If 'name' is NULL, use XGetErrorText().
+ Report error on stderr.
+
+commit 58d299e54e1198bfa64c39e49c2c0020f9f62b98
+Author: Paulo Cesar Pereira de Andrade
+Date: Mon Jan 19 19:49:37 2009 -0200
+
+ Ansification and compile warning fixes.
+
+ This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
+ make distcheck and all gcc 4.3 and sparse warnings.
+
+commit b04819d129a9a74ab2f17c4a6f9cceabf3aa18d2
+Author: James Cloos
+Date: Wed Apr 2 12:52:40 2008 -0400
+
+ Make usage() report the current version.
+
+commit e895139f38a3fa717ef652ee896f2ea6cc52811f
+Author: Adam Jackson
+Date: Thu Mar 6 17:01:31 2008 -0500
+
+ xcompmgr 1.1.4
+
commit 73f6ed3310d15300ba38f6a338d640705a83ef36
Author: Dana Jansens
Date: Wed Feb 13 11:24:32 2008 -0800
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/xcompmgr-1.1.4/config.h.in new/xcompmgr-1.1.5/config.h.in
--- old/xcompmgr-1.1.4/config.h.in 2008-03-06 23:01:18.000000000 +0100
+++ new/xcompmgr-1.1.5/config.h.in 2009-11-03 00:21:28.000000000 +0100
@@ -58,6 +58,15 @@
/* 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
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
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/xcompmgr-1.1.4/configure.ac new/xcompmgr-1.1.5/configure.ac
--- old/xcompmgr-1.1.4/configure.ac 2008-03-06 22:58:39.000000000 +0100
+++ new/xcompmgr-1.1.5/configure.ac 2009-11-03 00:20:51.000000000 +0100
@@ -2,14 +2,21 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT([xcompmgr], [1.1.4], [xorg@freedesktop.org])
+AC_INIT([xcompmgr], [1.1.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AC_CONFIG_SRCDIR([xcompmgr.c])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
+
+# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+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_CONFIG_HEADER([config.h])
# Checks for programs.
AC_PROG_CC
+XORG_DEFAULT_OPTIONS
# Checks for header files.
AC_HEADER_STDC
@@ -24,6 +31,7 @@
AC_CHECK_FUNCS([gettimeofday localtime_r])
PKG_CHECK_MODULES(XCOMPMGR, xcomposite xfixes xdamage xrender)
+AC_SUBST(XCOMPMGR_CFLAGS)
+AC_SUBST(XCOMPMGR_LIBS)
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
+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/xcompmgr-1.1.4/COPYING new/xcompmgr-1.1.5/COPYING
--- old/xcompmgr-1.1.4/COPYING 1970-01-01 01:00:00.000000000 +0100
+++ new/xcompmgr-1.1.5/COPYING 2009-11-02 23:18:52.000000000 +0100
@@ -0,0 +1,19 @@
+Copyright © 2003 Keith Packard
+
+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, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Keith Packard makes no
+representations about the suitability of this software for any purpose. It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
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/xcompmgr-1.1.4/Makefile.am new/xcompmgr-1.1.5/Makefile.am
--- old/xcompmgr-1.1.4/Makefile.am 2008-03-06 22:58:12.000000000 +0100
+++ new/xcompmgr-1.1.5/Makefile.am 2009-10-20 00:47:29.000000000 +0200
@@ -1,9 +1,8 @@
bin_PROGRAMS = xcompmgr
man_MANS = xcompmgr.1
-xcompmgr_LDADD = @XCOMPMGR_LIBS@ -lm
-
-INCLUDES = @XCOMPMGR_CFLAGS@
+AM_CFLAGS = $(CWARNFLAGS) $(XCOMPMGR_CFLAGS)
+xcompmgr_LDADD = $(XCOMPMGR_LIBS) -lm
EXTRA_DIST = \
autogen.sh \
@@ -15,7 +14,7 @@
.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)
+ $(CHANGELOG_CMD)
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/xcompmgr-1.1.4/missing new/xcompmgr-1.1.5/missing
--- old/xcompmgr-1.1.4/missing 2008-03-06 23:01:19.000000000 +0100
+++ new/xcompmgr-1.1.5/missing 2009-11-03 00:21:29.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# 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).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# 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/xcompmgr-1.1.4/README new/xcompmgr-1.1.5/README
--- old/xcompmgr-1.1.4/README 2008-03-06 22:58:12.000000000 +0100
+++ new/xcompmgr-1.1.5/README 2009-10-16 23:59:28.000000000 +0200
@@ -0,0 +1,27 @@
+xcompmgr is a sample compositing manager for X servers supporting the
+XFIXES, DAMAGE, RENDER, and COMPOSITE extensions. It enables basic
+eye-candy effects.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/app/xcompmgr
+
+ http://cgit.freedesktop.org/xorg/app/xcompmgr
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
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/xcompmgr-1.1.4/xcompmgr.1 new/xcompmgr-1.1.5/xcompmgr.1
--- old/xcompmgr-1.1.4/xcompmgr.1 2008-03-06 22:58:12.000000000 +0100
+++ new/xcompmgr-1.1.5/xcompmgr.1 2009-11-02 21:54:33.000000000 +0100
@@ -3,37 +3,37 @@
.SH NAME
xcompmgr \- sample X compositing manager
.SH SYNOPSIS
-.nf
-.B xcompmgr [\-d display] [\-r radius] [\-o opacity] [\-l left-offset] [\-t top-offset] [\-acCfFnsS]
-.fi
+.BI "xcompmgr [\-d " display "] [\-r " radius "]"
+.BI "[\-o " opacity "] [\-l " left-offset "]"
+.BI "[\-t " top-offset "] [\-acCfFnsS]"
.SH DESCRIPTION
.B xcompmgr
is a sample compositing manager for X servers supporting the XFIXES, DAMAGE,
and COMPOSITE extensions. It enables basic eye-candy effects.
.SH OPTIONS
.TP
-.BI \-d\ display
+.BI \-d\ display
Specifies the display to manage.
.TP
-.BI \-r\ radius
+.BI \-r\ radius
Specifies the blur radius for client-side shadows.
.TP
-.BI \-o\ opacity
+.BI \-o\ opacity
Specifies the opacity for client-side shadows.
.TP
-.BI \-l\ left-offset
+.BI \-l\ left-offset
Specifies the left offset for client-side shadows.
.TP
-.BI \-t\ top-offset
+.BI \-t\ top-offset
Specifies the top offset for client-side shadows.
.TP
-.BI \-I\ fade-in-step
+.BI \-I\ fade-in-step
Specifies the opacity change between steps while fading in.
.TP
-.BI \-O\ fade-out-step
+.BI \-O\ fade-out-step
Specifies the opacity change between steps while fading out.
.TP
-.BI \-D\ fade-delta
+.BI \-D\ fade-delta
Specifies the time (in milliseconds) between steps in a fade.
.TP
.BI \-a
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/xcompmgr-1.1.4/xcompmgr.c new/xcompmgr-1.1.5/xcompmgr.c
--- old/xcompmgr-1.1.4/xcompmgr.c 2008-03-06 22:58:12.000000000 +0100
+++ new/xcompmgr-1.1.5/xcompmgr.c 2009-10-20 00:44:23.000000000 +0200
@@ -104,41 +104,41 @@
Bool gone;
} fade;
-win *list;
-fade *fades;
-Display *dpy;
-int scr;
-Window root;
-Picture rootPicture;
-Picture rootBuffer;
-Picture blackPicture;
-Picture transBlackPicture;
-Picture rootTile;
-XserverRegion allDamage;
-Bool clipChanged;
+static win *list;
+static fade *fades;
+static Display *dpy;
+static int scr;
+static Window root;
+static Picture rootPicture;
+static Picture rootBuffer;
+static Picture blackPicture;
+static Picture transBlackPicture;
+static Picture rootTile;
+static XserverRegion allDamage;
+static Bool clipChanged;
#if HAS_NAME_WINDOW_PIXMAP
-Bool hasNamePixmap;
+static Bool hasNamePixmap;
#endif
-int root_height, root_width;
-ignore *ignore_head, **ignore_tail = &ignore_head;
-int xfixes_event, xfixes_error;
-int damage_event, damage_error;
-int composite_event, composite_error;
-int render_event, render_error;
-Bool synchronize;
-int composite_opcode;
+static int root_height, root_width;
+static ignore *ignore_head, **ignore_tail = &ignore_head;
+static int xfixes_event, xfixes_error;
+static int damage_event, damage_error;
+static int composite_event, composite_error;
+static int render_event, render_error;
+static Bool synchronize;
+static int composite_opcode;
/* find these once and be done with it */
-Atom opacityAtom;
-Atom winTypeAtom;
-Atom winDesktopAtom;
-Atom winDockAtom;
-Atom winToolbarAtom;
-Atom winMenuAtom;
-Atom winUtilAtom;
-Atom winSplashAtom;
-Atom winDialogAtom;
-Atom winNormalAtom;
+static Atom opacityAtom;
+static Atom winTypeAtom;
+static Atom winDesktopAtom;
+static Atom winDockAtom;
+static Atom winToolbarAtom;
+static Atom winMenuAtom;
+static Atom winUtilAtom;
+static Atom winSplashAtom;
+static Atom winDialogAtom;
+static Atom winNormalAtom;
/* opacity property name; sometime soon I'll write up an EWMH spec for it */
#define OPACITY_PROP "_NET_WM_WINDOW_OPACITY"
@@ -146,7 +146,7 @@
#define TRANSLUCENT 0xe0000000
#define OPAQUE 0xffffffff
-conv *gaussianMap;
+static conv *gaussianMap;
#define WINDOW_SOLID 0
#define WINDOW_TRANS 1
@@ -176,30 +176,30 @@
static XserverRegion
win_extents (Display *dpy, win *w);
-CompMode compMode = CompSimple;
+static CompMode compMode = CompSimple;
-int shadowRadius = 12;
-int shadowOffsetX = -15;
-int shadowOffsetY = -15;
-double shadowOpacity = .75;
-
-double fade_in_step = 0.028;
-double fade_out_step = 0.03;
-int fade_delta = 10;
-int fade_time = 0;
-Bool fadeWindows = False;
-Bool excludeDockShadows = False;
-Bool fadeTrans = False;
+static int shadowRadius = 12;
+static int shadowOffsetX = -15;
+static int shadowOffsetY = -15;
+static double shadowOpacity = .75;
+
+static double fade_in_step = 0.028;
+static double fade_out_step = 0.03;
+static int fade_delta = 10;
+static int fade_time = 0;
+static Bool fadeWindows = False;
+static Bool excludeDockShadows = False;
+static Bool fadeTrans = False;
-Bool autoRedirect = False;
+static Bool autoRedirect = False;
/* For shadow precomputation */
-int Gsize = -1;
-unsigned char *shadowCorner = NULL;
-unsigned char *shadowTop = NULL;
+static int Gsize = -1;
+static unsigned char *shadowCorner = NULL;
+static unsigned char *shadowTop = NULL;
-int
-get_time_in_milliseconds ()
+static int
+get_time_in_milliseconds (void)
{
struct timeval tv;
@@ -207,7 +207,7 @@
return tv.tv_sec * 1000 + tv.tv_usec / 1000;
}
-fade *
+static fade *
find_fade (win *w)
{
fade *f;
@@ -217,10 +217,10 @@
if (f->w == w)
return f;
}
- return 0;
+ return NULL;
}
-void
+static void
dequeue_fade (Display *dpy, fade *f)
{
fade **prev;
@@ -236,7 +236,7 @@
}
}
-void
+static void
cleanup_fade (Display *dpy, win *w)
{
fade *f = find_fade (w);
@@ -244,7 +244,7 @@
dequeue_fade (dpy, f);
}
-void
+static void
enqueue_fade (Display *dpy, fade *f)
{
if (!fades)
@@ -264,7 +264,7 @@
if (!f)
{
f = malloc (sizeof (fade));
- f->next = 0;
+ f->next = NULL;
f->w = w;
f->cur = start;
enqueue_fade (dpy, f);
@@ -302,7 +302,7 @@
}
}
-int
+static int
fade_timeout (void)
{
int now;
@@ -317,7 +317,7 @@
return delta;
}
-void
+static void
run_fades (Display *dpy)
{
int now = get_time_in_milliseconds();
@@ -537,7 +537,7 @@
int opacity_int = (int)(opacity * 25);
data = malloc (swidth * sheight * sizeof (unsigned char));
if (!data)
- return 0;
+ return NULL;
ximage = XCreateImage (dpy,
DefaultVisual(dpy, DefaultScreen(dpy)),
8,
@@ -548,7 +548,7 @@
if (!ximage)
{
free (data);
- return 0;
+ return NULL;
}
/*
* Build the gaussian in sections
@@ -646,21 +646,21 @@
shadowPicture = XRenderCreatePicture (dpy, shadowPixmap,
XRenderFindStandardFormat (dpy, PictStandardA8),
- 0, 0);
+ 0, NULL);
if (!shadowPicture)
{
XDestroyImage (shadowImage);
XFreePixmap (dpy, shadowPixmap);
- return None;
+ return (Picture)None;
}
- gc = XCreateGC (dpy, shadowPixmap, 0, 0);
+ gc = XCreateGC (dpy, shadowPixmap, 0, NULL);
if (!gc)
{
XDestroyImage (shadowImage);
XFreePixmap (dpy, shadowPixmap);
XRenderFreePicture (dpy, shadowPicture);
- return None;
+ return (Picture)None;
}
XPutImage (dpy, shadowPixmap, gc, shadowImage, 0, 0, 0, 0,
@@ -674,7 +674,7 @@
return shadowPicture;
}
-Picture
+static Picture
solid_picture (Display *dpy, Bool argb, double a, double r, double g, double b)
{
Pixmap pixmap;
@@ -706,7 +706,7 @@
return picture;
}
-void
+static void
discard_ignore (Display *dpy, unsigned long sequence)
{
while (ignore_head)
@@ -724,19 +724,19 @@
}
}
-void
+static void
set_ignore (Display *dpy, unsigned long sequence)
{
ignore *i = malloc (sizeof (ignore));
if (!i)
return;
i->sequence = sequence;
- i->next = 0;
+ i->next = NULL;
*ignore_tail = i;
ignore_tail = &i->next;
}
-int
+static int
should_ignore (Display *dpy, unsigned long sequence)
{
discard_ignore (dpy, sequence);
@@ -751,13 +751,13 @@
for (w = list; w; w = w->next)
if (w->id == id)
return w;
- return 0;
+ return NULL;
}
static const char *backgroundProps[] = {
"_XROOTPMAP_ID",
"_XSETROOT_ID",
- 0,
+ NULL,
};
static Picture
@@ -906,7 +906,7 @@
paint_all (Display *dpy, XserverRegion region)
{
win *w;
- win *t = 0;
+ win *t = NULL;
if (!region)
{
@@ -927,7 +927,7 @@
rootBuffer = XRenderCreatePicture (dpy, rootPixmap,
XRenderFindVisualFormat (dpy,
DefaultVisual (dpy, scr)),
- 0, 0);
+ 0, NULL);
XFreePixmap (dpy, rootPixmap);
}
#endif
@@ -1021,7 +1021,7 @@
}
if (!w->borderClip)
{
- w->borderClip = XFixesCreateRegion (dpy, 0, 0);
+ w->borderClip = XFixesCreateRegion (dpy, NULL, 0);
XFixesCopyRegion (dpy, w->borderClip, region);
}
w->prev_trans = t;
@@ -1147,7 +1147,7 @@
else
{
XserverRegion o;
- parts = XFixesCreateRegion (dpy, 0, 0);
+ parts = XFixesCreateRegion (dpy, NULL, 0);
set_ignore (dpy, NextRequest (dpy));
XDamageSubtract (dpy, w->damage, None, parts);
XFixesTranslateRegion (dpy, parts,
@@ -1155,7 +1155,7 @@
w->a.y + w->a.border_width);
if (compMode == CompServerShadows)
{
- o = XFixesCreateRegion (dpy, 0, 0);
+ o = XFixesCreateRegion (dpy, NULL, 0);
XFixesCopyRegion (dpy, o, parts);
XFixesTranslateRegion (dpy, o, w->shadow_dx, w->shadow_dy);
XFixesUnionRegion (dpy, parts, parts, o);
@@ -1193,7 +1193,7 @@
w->damaged = 0;
if (fade && fadeWindows)
- set_fade (dpy, w, 0, get_opacity_percent (dpy, w, 1.0), fade_in_step, 0, False, True, True);
+ set_fade (dpy, w, 0, get_opacity_percent (dpy, w, 1.0), fade_in_step, NULL, False, True, True);
}
static void
@@ -1324,7 +1324,7 @@
XA_ATOM, &actual, &format,
&n, &left, &data);
- if (result == Success && data != None)
+ if (result == Success && data != (unsigned char *)None)
{
Atom a;
memcpy (&a, data, sizeof (Atom));
@@ -1355,7 +1355,7 @@
if (w->a.class == InputOnly)
{
- format = 0;
+ format = NULL;
}
else
{
@@ -1378,7 +1378,7 @@
if (w->extents)
{
XserverRegion damage;
- damage = XFixesCreateRegion (dpy, 0, 0);
+ damage = XFixesCreateRegion (dpy, NULL, 0);
XFixesCopyRegion (dpy, damage, w->extents);
add_damage (dpy, damage);
}
@@ -1471,7 +1471,7 @@
new->opacity = OPAQUE;
new->borderClip = None;
- new->prev_trans = 0;
+ new->prev_trans = NULL;
new->windowType = determine_wintype (dpy, new->id);
@@ -1481,7 +1481,7 @@
map_win (dpy, id, new->damage_sequence - 1, True);
}
-void
+static void
restack_win (Display *dpy, win *w, Window new_above)
{
Window old_above;
@@ -1535,7 +1535,7 @@
if (w->usable)
#endif
{
- damage = XFixesCreateRegion (dpy, 0, 0);
+ damage = XFixesCreateRegion (dpy, NULL, 0);
if (w->extents != None)
XFixesCopyRegion (dpy, damage, w->extents);
}
@@ -1741,7 +1741,8 @@
error (Display *dpy, XErrorEvent *ev)
{
int o;
- const char *name = 0;
+ const char *name = NULL;
+ static char buffer[256];
if (should_ignore (dpy, ev->serial))
return 0;
@@ -1772,9 +1773,17 @@
case BadGlyph: name ="BadGlyph"; break;
default: break;
}
-
- printf ("error %d request %d minor %d serial %lu\n",
- ev->error_code, ev->request_code, ev->minor_code, ev->serial);
+
+ if (name == NULL)
+ {
+ buffer[0] = '\0';
+ XGetErrorText (dpy, ev->error_code, buffer, sizeof (buffer));
+ name = buffer;
+ }
+
+ fprintf (stderr, "error %d: %s request %d minor %d serial %lu\n",
+ ev->error_code, (strlen (name) > 0) ? name : "unknown",
+ ev->request_code, ev->minor_code, ev->serial);
/* abort (); this is just annoying to most people */
return 0;
@@ -1842,10 +1851,10 @@
}
#endif
-void
+static void
usage (char *program)
{
- fprintf (stderr, "%s v1.1.3\n", program);
+ fprintf (stderr, "%s v1.1.4\n", program);
fprintf (stderr, "usage: %s [options]\n", program);
fprintf (stderr, "Options\n");
fprintf (stderr, " -d display\n Specifies which display should be managed.\n");
@@ -1867,22 +1876,55 @@
exit (1);
}
-static void
+static Bool
register_cm (void)
{
Window w;
Atom a;
+ static char net_wm_cm[] = "_NET_WM_CM_Sxx";
- w = XCreateSimpleWindow (dpy, RootWindow (dpy, 0), 0, 0, 1, 1, 0, None,
+ snprintf (net_wm_cm, sizeof (net_wm_cm), "_NET_WM_CM_S%d", scr);
+ a = XInternAtom (dpy, net_wm_cm, False);
+
+ w = XGetSelectionOwner (dpy, a);
+ if (w != None)
+ {
+ XTextProperty tp;
+ char **strs;
+ int count;
+ Atom winNameAtom = XInternAtom (dpy, "_NET_WM_NAME", False);
+
+ if (!XGetTextProperty (dpy, w, &tp, winNameAtom) &&
+ !XGetTextProperty (dpy, w, &tp, XA_WM_NAME))
+ {
+ fprintf (stderr,
+ "Another composite manager is already running (0x%lx)\n",
+ (unsigned long) w);
+ return False;
+ }
+ if (XmbTextPropertyToTextList (dpy, &tp, &strs, &count) == Success)
+ {
+ fprintf (stderr,
+ "Another composite manager is already running (%s)\n",
+ strs[0]);
+
+ XFreeStringList (strs);
+ }
+
+ XFree (tp.value);
+
+ return False;
+ }
+
+ w = XCreateSimpleWindow (dpy, RootWindow (dpy, scr), 0, 0, 1, 1, 0, None,
None);
Xutf8SetWMProperties (dpy, w, "xcompmgr", "xcompmgr", NULL, 0, NULL, NULL,
NULL);
- /* FIXME: Don't hard code the screen number */
- a = XInternAtom (dpy, "_NET_WM_CM_S0", False);
-
XSetSelectionOwner (dpy, a, w, 0);
+
+ return True;
}
int
@@ -1894,13 +1936,13 @@
unsigned int nchildren;
int i;
XRenderPictureAttributes pa;
- XRectangle *expose_rects = 0;
+ XRectangle *expose_rects = NULL;
int size_expose = 0;
int n_expose = 0;
struct pollfd ufd;
int p;
int composite_major, composite_minor;
- char *display = 0;
+ char *display = NULL;
int o;
while ((o = getopt (argc, argv, "D:I:O:d:r:o:l:t:scnfFCaS")) != -1)
@@ -2006,7 +2048,10 @@
exit (1);
}
- register_cm();
+ if (!register_cm())
+ {
+ exit (1);
+ }
/* get atoms */
opacityAtom = XInternAtom (dpy, OPACITY_PROP, False);
@@ -2163,7 +2208,7 @@
{
if (fadeTrans)
set_fade (dpy, w, w->opacity*1.0/OPAQUE, get_opacity_percent (dpy, w, 1.0),
- fade_out_step, 0, False, True, False);
+ fade_out_step, NULL, False, True, False);
else
{
w->opacity = get_opacity_prop(dpy, w, OPAQUE);
++++++ xditview-X11R7.0-1.0.1.tar.bz2 -> xditview-1.0.2.tar.bz2 ++++++
++++ 20289 lines of diff (skipped)
++++++ xdm-1.1.9.tar.bz2 -> xdm-1.1.10.tar.bz2 ++++++
++++ 74809 lines of diff (skipped)
++++++ xeyes-X11R7.0-1.0.1.tar.bz2 -> xeyes-1.1.0.tar.bz2 ++++++
++++ 18678 lines of diff (skipped)
++++++ xgc-X11R7.0-1.0.1.tar.bz2 -> xgc-1.0.2.tar.bz2 ++++++
++++ 23403 lines of diff (skipped)
++++++ xinit-1.1.1.tar.bz2 -> xinit-1.2.1.tar.bz2 ++++++
++++ 18891 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/xinit-1.1.1/ChangeLog new/xinit-1.2.1/ChangeLog
--- old/xinit-1.1.1/ChangeLog 2008-12-18 00:24:43.000000000 +0100
+++ new/xinit-1.2.1/ChangeLog 2010-03-15 23:45:05.000000000 +0100
@@ -1,3 +1,262 @@
+commit eb541d73b35716e1deaccc3c328473e04a5ef024
+Author: Jeremy Huddleston
+Date: Mon Mar 15 15:41:48 2010 -0700
+
+ Update to version 1.2.1 for release.
+
+ Signed-off-by: Jeremy Huddleston
+
+commit 17b65f4420a958c577fd17d91f332465cf9fbfa5
+Author: Jeremy Huddleston
+Date: Mon Mar 15 15:39:06 2010 -0700
+
+ Updates for .gitignore
+
+ Signed-off-by: Jeremy Huddleston
+
+commit 3d82396b95bff8ed6028e36cf3aed1f1189ba909
+Author: Jeremy Huddleston
+Date: Thu Mar 11 16:09:35 2010 -0800
+
+ darwin: Handle home directories that contain a single-quote (')
+
+ Signed-off-by: Jeremy Huddleston
+
+commit ad11d954cf296f2bfbe25ad483459c8485197dd1
+Author: Jeremy Huddleston
+Date: Thu Mar 11 10:24:11 2010 -0800
+
+ Quiet warning for fts_open
+
+ Signed-off-by: Jeremy Huddleston
+
+commit b61c4977d96fbaabdfb8213d2b9cc2e1416952f1
+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 9d15780beb5db0d39cc34ef2d9f3157fa5a81e57
+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 f60d8d7272efb6da4fd91df9675d9281e4230d9f
+Author: Gaetan Nadon
+Date: Tue Oct 27 15:07:25 2009 -0400
+
+ Deploy the new XORG_DEFAULT_OPTIONS #24242
+
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file from
+ future changes.
+
+commit b748221cf9e7df8b0b460f13f4ad0a86ff7f1b6d
+Author: Gaetan Nadon
+Date: Thu Oct 22 16:23:27 2009 -0400
+
+ Makefile.am: do not include autogen.sh in distribution #24183
+
+ This is a private build script that should not be distributed
+
+commit 85cd7aa2f632d159af38252639a3020bf9ee18a1
+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 d243b9943879ec2790d65785805aefdfbb64a378
+Author: Rémi Cardona
+Date: Sat Nov 14 14:51:59 2009 +0100
+
+ xinit 1.2.0
+
+ Signed-off-by: Rémi Cardona
+
+commit 561b6c70648b585e36241c898f0b2dbba3cb2d24
+Author: Jeremy Huddleston
+Date: Tue Oct 27 18:24:31 2009 -0700
+
+ Apple: Export X11_PREFS_DOMAIN for children (quartz-wm)
+
+commit 9b89862981070cf9e381512055a778f451c88905
+Author: Jeremy Huddleston
+Date: Wed Oct 21 12:47:20 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 82747989c1332290fabec8b9da38aad05282301f
+Author: Alan Coopersmith
+Date: Fri Oct 16 20:27:17 2009 -0700
+
+ Use platform-specific X server names in man pages for cygwin & darwin
+
+ Signed-off-by: Alan Coopersmith
+ Signed-off-by: Jeremy Huddleston
+ Tested-by: Jon TURNEY
+
+commit c2a5751175b11d3206805468aae1ddecd02c4a98
+Author: Rémi Cardona
+Date: Sat Oct 3 11:50:12 2009 +0200
+
+ make XINITDIR configurable at build-time, default is unchanged
+
+ Signed-off-by: Rémi Cardona
+
+commit 2861f9cf845107870f9d5e9898e5cd4baba8d8f7
+Author: Alan Coopersmith
+Date: Sat Oct 3 15:28:27 2009 -0700
+
+ Strip RCS/CVS tags
+
+ Signed-off-by: Alan Coopersmith
+
+commit 536a3e66159bb4cbd75b861b9b942da5b1885a26
+Author: Alan Coopersmith