Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Tue Nov 2 10:53:04 CET 2010.
--------
--- xorg-x11/xorg-x11.changes 2010-10-24 11:59:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2010-11-02 01:06:51.000000000 +0100
@@ -1,0 +2,174 @@
+Mon Nov 1 23:40:43 UTC 2010 - sndirsch@novell.com
+
+- xdbedizzy 1.1.0
+ * Previous versions included code interacting with the XPrint
+ extension as well, but as a double buffered spinning printer
+ spewing animated output is one of the clearest signs of demonic
+ possession ever seen, that code has been exorcised from this
+ release. Should anyone desire to dance with that demon, the
+ proper git incantations could be invoked to call forth a new
+ 1.0.x branch from the depths of the repository.
+ Aside from that, this release also includes assorted other work
+ by the X.Org janitors to scrub the build configuration and
+ purify the code since the 1.0.2 release in 2006. So what's for
+ dessert?
+- xf86dga 1.0.3
+ * This release raises the dependency on libXxf86dga to require a
+ minimum of version 1.1.0 to get the new Xxf86dga.h header
+ instead of the now deprecated xf86dga.h. However, it also
+ removes unused dependencies on libXaw, libXt, and libXmu that
+ were previously declared.
+ It also delivers the build configuration improvements and other
+ janitorial cleanups that have built up since the 1.0.2 release
+ in 2006.
+- appres 1.0.3
+ * This minor maintenance release provides the specified collection
+ of build configuration improvements and janitorial cleanup
+ instances.
+
+-------------------------------------------------------------------
+Sun Oct 31 03:06:11 UTC 2010 - sndirsch@novell.com
+
+- beforelight 1.0.4
+ * This minor maintenance release provides the usual recent collection of
+ build configuration improvements and janitorial cleanups, plus a bunch
+ more from years past that had been sitting in git for a long time.
+- editres 1.0.5
+ * This minor maintenance release provides the usual recent collection of
+ build configuration improvements and janitorial cleanups.
+- fslsfonts 1.0.3
+ * This minor maintenance release provides several years worth of accumulated
+ build configuration improvements and janitorial cleanups.
+- fstobdf 1.0.4
+ * This minor maintenance release provides a few years worth of accumulated
+ build configuration improvements and janitorial cleanups.
+- ico 1.0.3
+ * This minor maintenance release includes a bugfix for handling expose
+ events in multiple threads, along with multiple years worth of accumulated
+ build configuration improvements and janitorial cleanups.
+- proxymngr 1.0.2
+ * First new release of xproxymngr since X11R7.0, with 5 years worth of
+ accumulated build configuration improvements and janitorial cleanups.
+- rstart 1.0.4
+ * This release moves the protocol specification document from xorg-docs to
+ this module, though it's still in troff format, and not built or
+ translated as part of the build process.
+- showfont 1.0.3
+ * This minor maintenance release provides a couple years worth of build
+ configuration improvements and janitorial cleanups.
+- twm 1.0.5
+ * This minor maintenance release provides the last two years' Worth of build
+ configuration improvements, janitorial cleanups, & Makefile.am support for
+ automake-1.11 silent builds.
+- viewres 1.0.3
+ * This minor maintenance release provides the usual recent collection of
+ build configuration improvements and janitorial cleanups.
+- xcursor-themes 1.0.3
+ * This minor maintenance release provides the usual recent collection of
+ build configuration improvements and janitorial cleanups.
+- xedit 1.2.0
+ * This release includes bug fixes, removal of support for Xprint/Xaw8, and
+ several years worth of build configuration improvements and janitorial
+ cleanups.
+- xev 1.1.0
+ * This release adds the -root option to specify monitoring root window
+ events.
+- xfs 1.1.1
+ * This release includes a couple bug fixes in the code, improved handling of
+ the included DocBook XML documentation, and the usual recent collection of
+ build configuration improvements and janitorial cleanups.
+- xfsinfo 1.0.3
+ * This minor maintenance release provides the usual recent collection of
+ build configuration improvements and janitorial cleanups, plus a small
+ tweak to default to "unix/:-1" when no font server address is specified.
+- xgc 1.0.3
+ * This minor maintenance release provides the usual recent collection of
+ build configuration improvements and janitorial cleanups.
+- xhost 1.0.4
+ * This release updates the man page to clarify the /etc/X*.hosts files, as
+ well as delivering the usual recent collection of build configuration
+ improvements and janitorial cleanups.
+- xinit 1.3.0
+ * This release adds support for an xinitrc.d directory to contain startup
+ script snippets on all systems. It also features a number of
+ modernizations and cleanups of the code base.
+- xkbcomp 1.2.0
+ * This release provides performance improvements and bug fixes, mixed in
+ with the usual recent collection of build configuration improvements and
+ janitorial cleanups.
+- xkbevd 1.1.1
+ * This minor maintenance release helps show our appreciation for the hard
+ work of the janitors cleaning the code base, so they don't "accidentally"
+ lock me in the broom closet again.
+- xkbutils 1.0.3
+ * This minor maintenance release provides a filled-in COPYING file for the
+ benefit of packagers who use that to pass on the notices required by the
+ MIT license to their users, and uses more accurate lists of the
+ dependencies required to build these programs.
+ Oh, and of course, it also includes the usual recent collection of build
+ configuration improvements and janitorial cleanups, but you could probably
+ guess that after the last twenty mails to xorg-announce.
+- xlogo 1.0.3
+ * This minor maintenance release provides the usual recent collection of
+ build configuration improvements and janitorial cleanups.
+- xmag 1.0.4
+ * If you look closely at this tiny little release, you might find the usual
+ collection of recent build configuration improvements and janitorial
+ cleanups.
+- xman 1.1.1
+ * This minor maintenance release provides the usual recent collection of
+ manually generated build configuration improvements and janitorial
+ cleanups.
+- xmh 1.0.2
+ * Just in case anyone might still be using this program, this release
+ provides compatibility with a world without Xaw8, and provides five years
+ worth of build configuration improvements and janitorial cleanups in its
+ first release since the original X11R7.0 katamari.
+- xprop 1.2.0
+ * This release adds support for printing UTF8_STRING properties as UTF-8
+ strings in appropriate locales, including a new "u" specifier for the
+ -format option.
+- xrandr 1.3.4
+ * This release corrects a mistake in the man page, and fixes the reporting
+ of missing RandR extension support when connecting to servers not
+ supporting it (such as Xorg releases with the Xinerama extension enabled).
+- xrx 1.0.4
+ * This minor maintenance release provides some of the usual recent build
+ configuration improvements and janitorial cleanups.
+- xsetroot 1.1.0
+ * This release adds the ability to load an arbitrary ARGB cursor file via
+ the new -xcf command line flag. In Keith's words:
+ Instead of having to construct a whole cursor theme and play with the
+ environment variables in Xlib to set a random ARGB cursor, this lets the
+ user set whatever they like directly from a file.
+- xwininfo 1.1.1
+ * This bug-fix release corrects two issues introduced in the xcb port in the
+ 1.1.0 release: a build issue with the optional support for the xcb-icccm
+ library, and a runtime issue with reporting coordinates for windows
+ extending into the negative parts of the coordinate space.
+- xscope 1.3
+ * This version adds basic support for decoding GLX extension requests and
+ improved transport layer selection/fallback.
+- adjusted patches
+ * proxymngr.diff
+ * rstart.diff
+ * xinit-client-session.patch
+- new Buildrequires: bison
+
+-------------------------------------------------------------------
+Sat Oct 30 15:53:37 UTC 2010 - sndirsch@novell.com
+
+- bdftopcf 1.0.3
+ * This minor maintenance release unsurprisingly provides the
+ usual recent collection of build configuration improvements
+ and janitorial cleanups.
+- iceauth 1.0.4
+ * In this minor maintenance release you may find the usual recent
+ collection of build configuration improvements and janitorial
+ cleanups.
+- mkfontscale 1.0.8
+ * This minor maintenance release provides the usual recent
+ collection of janitorial cleanups and build configuration
+ improvements.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
appres-1.0.2.tar.bz2
bdftopcf-1.0.2.tar.bz2
beforelight-1.0.3.tar.bz2
editres-1.0.4.tar.bz2
fslsfonts-1.0.2.tar.bz2
fstobdf-1.0.3.tar.bz2
iceauth-1.0.3.tar.bz2
ico-1.0.2.tar.bz2
mkfontscale-1.0.7.tar.bz2
proxymngr-X11R7.0-1.0.1.tar.bz2
rstart-1.0.3.tar.bz2
showfont-1.0.2.tar.bz2
twm-1.0.4.tar.bz2
viewres-1.0.2.tar.bz2
xcursor-themes-1.0.2.tar.bz2
xdbedizzy-1.0.2.tar.bz2
xedit-1.1.2.tar.bz2
xev-1.0.4.tar.bz2
xf86dga-1.0.2.tar.bz2
xfs-1.1.0.tar.bz2
xfsinfo-1.0.2.tar.bz2
xgc-1.0.2.tar.bz2
xhost-1.0.3.tar.bz2
xinit-1.2.1.tar.bz2
xkbcomp-1.1.1.tar.bz2
xkbevd-1.1.0.tar.bz2
xkbutils-1.0.2.tar.bz2
xlogo-1.0.2.tar.bz2
xmag-1.0.3.tar.bz2
xman-1.1.0.tar.bz2
xmh-X11R7.0-1.0.1.tar.bz2
xprop-1.1.0.tar.bz2
xrandr-1.3.3.tar.bz2
xrx-1.0.3.tar.bz2
xscope-1.2.tar.bz2
xsetroot-1.0.3.tar.bz2
xwininfo-1.1.0.tar.bz2
New:
----
appres-1.0.3.tar.bz2
bdftopcf-1.0.3.tar.bz2
beforelight-1.0.4.tar.bz2
editres-1.0.5.tar.bz2
fslsfonts-1.0.3.tar.bz2
fstobdf-1.0.4.tar.bz2
iceauth-1.0.4.tar.bz2
ico-1.0.3.tar.bz2
mkfontscale-1.0.8.tar.bz2
proxymngr-1.0.2.tar.bz2
rstart-1.0.4.tar.bz2
showfont-1.0.3.tar.bz2
twm-1.0.5.tar.bz2
viewres-1.0.3.tar.bz2
xcursor-themes-1.0.3.tar.bz2
xdbedizzy-1.1.0.tar.bz2
xedit-1.2.0.tar.bz2
xev-1.1.0.tar.bz2
xf86dga-1.0.3.tar.bz2
xfs-1.1.1.tar.bz2
xfsinfo-1.0.3.tar.bz2
xgc-1.0.3.tar.bz2
xhost-1.0.4.tar.bz2
xinit-1.3.0.tar.bz2
xkbcomp-1.2.0.tar.bz2
xkbevd-1.1.1.tar.bz2
xkbutils-1.0.3.tar.bz2
xlogo-1.0.3.tar.bz2
xmag-1.0.4.tar.bz2
xman-1.1.1.tar.bz2
xmh-1.0.2.tar.bz2
xprop-1.2.0.tar.bz2
xrandr-1.3.4.tar.bz2
xrx-1.0.4.tar.bz2
xscope-1.3.tar.bz2
xsetroot-1.1.0.tar.bz2
xwininfo-1.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.oEKr7h/_old 2010-11-02 10:52:34.000000000 +0100
+++ /var/tmp/diff_new_pack.oEKr7h/_new 2010-11-02 10:52:34.000000000 +0100
@@ -20,9 +20,10 @@
Name: xorg-x11
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
+BuildRequires: bison
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 27
+Release: 28
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -32,32 +33,32 @@
Provides: XFree86 xcompmgr xrestop
Obsoletes: xcompmgr xrestop
Summary: X.Org core and sample applications
-Source0: appres-1.0.2.tar.bz2
-Source1: bdftopcf-1.0.2.tar.bz2
-Source2: beforelight-1.0.3.tar.bz2
+Source0: appres-1.0.3.tar.bz2
+Source1: bdftopcf-1.0.3.tar.bz2
+Source2: beforelight-1.0.4.tar.bz2
Source3: bitmap-1.0.5.tar.bz2
-Source4: editres-1.0.4.tar.bz2
+Source4: editres-1.0.5.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
+Source6: fslsfonts-1.0.3.tar.bz2
+Source7: fstobdf-1.0.4.tar.bz2
+Source8: iceauth-1.0.4.tar.bz2
+Source9: ico-1.0.3.tar.bz2
Source10: lbxproxy-1.0.2.tar.bz2
Source11: listres-1.0.2.tar.bz2
Source12: luit-1.1.0.tar.bz2
Source14: mkfontdir-1.0.5.tar.bz2
-Source15: mkfontscale-1.0.7.tar.bz2
+Source15: mkfontscale-1.0.8.tar.bz2
Source16: oclock-1.0.2.tar.bz2
-Source17: proxymngr-X11R7.0-1.0.1.tar.bz2
+Source17: proxymngr-1.0.2.tar.bz2
Source18: rgb-1.0.4.tar.bz2
-Source19: rstart-1.0.3.tar.bz2
+Source19: rstart-1.0.4.tar.bz2
Source20: scripts-X11R7.0-1.0.1.tar.bz2
Source21: sessreg-1.0.6.tar.bz2
Source22: setxkbmap-1.2.0.tar.bz2
-Source23: showfont-1.0.2.tar.bz2
+Source23: showfont-1.0.3.tar.bz2
Source24: smproxy-1.0.4.tar.bz2
-Source25: twm-1.0.4.tar.bz2
-Source26: viewres-1.0.2.tar.bz2
+Source25: twm-1.0.5.tar.bz2
+Source26: viewres-1.0.3.tar.bz2
Source27: x11perf-1.5.2.tar.bz2
Source28: xauth-1.0.5.tar.bz2
Source29: xbiff-1.0.2.tar.bz2
@@ -66,61 +67,61 @@
Source32: xclock-1.0.5.tar.bz2
Source33: xcmsdb-1.0.3.tar.bz2
Source34: xconsole-1.0.4.tar.bz2
-Source35: xcursor-themes-1.0.2.tar.bz2
+Source35: xcursor-themes-1.0.3.tar.bz2
Source36: xcursorgen-1.0.4.tar.bz2
-Source37: xdbedizzy-1.0.2.tar.bz2
+Source37: xdbedizzy-1.1.0.tar.bz2
Source38: xditview-1.0.2.tar.bz2
Source39: xdm-1.1.10.tar.bz2
Source40: xdpyinfo-1.2.0.tar.bz2
-Source42: xedit-1.1.2.tar.bz2
-Source43: xev-1.0.4.tar.bz2
+Source42: xedit-1.2.0.tar.bz2
+Source43: xev-1.1.0.tar.bz2
Source44: xeyes-1.1.0.tar.bz2
-Source45: xf86dga-1.0.2.tar.bz2
+Source45: xf86dga-1.0.3.tar.bz2
Source46: xfd-1.1.0.tar.bz2
Source47: xfindproxy-X11R7.0-1.0.1.tar.bz2
Source48: xfontsel-1.0.3.tar.bz2
-Source49: xfs-1.1.0.tar.bz2
-Source50: xfsinfo-1.0.2.tar.bz2
+Source49: xfs-1.1.1.tar.bz2
+Source50: xfsinfo-1.0.3.tar.bz2
Source51: xfwp-X11R7.0-1.0.1.tar.bz2
Source52: xgamma-1.0.3.tar.bz2
-Source53: xgc-1.0.2.tar.bz2
-Source54: xhost-1.0.3.tar.bz2
-Source55: xinit-1.2.1.tar.bz2
-Source56: xkbcomp-1.1.1.tar.bz2
-Source57: xkbevd-1.1.0.tar.bz2
+Source53: xgc-1.0.3.tar.bz2
+Source54: xhost-1.0.4.tar.bz2
+Source55: xinit-1.3.0.tar.bz2
+Source56: xkbcomp-1.2.0.tar.bz2
+Source57: xkbevd-1.1.1.tar.bz2
Source58: xkbprint-1.0.2.tar.bz2
-Source59: xkbutils-1.0.2.tar.bz2
+Source59: xkbutils-1.0.3.tar.bz2
Source60: xkill-1.0.2.tar.bz2
Source61: xload-1.1.0.tar.bz2
-Source62: xlogo-1.0.2.tar.bz2
+Source62: xlogo-1.0.3.tar.bz2
Source63: xlsatoms-1.1.0.tar.bz2
Source64: xlsclients-1.1.1.tar.bz2
Source65: xlsfonts-1.0.3.tar.bz2
-Source66: xmag-1.0.3.tar.bz2
-Source67: xman-1.1.0.tar.bz2
+Source66: xmag-1.0.4.tar.bz2
+Source67: xman-1.1.1.tar.bz2
Source68: xmessage-1.0.3.tar.bz2
-Source69: xmh-X11R7.0-1.0.1.tar.bz2
+Source69: xmh-1.0.2.tar.bz2
Source70: xmodmap-1.0.5.tar.bz2
Source71: xmore-1.0.2.tar.bz2
Source73: xplsprinters-X11R7.0-1.0.1.tar.bz2
Source74: xpr-1.0.3.tar.bz2
Source75: xprehashprinterlist-X11R7.0-1.0.1.tar.bz2
-Source76: xprop-1.1.0.tar.bz2
-Source77: xrandr-1.3.3.tar.bz2
+Source76: xprop-1.2.0.tar.bz2
+Source77: xrandr-1.3.4.tar.bz2
Source78: xrdb-1.0.6.tar.bz2
Source79: xrefresh-1.0.3.tar.bz2
-Source80: xrx-1.0.3.tar.bz2
+Source80: xrx-1.0.4.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
+Source84: xsetroot-1.1.0.tar.bz2
Source85: xsm-1.0.2.tar.bz2
Source86: xstdcmap-1.0.2.tar.bz2
Source87: xtrap-X11R7.1-1.0.2.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.1.0.tar.bz2
+Source91: xwininfo-1.1.1.tar.bz2
Source92: xwud-1.0.2.tar.bz2
Source93: mkcomposecache-1.2.1.tar.bz2
Source94: rendercheck-1.3.tar.bz2
@@ -128,7 +129,7 @@
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
+Source100: xscope-1.3.tar.bz2
Source200: misc.tar.bz2
Source201: twm.tar.bz2
Source202: xdm.tar.bz2
++++++ appres-1.0.2.tar.bz2 -> appres-1.0.3.tar.bz2 ++++++
++++ 8628 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.2/appres.c new/appres-1.0.3/appres.c
--- old/appres-1.0.2/appres.c 2009-01-22 16:08:45.000000000 +0100
+++ new/appres-1.0.3/appres.c 2010-10-07 05:30:03.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Xorg: appres.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $
- *
*
Copyright 1989, 1998 The Open Group
@@ -27,8 +25,6 @@
* Author: Jim Fulton, MIT X Consortium
*/
-/* $XFree86: xc/programs/appres/appres.c,v 1.3 2001/01/17 23:44:49 dawes Exp $ */
-
#include
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.2/appres.man new/appres-1.0.3/appres.man
--- old/appres-1.0.2/appres.man 2007-01-02 22:41:08.000000000 +0100
+++ new/appres-1.0.3/appres.man 2010-10-07 05:30:03.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Xorg: appres.man,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $
.\" Copyright 1993, 1994, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,8 +22,6 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/appres/appres.man,v 1.8 2001/12/14 20:00:38 dawes Exp $
-.\"
.TH APPRES 1 __xorgversion__
.SH NAME
appres \- list X application resource database
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.2/ChangeLog new/appres-1.0.3/ChangeLog
--- old/appres-1.0.2/ChangeLog 2009-09-22 03:11:29.000000000 +0200
+++ new/appres-1.0.3/ChangeLog 2010-10-31 19:51:23.000000000 +0100
@@ -1,3 +1,132 @@
+commit 65538c8269ac6d29affa47ef54fa7f606174257a
+Author: Alan Coopersmith
+Date: Sun Oct 31 11:50:55 2010 -0700
+
+ appres 1.0.3
+
+ Signed-off-by: Alan Coopersmith
+
+commit 9fe02e07bc234b7f11f45142d4eac5aa0d20180a
+Author: Alan Coopersmith
+Date: Sun Oct 31 11:46:29 2010 -0700
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM sttaements under the Automake initialization section.
+ Add missing AC_CONFIG_SRCDIR
+
+ Signed-off-by: Alan Coopersmith
+
+commit 86071577ed5f809b7b415b5a706dbd5d84de277c
+Author: Alan Coopersmith
+Date: Sun Oct 31 11:43:28 2010 -0700
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith
+
+commit 108950ed5f2c3774e8ebdb2bb2fe74ff071c56ef
+Author: Gaetan Nadon
+Date: Sun Oct 31 11:42:21 2010 -0700
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+ Signed-off-by: Alan Coopersmith
+
+commit 60497f02ed0adc3fbda4457f93f50e0fdba44af2
+Author: Jesse Adkins
+Date: Tue Sep 28 13:29:48 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins
+ Signed-off-by: Alan Coopersmith
+
+commit c58c7269e6dc3c7f78d76ef7a1606331dcf05b5a
+Author: Alan Coopersmith
+Date: Wed Jun 30 23:25:03 2010 -0700
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ The existing statement can now be removed from the configuration file.
+
+ Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
+ Enables silent rule and use platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith
+
+commit e6ef21fbc81183828c14e89f686a5e21dcde5156
+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 db1d9daa9c8527f1cbcab941c72f7b923343b188
+Author: Gaetan Nadon
+Date: Wed Oct 28 14:08:40 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 e427b7282cb07885b9be98ee238c544bfc9e40b0
+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 ccc0bb4529524b9570621af2be47d524eb65fd78
+Author: Gaetan Nadon
+Date: Mon Oct 26 22:08:37 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 89f99df94a4b2fd2836b639e9df162a8c7afe5e5
+Author: Gaetan Nadon
+Date: Thu Oct 22 12:33:38 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 05aaa3eb156ac0fc2eb0cb449d7c3b903614f857
+Author: Gaetan Nadon
+Date: Sun Sep 27 15:22:36 2009 -0400
+
+ Makefile.am: do not include autogen.sh in distribution #24183
+
+ This is a private build script that should not be distributed
+
commit a42a18d12a23c763acabea045b22a9efbac3e569
Author: Alan Coopersmith
Date: Mon Sep 21 18:10:39 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/appres-1.0.2/config.h.in new/appres-1.0.3/config.h.in
--- old/appres-1.0.2/config.h.in 2009-09-22 03:11:10.000000000 +0200
+++ new/appres-1.0.3/config.h.in 2010-10-31 19:51:18.000000000 +0100
@@ -42,6 +42,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.2/configure.ac new/appres-1.0.3/configure.ac
--- old/appres-1.0.2/configure.ac 2009-09-22 03:10:28.000000000 +0200
+++ new/appres-1.0.3/configure.ac 2010-10-31 19:50:51.000000000 +0100
@@ -21,25 +21,24 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-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)
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([appres], [1.0.3],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [appres])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([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
+# Initialize Automake
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(APPRES, x11 xt)
-AC_SUBST(APPRES_CFLAGS)
-AC_SUBST(APPRES_LIBS)
AC_OUTPUT([Makefile])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.2/INSTALL new/appres-1.0.3/INSTALL
--- old/appres-1.0.2/INSTALL 2006-07-11 04:50:24.000000000 +0200
+++ new/appres-1.0.3/INSTALL 2010-10-31 19:51:23.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/appres-1.0.2/Makefile.am new/appres-1.0.3/Makefile.am
--- old/appres-1.0.2/Makefile.am 2009-09-22 03:06:50.000000000 +0200
+++ new/appres-1.0.3/Makefile.am 2010-07-02 03:40:57.000000000 +0200
@@ -34,38 +34,23 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
+EXTRA_DIST = $(appman_PRE) autogen.sh
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-MAINTAINERCLEANFILES=ChangeLog
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
-
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+dist-hook: ChangeLog INSTALL
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
++++++ bdftopcf-1.0.2.tar.bz2 -> bdftopcf-1.0.3.tar.bz2 ++++++
++++ 8782 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/bdftopcf-1.0.2/bdftopcf.c new/bdftopcf-1.0.3/bdftopcf.c
--- old/bdftopcf-1.0.2/bdftopcf.c 2007-04-25 05:04:09.000000000 +0200
+++ new/bdftopcf-1.0.3/bdftopcf.c 2010-10-07 05:31:05.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: bdftopcf.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */
/*
Copyright 1991, 1993, 1998 The Open Group
@@ -27,8 +26,6 @@
*/
-/* $XFree86: xc/programs/bdftopcf/bdftopcf.c,v 1.4 2001/08/01 00:45:00 tsi Exp $ */
-
#include
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bdftopcf-1.0.2/bdftopcf.man new/bdftopcf-1.0.3/bdftopcf.man
--- old/bdftopcf-1.0.2/bdftopcf.man 2006-07-11 04:50:27.000000000 +0200
+++ new/bdftopcf-1.0.3/bdftopcf.man 2010-10-07 05:31:05.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Xorg: bdftopcf.man,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $
.\" Copyright 1993, 1994, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,8 +22,6 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/bdftopcf/bdftopcf.man,v 1.7 2001/01/27 18:21:00 dawes Exp $
-.\"
.TH BDFTOPCF 1 __xorgversion__
.SH NAME
bdftopcf \- convert X font from Bitmap Distribution Format to Portable
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/bdftopcf-1.0.2/ChangeLog new/bdftopcf-1.0.3/ChangeLog
--- old/bdftopcf-1.0.2/ChangeLog 2009-09-22 04:58:17.000000000 +0200
+++ new/bdftopcf-1.0.3/ChangeLog 2010-10-30 04:54:17.000000000 +0200
@@ -1,3 +1,118 @@
+commit bd6356693855f22de4fa50696c19f5bd8103aa88
+Author: Alan Coopersmith
+Date: Fri Oct 29 19:53:54 2010 -0700
+
+ bdftopcf 1.0.3
+
+ Signed-off-by: Alan Coopersmith
+
+commit 423c3438394aa762feb9038e54e061f1761be252
+Author: Alan Coopersmith
+Date: Fri Oct 29 19:52:06 2010 -0700
+
+ Remove unnecessary calls from configure.ac
+
+ XORG_DEFAULT_OPTIONS calls AC_PROG_CC
+ PKG_CHECK_MODULES calls AC_SUBST for CFLAGS and LIBS
+
+ Signed-off-by: Alan Coopersmith
+
+commit 89573e80d65db01ff12426781394969857bad715
+Author: Gaetan Nadon
+Date: Tue Jul 20 18:45:18 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+
+commit 7de8e74341322be5e6f4830478d477ef17c13a4a
+Author: Jesse Adkins
+Date: Tue Sep 28 13:29:48 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins
+
+commit 9615bfc454af6cb489e9572895ef00af022303b1
+Author: Alan Coopersmith
+Date: Thu Jul 22 19:10:24 2010 -0700
+
+ Use AM_CFLAGS instead of bdftopcf_CFLAGS since there's only one target
+
+ Signed-off-by: Alan Coopersmith
+
+commit ff16701d9054e47f1205e6ba4372077bd136062c
+Author: Alan Coopersmith
+Date: Thu Jul 22 19:07:08 2010 -0700
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ The existing statement can now be removed from the configuration file.
+
+ Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
+ Enables silent rule and use platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith
+
+commit b29030dd85de4dee5d756390b1d15b3187bbb6d0
+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 fbce46de46b4c13098dc0590cf077150af3a470c
+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 8a6a1f4b7bde74b6df62ac949e75b4ba0aedff97
+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 8021c657bcc6f27b99ed7a61f4036d614c47367d
+Author: Gaetan Nadon
+Date: Mon Oct 26 22:08:37 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 6c1e289e0dcdd02b47d09547a8c5f9c8f0f50221
+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 74b5dca54052c778d49e96b92fc2ef888a80cf8f
Author: Alan Coopersmith
Date: Mon Sep 21 19:57:36 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/bdftopcf-1.0.2/config.h.in new/bdftopcf-1.0.3/config.h.in
--- old/bdftopcf-1.0.2/config.h.in 2009-09-22 04:58:17.000000000 +0200
+++ new/bdftopcf-1.0.3/config.h.in 2010-10-30 04:54:13.000000000 +0200
@@ -42,6 +42,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bdftopcf-1.0.2/configure.ac new/bdftopcf-1.0.3/configure.ac
--- old/bdftopcf-1.0.2/configure.ac 2009-09-22 04:56:13.000000000 +0200
+++ new/bdftopcf-1.0.3/configure.ac 2010-10-30 04:53:41.000000000 +0200
@@ -20,26 +20,24 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(bdftopcf, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], bdftopcf)
-AM_INIT_AUTOMAKE([dist-bzip2 foreign])
+AC_PREREQ([2.60])
+AC_INIT([bdftopcf], [1.0.3],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [bdftopcf])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros: XORG_WITH_LINT, XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
-AC_PROG_CC
AC_PROG_INSTALL
-XORG_DEFAULT_OPTIONS
-
# Checks for pkg-config packages
PKG_CHECK_MODULES(BDFTOPCF, xfont)
-AC_SUBST(BDFTOPCF_CFLAGS)
-AC_SUBST(BDFTOPCF_LIBS)
XORG_WITH_LINT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bdftopcf-1.0.2/INSTALL new/bdftopcf-1.0.3/INSTALL
--- old/bdftopcf-1.0.2/INSTALL 2009-09-22 04:55:08.000000000 +0200
+++ new/bdftopcf-1.0.3/INSTALL 2010-10-30 04:54:17.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/bdftopcf-1.0.2/Makefile.am new/bdftopcf-1.0.3/Makefile.am
--- old/bdftopcf-1.0.2/Makefile.am 2009-09-22 04:44:31.000000000 +0200
+++ new/bdftopcf-1.0.3/Makefile.am 2010-07-23 04:08:46.000000000 +0200
@@ -21,7 +21,7 @@
bin_PROGRAMS = bdftopcf
-bdftopcf_CFLAGS = $(CWARNFLAGS) @BDFTOPCF_CFLAGS@
+AM_CFLAGS = $(CWARNFLAGS) @BDFTOPCF_CFLAGS@
bdftopcf_LDADD = @BDFTOPCF_LIBS@
bdftopcf_SOURCES = bdftopcf.c
@@ -32,39 +32,25 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE) ChangeLog
+EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
+.PHONY: ChangeLog INSTALL
-.PHONY: ChangeLog
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
if LINT
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++++++ beforelight-1.0.3.tar.bz2 -> beforelight-1.0.4.tar.bz2 ++++++
++++ 15477 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/beforelight-1.0.3/app-defaults/Beforelight new/beforelight-1.0.4/app-defaults/Beforelight
--- old/beforelight-1.0.3/app-defaults/Beforelight 1970-01-01 01:00:00.000000000 +0100
+++ new/beforelight-1.0.4/app-defaults/Beforelight 2009-10-16 23:38:03.000000000 +0200
@@ -0,0 +1 @@
+*label.label: Before Light - Keith's hack...
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/beforelight-1.0.3/b4light.c new/beforelight-1.0.4/b4light.c
--- old/beforelight-1.0.3/b4light.c 2007-09-08 22:07:14.000000000 +0200
+++ new/beforelight-1.0.4/b4light.c 2010-07-10 06:07:59.000000000 +0200
@@ -32,7 +32,9 @@
#include
#include
#include
+#ifdef NOTDEF
#include
+#endif
#include
#include
#include
@@ -289,7 +291,7 @@
XID kill_id;
Atom kill_type;
int i;
- int (*oldHandler)();
+ int (*oldHandler)(Display*, XErrorEvent*);
Window r;
int x, y;
unsigned int w, h, b, d;
@@ -348,9 +350,9 @@
AllocateColors();
blank_pix = XCreatePixmap (display, root, 1, 1, 1);
XScreenSaverRegister (display, screen, (XID) blank_pix, XA_PIXMAP);
- bit_0_gc = XCreateGC (display, blank_pix, 0, 0);
+ bit_0_gc = XCreateGC (display, blank_pix, 0, NULL);
XSetForeground (display, bit_0_gc, 0);
- bit_1_gc = XCreateGC (display, blank_pix, 0, 0);
+ bit_1_gc = XCreateGC (display, blank_pix, 0, NULL);
XSetForeground (display, bit_1_gc, ~0);
XFillRectangle (display, blank_pix, bit_0_gc, 0, 0, 1, 1);
info = XScreenSaverAllocInfo ();
@@ -364,14 +366,14 @@
mask |= CWCursor;
XScreenSaverSetAttributes (display, root, 0, 0,
DisplayWidth (display, screen), DisplayHeight(display, screen), 0,
- CopyFromParent, CopyFromParent, CopyFromParent, mask, &attr);
+ CopyFromParent, CopyFromParent, (Visual *)CopyFromParent, mask, &attr);
XSync (display, False);
- gc = XCreateGC (display, root, 0, 0);
- black_gc = XCreateGC (display, root, 0, 0);
+ gc = XCreateGC (display, root, 0, NULL);
+ black_gc = XCreateGC (display, root, 0, NULL);
XSetForeground (display, black_gc, black_pixel);
if (filled)
{
- erase_gc = XCreateGC (display, root, 0, 0);
+ erase_gc = XCreateGC (display, root, 0, NULL);
XSetBackground (display, erase_gc, 0);
XSetFunction (display, erase_gc, GXxor);
XSetGraphicsExposures (display, erase_gc, False);
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/beforelight-1.0.3/Beforelight.ad new/beforelight-1.0.4/Beforelight.ad
--- old/beforelight-1.0.3/Beforelight.ad 2007-09-08 22:07:14.000000000 +0200
+++ new/beforelight-1.0.4/Beforelight.ad 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-*label.label: Before Light - Keith's hack...
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/beforelight-1.0.3/ChangeLog new/beforelight-1.0.4/ChangeLog
--- old/beforelight-1.0.3/ChangeLog 2007-09-08 22:07:14.000000000 +0200
+++ new/beforelight-1.0.4/ChangeLog 2010-10-30 21:13:13.000000000 +0200
@@ -1,41 +1,425 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit bbbf430d5a41fcecfe245a5d82f026afb0696f87
+Author: Alan Coopersmith
+Date: Sat Oct 30 12:12:39 2010 -0700
- * configure.ac:
- Update package version for X11R7 release.
+ beforelight 1.0.4
+
+ Signed-off-by: Alan Coopersmith
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 1c1a11e0e0b1e17ba19a4a9976658f3f1659b41e
+Author: Alan Coopersmith
+Date: Sat Oct 30 12:11:21 2010 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith
-2005-12-07 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 5bd2cf1909b38a7d7b6a455583ebe0be323baf50
+Author: Gaetan Nadon
+Date: Sat Oct 30 12:10:50 2010 -0700
- * Makefile.am:
- * configure.ac:
- Change to use the app-defaults default dir configured in libXt.
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+ Signed-off-by: Alan Coopersmith
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 061cabcb6a62f03c75f1a239cd501654abeee97e
+Author: Alan Coopersmith
+Date: Wed Jun 30 23:25:03 2010 -0700
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ The existing statement can now be removed from the configuration file.
+
+ Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
+ Enables silent rule and use platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 61703aea4a92b9ee177c1c4bd01123629fa9510c
+Author: Alan Coopersmith
+Date: Wed Jun 30 23:15:52 2010 -0700
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Don't link against libXaw since the calls to it are #ifdef NOTDEF
+
+ We still need it in CFLAGS for #defines from
+
+ Signed-off-by: Alan Coopersmith
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 5d542724fde2d3bea856ae0b4b98b3e07afafb7c
+Author: Gaetan Nadon
+Date: Thu Feb 11 10:08:06 2010 -0500
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ config: move CWARNFLAGS from configure.ac to Makefile.am
+
+ Compiler warning flags should be explicitly set in the makefile
+ rather than being merged with other packages compiler flags.
+
+ Signed-off-by: Gaetan Nadon
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 3397e3f8e223441a38920f5e6ddf53793d6ac210
+Author: Gaetan Nadon
+Date: Sat Dec 19 20:48:47 2009 -0500
- * configure.ac:
- Update pkgcheck depedencies to work with separate build roots.
+ configure.ac: use backticks rather than $() for cmd subs
+
+ Use "$PKG_CONFIG" rather than hard coded "pkg-config"
+
+ Signed-off-by: Gaetan Nadon
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 593a04134c911400b1ad088c5cec3bce4810b44b
+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 f269d56d6adf9096c3e9991b13efd3c616a7b4a7
+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 e6fd4338f722d5e2c797cddf52292f56739b29e7
+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 7226356ab0ae93f6f9645525fcb894a98dd10187
+Author: Gaetan Nadon
+Date: Mon Oct 26 22:08:37 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 b552d7cd85bf23203c3ac272fb727591fc00d1f8
+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 9d4ce3ac48e2cefcc6f2d448e4420addb56fbc2e
+Author: Alan Coopersmith
+Date: Thu Oct 1 14:54:16 2009 -0700
+
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith
+
+commit 6648b49e4fb8461975eff8002e4c84f04b698a5e
+Author: Paulo Cesar Pereira de Andrade
+Date: Tue Jan 13 20:01:33 2009 -0200
+
+ Ansification and compile warning fixes.
+
+ This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, and corrects
+ make distcheck.
+
+commit 712cd2c1909dd7a10a5ca98d48605d170321c025
+Author: Jeremy Huddleston
+Date: Sun Nov 9 08:29:50 2008 -0800
+
+ Added app-defaults/Beforelight.ad
+ which didn't get committed in the last commit...
+
+commit f069453dde853812267eacad6f07f0569ad4888c
+Author: Jeremy Huddleston
+Date: Sat Nov 8 15:29:39 2008 -0800
+
+ Buildfix for case insensitive file systems
+
+commit 5644e27cc492491b746ba59571b1b40d10909aa5
+Author: James Cloos
+Date: Thu Dec 6 16:36:56 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 22350f7bc7dec5d516989ace9d5ca89a033abb4b
+Author: Matthieu Herrb
+Date: Sat Sep 8 22:18:52 2007 +0200
+
+ update to 1.0.3
+
+commit a128061d44211b847d4c23860c4d542b3da3a164
+Author: James Cloos
+Date: Mon Sep 3 05:50:59 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit b50ba3bfa200d146402ba7ea0fa68a52dff957c9
+Author: James Cloos
+Date: Thu Aug 23 19:24:20 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit 828e9cab677f38961628f74c8bfa77bef587e10f
+Author: Daniel Stone
+Date: Sat Dec 16 00:25:26 2006 +0200
+
+ bump to 1.0.2
+
+commit 3bd9d369e233c203108eb0baa5bac570789b7f90
+Author: Daniel Stone
+Date: Sat Dec 16 00:25:20 2006 +0200
+
+ Makefile.am: make appdefaultdir respect DESTDIR
+ ... even if it won't be relative to $(prefix) or $(sysconfdir).
+
+commit 6b4c7575f42499f84d0b71078539f059f7b9da1c
+Author: Daniel Stone
+Date: Fri Dec 15 23:49:03 2006 +0200
+
+ remove config.h from _SOURCES
+ Remove config.h from beforelight_SOURCES, which was breaking the build.
+
+commit 5d3be36ed0b1b1a8148a05dc009a747035b2994f
+Author: Kevin E Martin
+Date: Wed Dec 21 02:29:42 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 4bb868f16df0f78a2cd15680c00055a29d0f8a9f
+Author: Adam Jackson
+Date: Mon Dec 19 16:22:39 2005 +0000
+
+ Stub COPYING files
+
+commit 6be5799196c6aa1c9d2b1198c826f1b8f657b2a0
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:01 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit f6cbfad7b7598895413a0c3b23e07940c0c5f776
+Author: Kevin E Martin
+Date: Wed Dec 7 16:17:57 2005 +0000
+
+ Change to use the app-defaults default dir configured in libXt.
+
+commit 1fde86615a00efff3145097740f0460871802637
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:15 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit ce2485521d44673191554f10f33f1f5e9a7fe698
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:14 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit b183300c245ee08ebcd39b2840ba269f69f83eb4
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:01:36 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 cab074fa4c99e9da2e2e8217c1fdba20a5e134a7
+Author: Eric Anholt
+Date: Mon Nov 21 10:34:55 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit a174983051f0079fc20985aeee1c49ce547c5e2a
+Author: Eric Anholt
+Date: Sun Nov 20 22:08:47 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit a729a69063ffa76f0fb6551d5bec5697a2cd4272
+Author: Kevin E Martin
+Date: Wed Nov 9 21:09:19 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 3d6cc1229f8c04cdd1342932f546505653522e25
+Author: Kevin E Martin
+Date: Tue Nov 1 15:05:18 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit 05fa342c442d1c05338c6fe4b7e27f42ee4415b0
+Author: Kevin E Martin
+Date: Wed Oct 19 02:47:47 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit b49b3e79cb2ead41f5172a69d887212cc5e16729
+Author: Alan Coopersmith
+Date: Tue Oct 18 00:32:53 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 94aa3aed9016a31f7f946d43412de948857c22ae
+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 06cd2b759e3ee77d3e014c25766e00d1eeb104ff
+Author: Alan Coopersmith
+Date: Fri Oct 14 00:25:40 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 34c65d7c3c6bfc36903084f3f0cccac5937c60a3
+Author: Alan Coopersmith
+Date: Thu Oct 13 20:10:59 2005 +0000
+
+ Fix app-default files to install under the same names as in the monolith
+ instead of their short names used only for 14-character filename length
+ limited ancient filesystems
+
+commit 71df4f2d183321d5ca643e9eb2258d1e599ffc4a
+Author: Alan Coopersmith
+Date: Thu Oct 6 03:47:12 2005 +0000
+
+ Fix file names of beforelight, x11perfcomp, and xlsclients man pages
+
+commit f854069623c3f4d511cd1206532d19960490e4f4
+Author: Alan Coopersmith
+Date: Mon Aug 1 20:25:27 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit 6f43ddee92ac8eddc1b42ff1eb5bc570d065fef2
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:28 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 9d4b8016df4fd9246dec80905935385ee918e515
+Author: Adam Jackson
+Date: Wed Jul 20 19:31:48 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 333ef4d5389bc8dcdb4ddc8b68ed286c02332721
+Author: Matthieu Herrb
+Date: Sun Jul 17 18:38:04 2005 +0000
+
+ Convert app-defaults rules to work with non-GNU make
+
+commit c8cf93cc24bcdcc401af5845a0ae69f952cce53d
+Author: Alan Coopersmith
+Date: Fri Jul 1 16:55:14 2005 +0000
+
+ More freedestkop->freedesktop typo fixes
+
+commit 09d6aaa4292e2a9017cc1f4a91e1b062e5766a87
+Author: Søren Sandmann Pedersen
+Date: Thu Jun 23 21:32:26 2005 +0000
+
+ Do .ad files in a more convoluted way (strip .ad when installing)
+
+commit 5bed580a99a1eb5c30624ffc76593292c0cd3d66
+Author: Søren Sandmann Pedersen
+Date: Thu Jun 23 20:19:16 2005 +0000
+
+ Use $(sysconfdir), not /etc
+
+commit 2264bd39793459e3794154ce9027f724f91e1a86
+Author: Søren Sandmann Pedersen
+Date: Thu Jun 23 20:04:35 2005 +0000
+
+ - Install B4light.ad
+ - make sure distcheck works
+
+commit 78d7d8bac5b1f756c102d9052484663c57671e61
+Author: Søren Sandmann Pedersen
+Date: Thu Jun 23 18:10:35 2005 +0000
+
+ Add build system for beforelight
+
+commit 53adf02732a08a609757ec8ce633dc6ad2683c07
+Author: Egbert Eich
+Date: Fri Apr 23 19:54:31 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 55c78aaf1363ca7afba441470fe0e87bb0a6214a
+Author: Egbert Eich
+Date: Sun Mar 14 08:34:49 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 153b573ca1169f4b21c63f01a9c117b28ccf0b35
+Author: Egbert Eich
+Date: Wed Mar 3 12:12:50 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit d2274daa654b60765317f9a5677c9e6d32c10ac5
+Author: Egbert Eich
+Date: Thu Feb 26 13:36:15 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit ebae7b4b32a355acaf1ed66f624c74577a8dcdbe
+Author: Egbert Eich
+Date: Thu Feb 26 09:23:53 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit accddd883e25b4899dfe6945d87f11724accbd78
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:29:01 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit b6c4d1d1a6d7dd2f2501557ec34746f3f8bb99d7
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:57 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 0750e89e4a2b1e5d9f909eeaa4dd2c0294a3947e
+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/beforelight-1.0.3/compile new/beforelight-1.0.4/compile
--- old/beforelight-1.0.3/compile 2007-09-08 22:19:54.000000000 +0200
+++ new/beforelight-1.0.4/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/beforelight-1.0.3/config.h.in new/beforelight-1.0.4/config.h.in
--- old/beforelight-1.0.3/config.h.in 2007-09-08 22:19:52.000000000 +0200
+++ new/beforelight-1.0.4/config.h.in 2010-10-30 21:13:06.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
@@ -15,6 +42,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
@@ -27,5 +57,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/beforelight-1.0.3/configure.ac new/beforelight-1.0.4/configure.ac
--- old/beforelight-1.0.3/configure.ac 2007-09-08 22:15:48.000000000 +0200
+++ new/beforelight-1.0.4/configure.ac 2010-10-30 21:12:23.000000000 +0200
@@ -21,26 +21,32 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(beforelight,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],beforelight)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_PREREQ([2.60])
+AC_INIT([beforelight], [1.0.4],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [beforelight])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-AM_CONFIG_HEADER(config.h)
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
-AC_PROG_CC
-AC_PROG_INSTALL
+AM_CONFIG_HEADER(config.h)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(BEFORELIGHT, x11 xscrnsaver xt xaw7)
-AC_SUBST(BEFORELIGHT_CFLAGS)
-AC_SUBST(BEFORELIGHT_LIBS)
+PKG_CHECK_MODULES(BEFORELIGHT, x11 xscrnsaver xt)
+PKG_CHECK_MODULES(XAW, xaw7)
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
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/beforelight-1.0.3/INSTALL new/beforelight-1.0.4/INSTALL
--- old/beforelight-1.0.3/INSTALL 2007-09-08 22:19:54.000000000 +0200
+++ new/beforelight-1.0.4/INSTALL 2010-10-30 21:13:13.000000000 +0200
@@ -1,16 +1,19 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+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
+ This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
-These are generic installation instructions.
+ 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
@@ -23,9 +26,9 @@
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
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+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
@@ -35,20 +38,17 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`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. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ 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.
@@ -67,42 +67,57 @@
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.
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./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
+ You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+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 `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ 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
+ 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'.
@@ -125,7 +140,7 @@
Optional Features
=================
-Some packages pay attention to `--enable-FEATURE' options to
+ 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
@@ -137,14 +152,36 @@
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
+ 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:
@@ -170,9 +207,9 @@
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'.
+ 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.
@@ -181,7 +218,7 @@
Defining Variables
==================
-Variables not defined in a site shell script can be set in the
+ 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
@@ -190,21 +227,29 @@
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
- Print a summary of the options to `configure', and exit.
+ 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'
@@ -231,6 +276,16 @@
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/beforelight-1.0.3/Makefile.am new/beforelight-1.0.4/Makefile.am
--- old/beforelight-1.0.3/Makefile.am 2007-09-08 22:07:14.000000000 +0200
+++ new/beforelight-1.0.4/Makefile.am 2010-07-01 08:22:57.000000000 +0200
@@ -22,7 +22,7 @@
bin_PROGRAMS = beforelight
-beforelight_CFLAGS = $(BEFORELIGHT_CFLAGS)
+AM_CFLAGS = $(BEFORELIGHT_CFLAGS) $(XAW_CFLAGS) $(CWARNFLAGS)
beforelight_LDADD = $(BEFORELIGHT_LIBS)
beforelight_SOURCES = \
@@ -31,50 +31,36 @@
appman_PRE = \
beforelight.man
-# App default files (*.ad)
+# App default files
-EXTRA_DIST = \
- Beforelight.ad
+DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
-APPDEFAULTFILES = \
- Beforelight
+appdefaultdir = @appdefaultdir@
-SUFFIXES = .ad
+dist_appdefault_DATA = \
+ app-defaults/Beforelight
-.ad:
- cp $< $@
+appmandir = $(APP_MAN_DIR)
-appdefault_DATA = $(APPDEFAULTFILES)
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-CLEANFILES = $(APPDEFAULTFILES)
+EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+CLEANFILES = $(appman_DATA)
-appmandir = $(APP_MAN_DIR)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+.man.$(APP_MAN_SUFFIX):
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-EXTRA_DIST += $(appman_PRE)
-CLEANFILES += $(appman_DATA)
-SED = sed
+.PHONY: ChangeLog INSTALL
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+INSTALL:
+ $(INSTALL_CMD)
-SUFFIXES += .$(APP_MAN_SUFFIX) .man
+ChangeLog:
+ $(CHANGELOG_CMD)
-.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+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/beforelight-1.0.3/missing new/beforelight-1.0.4/missing
--- old/beforelight-1.0.3/missing 2007-09-08 22:19:54.000000000 +0200
+++ new/beforelight-1.0.4/missing 2010-10-30 21:13:06.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/beforelight-1.0.3/README new/beforelight-1.0.4/README
--- old/beforelight-1.0.3/README 2007-09-08 22:07:14.000000000 +0200
+++ new/beforelight-1.0.4/README 2009-10-16 23:38:03.000000000 +0200
@@ -0,0 +1,29 @@
+The beforelight program is a sample implementation of a screen saver
+for X servers supporting the MIT-SCREEN-SAVER extension. It is only
+recommended for use as a code sample, as it does not include features
+such as screen locking or configurability, and relies on the legacy Xaw
+toolkit.
+
+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/beforelight
+
+ http://cgit.freedesktop.org/xorg/app/beforelight
+
+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
+
++++++ editres-1.0.4.tar.bz2 -> editres-1.0.5.tar.bz2 ++++++
++++ 8829 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/editres-1.0.4/ChangeLog new/editres-1.0.5/ChangeLog
--- old/editres-1.0.4/ChangeLog 2009-09-23 05:12:26.000000000 +0200
+++ new/editres-1.0.5/ChangeLog 2010-10-30 21:43:40.000000000 +0200
@@ -1,3 +1,130 @@
+commit 17332856a27d27f4ea08b99d58b8e4167b7d815f
+Author: Alan Coopersmith
+Date: Sat Oct 30 12:43:00 2010 -0700
+
+ editres 1.0.5
+
+ Signed-off-by: Alan Coopersmith
+
+commit 9aa7a02bafe1a56837484c0122cb96f86b08c20e
+Author: Alan Coopersmith
+Date: Sat Oct 30 12:41:18 2010 -0700
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+
+ Signed-off-by: Alan Coopersmith
+
+commit bc60bafbf6ec232bd006e38312c200900cc63034
+Author: Alan Coopersmith
+Date: Sat Oct 30 12:40:44 2010 -0700
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ The existing statement can now be removed from the configuration file.
+
+ Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
+ Enables silent rule and use platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith
+
+commit 737c0d053505a8ece24f41320cd2bd5ecb3a212b
+Author: Gaetan Nadon
+Date: Sat Oct 30 12:39:00 2010 -0700
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+ Signed-off-by: Alan Coopersmith
+
+commit c04cfb209c6da039728f15d0b9211557a2cb556d
+Author: Gaetan Nadon
+Date: Sat Aug 7 21:07:30 2010 -0400
+
+ config: consolidate dependencies checking
+
+ One single equivalent statement will do the job.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 00839b44d635eb3c5d5a3d1b1d764838af22d252
+Author: Gaetan Nadon
+Date: Sat Dec 19 20:48:47 2009 -0500
+
+ configure.ac: use backticks rather than $() for cmd subs
+
+ Use "$PKG_CONFIG" rather than hard coded "pkg-config"
+
+ Signed-off-by: Gaetan Nadon
+
+commit 0d9b687b1eef24ba64f8dc15febb296cae727d30
+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 1cfbbce10833e7902b30c50fe1da3dc83d40b8fe
+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 9d6212392730f5cdec9906eb90385c766a87de9c
+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 49f5b0c58b5c2efa23dde717c52be5e4161e3993
+Author: Gaetan Nadon
+Date: Mon Oct 26 22:08:37 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 be42557f3db73875b9789f5fc7457703e97face0
+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 86eb733aaddc362427d533b7cf157447690152a5
+Author: Gaetan Nadon
+Date: Sun Sep 27 15:43:39 2009 -0400
+
+ Makefile.am: do not include autogen.sh in distribution #24183
+
+ This is a private build script that should not be distributed
+
commit aebe52fd87925353c687fbd26c5547410d4b96c1
Author: Alan Coopersmith
Date: Tue Sep 22 20:05:21 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/editres-1.0.4/config.h.in new/editres-1.0.5/config.h.in
--- old/editres-1.0.4/config.h.in 2009-09-23 05:05:45.000000000 +0200
+++ new/editres-1.0.5/config.h.in 2010-10-30 21:43:36.000000000 +0200
@@ -42,6 +42,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/editres-1.0.4/configure.ac new/editres-1.0.5/configure.ac
--- old/editres-1.0.4/configure.ac 2009-09-23 05:05:12.000000000 +0200
+++ new/editres-1.0.5/configure.ac 2010-10-30 21:42:27.000000000 +0200
@@ -21,32 +21,25 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(editres,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],editres)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_PREREQ([2.60])
+AC_INIT([editres], [1.0.5],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [editres])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
-AC_PROG_CC
-AC_PROG_INSTALL
-
-XORG_DEFAULT_OPTIONS
-
-# Checks for pkg-config packages
-PKG_CHECK_MODULES(XAW, xaw7)
-PKG_CHECK_MODULES(EDITRES, x11 xt xmu)
-EDITRES_CFLAGS="$EDITRES_CFLAGS $XAW_CFLAGS"
-EDITRES_LIBS="$EDITRES_LIBS $XAW_LIBS"
-AC_SUBST(EDITRES_CFLAGS)
-AC_SUBST(EDITRES_LIBS)
+# Obtain compiler/linker options from depedencies
+PKG_CHECK_MODULES(EDITRES, xaw7 x11 xt xmu)
PKG_CHECK_MODULES(APPDEFS, xt)
-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)]),
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/editres-1.0.4/INSTALL new/editres-1.0.5/INSTALL
--- old/editres-1.0.4/INSTALL 2006-07-11 04:50:46.000000000 +0200
+++ new/editres-1.0.5/INSTALL 2010-10-30 21:43:40.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/editres-1.0.4/Makefile.am new/editres-1.0.5/Makefile.am
--- old/editres-1.0.4/Makefile.am 2009-09-23 05:03:23.000000000 +0200
+++ new/editres-1.0.5/Makefile.am 2010-10-30 21:40:24.000000000 +0200
@@ -50,44 +50,28 @@
app-defaults/Editres-color \
app-defaults/Editres
-EXTRA_DIST = ChangeLog autogen.sh
-MAINTAINERCLEANFILES=ChangeLog
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST += $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) autogen.sh
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
++++++ fslsfonts-1.0.2.tar.bz2 -> fslsfonts-1.0.3.tar.bz2 ++++++
++++ 12204 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/fslsfonts-1.0.2/ChangeLog new/fslsfonts-1.0.3/ChangeLog
--- old/fslsfonts-1.0.2/ChangeLog 2008-05-24 01:32:07.000000000 +0200
+++ new/fslsfonts-1.0.3/ChangeLog 2010-10-30 21:49:16.000000000 +0200
@@ -1,3 +1,150 @@
+commit 56623bd3f69af13b5ea7952fc2539c0757c1da9a
+Author: Alan Coopersmith
+Date: Sat Oct 30 12:48:31 2010 -0700
+
+ fslsfonts 1.0.3
+
+ Signed-off-by: Alan Coopersmith
+
+commit ccd2fecaa7a8f32cef6c5c1620a23e09aa50b1f5
+Author: Alan Coopersmith
+Date: Sat Oct 30 12:47:25 2010 -0700
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith
+
+commit 52a0ed576354ba1de736904af1a6b17981b0090e
+Author: Jesse Adkins
+Date: Tue Sep 28 13:29:49 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins
+
+commit 942a8c3c84ced13f396f17a96313ee82c7c79d83
+Author: Alan Coopersmith
+Date: Wed Oct 6 19:00:52 2010 -0700
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ The existing statement can now be removed from the configuration file.
+
+ Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
+ Enables silent rule and use platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith
+
+commit dbbd43a4b2065e64d17227aed63e4189dc75134e
+Author: Gaetan Nadon
+Date: Tue Jul 20 18:45:18 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+
+commit e187c1e1bc4c58236346573ddf6c58ede438cc72
+Author: Alan Coopersmith
+Date: Wed Jun 30 19:53:14 2010 -0700
+
+ fslsfonts only depends on x11proto (for Xos.h) not x11
+
+ No need to link against libX11 when no functions in it are ever called,
+ nor any headers from it ever used, since fslsfonts is a pure font-server
+ protocol client.
+
+ Signed-off-by: Alan Coopersmith
+
+commit 57eb4c0f642da8547bb505231a1251d9662fb192
+Author: Gaetan Nadon
+Date: Thu Feb 11 10:08:06 2010 -0500
+
+ config: move CWARNFLAGS from configure.ac to Makefile.am
+
+ Compiler warning flags should be explicitly set in the makefile
+ rather than being merged with other packages compiler flags.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 2930e9f179d1abf9fb276226dd6a527a07d42d39
+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 fc89bf51b4a24d03f4c0aad5cb4c9566b4493723
+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 7fb18a2404b434f7c81932b6bb3a59087b67ae42
+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 fff5c40b8422204938c8f56cc02cdbbbe24c49ae
+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 038c76cbbc20400ac19877f50f1a69a738d87cf7
+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 b837f89eba8f374c2b24f84138c1305fd5d9507b
+Author: Alan Coopersmith
+Date: Thu Oct 1 14:54:16 2009 -0700
+
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith
+
+commit 014ec6084387c77f211832ee7c0c95ad56fbb1af
+Author: Paulo Cesar Pereira de Andrade
+Date: Thu Jan 15 18:30:21 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 449643fa6811de4539c498d43f3af777a0a7c037
Author: Alan Coopersmith
Date: Fri May 23 16:31:20 2008 -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/fslsfonts-1.0.2/config.h.in new/fslsfonts-1.0.3/config.h.in
--- old/fslsfonts-1.0.2/config.h.in 2008-05-24 01:32:00.000000000 +0200
+++ new/fslsfonts-1.0.3/config.h.in 2010-10-30 21:49:09.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
@@ -15,6 +42,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
@@ -27,5 +57,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/fslsfonts-1.0.2/configure.ac new/fslsfonts-1.0.3/configure.ac
--- old/fslsfonts-1.0.2/configure.ac 2008-05-24 01:26:53.000000000 +0200
+++ new/fslsfonts-1.0.3/configure.ac 2010-10-30 21:47:50.000000000 +0200
@@ -21,22 +21,21 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(fslsfonts,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],fslsfonts)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_PREREQ([2.60])
+AC_INIT([fslsfonts], [1.0.3],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [fslsfonts])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-AM_CONFIG_HEADER(config.h)
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
-AC_PROG_CC
-AC_PROG_INSTALL
+AM_CONFIG_HEADER(config.h)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(FSLSFONTS, x11 libfs)
-AC_SUBST(FSLSFONTS_CFLAGS)
-AC_SUBST(FSLSFONTS_LIBS)
-
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
+PKG_CHECK_MODULES(FSLSFONTS, xproto libfs)
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/fslsfonts-1.0.2/fslsfonts.c new/fslsfonts-1.0.3/fslsfonts.c
--- old/fslsfonts-1.0.2/fslsfonts.c 2006-07-11 04:50:51.000000000 +0200
+++ new/fslsfonts-1.0.3/fslsfonts.c 2010-10-07 05:32:05.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: fslsfonts.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */
/*
Copyright 1990, 1998 The Open Group
@@ -43,7 +42,6 @@
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
* THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/fslsfonts/fslsfonts.c,v 3.7 2001/08/27 17:41:01 dawes Exp $ */
#include
#include
@@ -54,20 +52,20 @@
#define N_START 1000 /* Maximum # of fonts to start with */
#endif
-int max_output_line_width = 79;
-int output_line_padding = 3;
-int columns = 0;
+static int max_output_line_width = 79;
+static int output_line_padding = 3;
+static int columns = 0;
#define L_SHORT 0
#define L_MEDIUM 1
#define L_LONG 2
#define L_VERYLONG 3
-Bool sort_output = True;
-int long_list = L_SHORT;
-int nnames = N_START;
-int font_cnt;
-int min_max;
+static Bool sort_output = True;
+static int long_list = L_SHORT;
+static int nnames = N_START;
+static int font_cnt;
+static int min_max;
typedef struct {
char *name;
FSXFontInfoHeader *info;
@@ -75,11 +73,11 @@
FSPropOffset *po;
unsigned char *pd;
} FontList;
-FontList *font_list;
+static FontList *font_list;
-FSServer *svr;
+static FSServer *svr;
-char *program_name;
+static char *program_name;
static void usage ( void );
static void get_list ( char *pattern );
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/fslsfonts-1.0.2/fslsfonts.man new/fslsfonts-1.0.3/fslsfonts.man
--- old/fslsfonts-1.0.2/fslsfonts.man 2008-05-24 01:25:42.000000000 +0200
+++ new/fslsfonts-1.0.3/fslsfonts.man 2010-10-07 05:32:05.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Xorg: fslsfonts.man,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $
.\" Copyright 1991, Network Computing Devices, Inc
.\" Copyright 1993, 1994, 1998 The Open Group
.\"
@@ -24,8 +23,6 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/fslsfonts/fslsfonts.man,v 1.6 2001/01/27 18:21:01 dawes Exp $
-.\"
.TH FSLSFONTS 1 __xorgversion__
.SH NAME
fslsfonts \- list fonts served by X font server
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/fslsfonts-1.0.2/INSTALL new/fslsfonts-1.0.3/INSTALL
--- old/fslsfonts-1.0.2/INSTALL 2006-07-11 04:50:51.000000000 +0200
+++ new/fslsfonts-1.0.3/INSTALL 2010-10-30 21:49:16.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/fslsfonts-1.0.2/Makefile.am new/fslsfonts-1.0.3/Makefile.am
--- old/fslsfonts-1.0.2/Makefile.am 2007-12-08 02:34:45.000000000 +0100
+++ new/fslsfonts-1.0.3/Makefile.am 2010-10-07 04:00:42.000000000 +0200
@@ -21,7 +21,7 @@
bin_PROGRAMS = fslsfonts
-AM_CFLAGS = $(FSLSFONTS_CFLAGS)
+AM_CFLAGS = $(FSLSFONTS_CFLAGS) $(CWARNFLAGS)
fslsfonts_LDADD = $(FSLSFONTS_LIBS)
fslsfonts_SOURCES = \
@@ -36,38 +36,22 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+.PHONY: ChangeLog INSTALL
-.PHONY: ChangeLog
+INSTALL:
+ $(INSTALL_CMD)
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
+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/fslsfonts-1.0.2/missing new/fslsfonts-1.0.3/missing
--- old/fslsfonts-1.0.2/missing 2008-05-24 01:32:01.000000000 +0200
+++ new/fslsfonts-1.0.3/missing 2010-10-30 21:49:10.000000000 +0200
@@ -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/fslsfonts-1.0.2/README new/fslsfonts-1.0.3/README
--- old/fslsfonts-1.0.2/README 2006-07-11 04:50:51.000000000 +0200
+++ new/fslsfonts-1.0.3/README 2009-10-16 23:38:12.000000000 +0200
@@ -0,0 +1,25 @@
+fslsfonts produces a list of fonts served by an X font server.
+
+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/fslsfonts
+
+ http://cgit.freedesktop.org/xorg/app/fslsfonts
+
+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
+
++++++ fstobdf-1.0.3.tar.bz2 -> fstobdf-1.0.4.tar.bz2 ++++++
++++ 12207 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/fstobdf-1.0.3/ChangeLog new/fstobdf-1.0.4/ChangeLog
--- old/fstobdf-1.0.3/ChangeLog 2008-05-24 01:54:53.000000000 +0200
+++ new/fstobdf-1.0.4/ChangeLog 2010-10-30 22:03:12.000000000 +0200
@@ -1,3 +1,139 @@
+commit ec9bcf172012b360663b3916c3fcd74bff263fd6
+Author: Alan Coopersmith
+Date: Sat Oct 30 13:00:46 2010 -0700
+
+ fstobdf 1.0.4
+
+ Signed-off-by: Alan Coopersmith
+
+commit e5a6da16b73693c384715045705d6392ef0b4519
+Author: Alan Coopersmith
+Date: Sat Oct 30 12:59:42 2010 -0700
+
+ Purge CVS version tags
+
+ Signed-off-by: Alan Coopersmith
+
+commit 119b36c4591155c905f4776be41ecf660ecf78ef
+Author: Alan Coopersmith
+Date: Sat Oct 30 12:55:05 2010 -0700
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith
+
+commit 049d4f1b9c2e1997693986d3c6cd5093e5553dbe
+Author: Alan Coopersmith
+Date: Sat Oct 30 12:54:26 2010 -0700
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ The existing statement can now be removed from the configuration file.
+
+ Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
+ Enables silent rule and use platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith
+
+commit 18f7bf1985e501fe3614ba935151ccafa258d2e3
+Author: Gaetan Nadon
+Date: Sat Oct 30 12:53:55 2010 -0700
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+ Signed-off-by: Alan Coopersmith
+
+commit 1ca676f3939f1c7430d412294034110690205834
+Author: Gaetan Nadon
+Date: Thu Feb 11 10:08:06 2010 -0500
+
+ config: move CWARNFLAGS from configure.ac to Makefile.am
+
+ Compiler warning flags should be explicitly set in the makefile
+ rather than being merged with other packages compiler flags.
+
+ Signed-off-by: Gaetan Nadon
+
+commit eaaec4ecdd160d3adf8a4d0c1049e6791debb0b3
+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 92a49ab745c6f991d8dd869d86cc96dd49963b80
+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 c379b54fc33c3c70247412f32f610b43f1f53066
+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 176ccf88401f26cd272e34aa3db6ac7ff81cd7b1
+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 594e00a6276875ffe8bd75cea8a4923f577eddfe
+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 1979ff3ca19af4633df02d4eb4f636492afefe44
+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 4d6dc1290de14f23fe40e61b37d4c9b96e517958
+Author: Paulo Cesar Pereira de Andrade
+Date: Thu Jan 15 18:33:52 2009 -0200
+
+ Ansification and compile warning fixes.
+
+ This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
+ make distcheck. There weren't any gcc 4.3 and sparse warnings.
+
commit 3c13b4d1e7d143149cfb34e1771cb28f903be2e2
Author: Alan Coopersmith
Date: Fri May 23 16:54:12 2008 -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/fstobdf-1.0.3/chars.c new/fstobdf-1.0.4/chars.c
--- old/fstobdf-1.0.3/chars.c 2008-05-23 05:09:31.000000000 +0200
+++ new/fstobdf-1.0.4/chars.c 2010-10-30 21:59:11.000000000 +0200
@@ -1,5 +1,3 @@
-/* $Xorg: chars.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */
-/* $XdotOrg: app/fstobdf/chars.c,v 1.3 2005/10/31 16:05:45 alanc Exp $ */
/*
Copyright 1990, 1998 The Open Group
@@ -44,7 +42,6 @@
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
* THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/fstobdf/chars.c,v 3.7 2001/03/04 00:16:31 tsi Exp $ */
/* Morten Storgaard Nielsen: chars.c,v 3.2-1 2000/01/30 14:11:19 kat Exp */
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/fstobdf-1.0.3/config.h.in new/fstobdf-1.0.4/config.h.in
--- old/fstobdf-1.0.3/config.h.in 2008-05-24 01:54:47.000000000 +0200
+++ new/fstobdf-1.0.4/config.h.in 2010-10-30 22:03:05.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
@@ -15,6 +42,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
@@ -27,5 +57,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/fstobdf-1.0.3/configure.ac new/fstobdf-1.0.4/configure.ac
--- old/fstobdf-1.0.3/configure.ac 2008-05-24 01:50:19.000000000 +0200
+++ new/fstobdf-1.0.4/configure.ac 2010-10-30 22:00:21.000000000 +0200
@@ -21,22 +21,21 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(fstobdf,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],fstobdf)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_PREREQ([2.60])
+AC_INIT([fstobdf], [1.0.4],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [fstobdf])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-AM_CONFIG_HEADER(config.h)
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
-AC_PROG_CC
-AC_PROG_INSTALL
+AM_CONFIG_HEADER(config.h)
# Checks for pkg-config packages
PKG_CHECK_MODULES(FSTOBDF, x11 libfs)
-AC_SUBST(FSTOBDF_CFLAGS)
-AC_SUBST(FSTOBDF_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/fstobdf-1.0.3/fstobdf.c new/fstobdf-1.0.4/fstobdf.c
--- old/fstobdf-1.0.3/fstobdf.c 2006-07-11 04:50:54.000000000 +0200
+++ new/fstobdf-1.0.4/fstobdf.c 2010-10-30 21:59:11.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: fstobdf.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */
/*
Copyright 1990, 1998 The Open Group
@@ -43,7 +42,6 @@
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
* THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/fstobdf/fstobdf.c,v 1.6tsi Exp $ */
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fstobdf-1.0.3/fstobdf.h new/fstobdf-1.0.4/fstobdf.h
--- old/fstobdf-1.0.3/fstobdf.h 2008-05-23 05:10:13.000000000 +0200
+++ new/fstobdf-1.0.4/fstobdf.h 2010-10-30 21:59:11.000000000 +0200
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/fstobdf/fstobdf.h,v 1.2 2001/08/27 17:41:01 dawes Exp $ */
/*
* Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
*
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/fstobdf-1.0.3/fstobdf.man new/fstobdf-1.0.4/fstobdf.man
--- old/fstobdf-1.0.3/fstobdf.man 2008-05-23 05:05:33.000000000 +0200
+++ new/fstobdf-1.0.4/fstobdf.man 2010-10-30 21:59:11.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Xorg: fstobdf.man,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $
.\" Copyright 1990, Network Computing Devices
.\" Copyright 1990, 1998 The Open Group
.\"
@@ -24,7 +23,6 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/fstobdf/fstobdf.man,v 1.6 2001/01/27 18:21:02 dawes Exp $
.\"
.TH FSTOBDF __appmansuffix__ __xorgversion__
.SH NAME
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/fstobdf-1.0.3/header.c new/fstobdf-1.0.4/header.c
--- old/fstobdf-1.0.3/header.c 2006-07-11 04:50:54.000000000 +0200
+++ new/fstobdf-1.0.4/header.c 2010-10-30 21:59:11.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: header.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */
/*
Copyright 1990, 1998 The Open Group
@@ -43,7 +42,6 @@
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
* THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/fstobdf/header.c,v 3.6 2001/07/25 15:05:13 dawes Exp $ */
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fstobdf-1.0.3/INSTALL new/fstobdf-1.0.4/INSTALL
--- old/fstobdf-1.0.3/INSTALL 2006-07-11 04:50:54.000000000 +0200
+++ new/fstobdf-1.0.4/INSTALL 2010-10-30 22:03:12.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/fstobdf-1.0.3/Makefile.am new/fstobdf-1.0.4/Makefile.am
--- old/fstobdf-1.0.3/Makefile.am 2007-12-08 02:34:50.000000000 +0100
+++ new/fstobdf-1.0.4/Makefile.am 2010-10-30 21:54:15.000000000 +0200
@@ -21,7 +21,7 @@
bin_PROGRAMS = fstobdf
-AM_CFLAGS = $(FSTOBDF_CFLAGS)
+AM_CFLAGS = $(FSTOBDF_CFLAGS) $(CWARNFLAGS)
fstobdf_LDADD = $(FSTOBDF_LIBS)
fstobdf_SOURCES = \
@@ -40,38 +40,22 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+.PHONY: ChangeLog INSTALL
-.PHONY: ChangeLog
+INSTALL:
+ $(INSTALL_CMD)
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
+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/fstobdf-1.0.3/missing new/fstobdf-1.0.4/missing
--- old/fstobdf-1.0.3/missing 2008-05-24 01:54:47.000000000 +0200
+++ new/fstobdf-1.0.4/missing 2010-10-30 22:03:06.000000000 +0200
@@ -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/fstobdf-1.0.3/props.c new/fstobdf-1.0.4/props.c
--- old/fstobdf-1.0.3/props.c 2006-07-11 04:50:54.000000000 +0200
+++ new/fstobdf-1.0.4/props.c 2010-10-30 21:59:11.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: props.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */
/*
Copyright 1990, 1991, 1998 The Open Group
@@ -43,7 +42,6 @@
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
* THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/fstobdf/props.c,v 1.5 2001/01/17 23:44:54 dawes Exp $ */
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fstobdf-1.0.3/README new/fstobdf-1.0.4/README
--- old/fstobdf-1.0.3/README 2006-07-11 04:50:54.000000000 +0200
+++ new/fstobdf-1.0.4/README 2009-10-16 23:38:13.000000000 +0200
@@ -0,0 +1,28 @@
+The fstobdf program reads a font from a font server and prints a BDF
+file on the standard output that may be used to recreate the font.
+This is useful in testing servers, debugging font metrics, and
+reproducing lost BDF files.
+
+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/fstobdf
+
+ http://cgit.freedesktop.org/xorg/app/fstobdf
+
+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
+
++++++ iceauth-1.0.3.tar.bz2 -> iceauth-1.0.4.tar.bz2 ++++++
++++ 8827 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/iceauth-1.0.3/ChangeLog new/iceauth-1.0.4/ChangeLog
--- old/iceauth-1.0.3/ChangeLog 2009-10-11 04:59:30.000000000 +0200
+++ new/iceauth-1.0.4/ChangeLog 2010-10-30 06:46:42.000000000 +0200
@@ -1,3 +1,137 @@
+commit b39fab5b9af70282ab640a8a9d6b56671aeda78b
+Author: Alan Coopersmith
+Date: Fri Oct 29 21:46:07 2010 -0700
+
+ iceauth 1.0.4
+
+ Signed-off-by: Alan Coopersmith
+
+commit 3c1b044f63d4865378a2307dd0024afca7196b42
+Author: Alan Coopersmith
+Date: Thu Oct 21 15:01:29 2010 -0700
+
+ Remove unnecessary AC_SUBST of ICEAUTH_LIBS & ICEAUTH_CFLAGS
+
+ PKG_CHECK_MODULES automatically handles those for us
+
+ Signed-off-by: Alan Coopersmith
+
+commit a33fa043dfd5e84b9afd39842d848265b16ac5d7
+Author: Alan Coopersmith
+Date: Thu Oct 21 14:59:42 2010 -0700
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ Enables use of platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith
+
+commit 5f79bb90cd0e3c18c184f7beb75c83e31aae6951
+Author: Gaetan Nadon
+Date: Tue Jul 20 18:45:18 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+
+commit f2b54a282333be841099773ee8788a2a7e2fea3b
+Author: Jesse Adkins
+Date: Tue Sep 28 13:29:49 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins
+
+commit 1944291c5f541796b1ac9f036a51cb1dae0cdd81
+Author: Gaetan Nadon
+Date: Thu Jan 7 17:46:31 2010 -0500
+
+ COPYING: replace stub with actual Copyright notice
+
+ Refer to iceauth.c
+ Copyright 1989, 1998 The Open Group
+
+ Signed-off-by: Gaetan Nadon