Hello community,
here is the log from the commit of package xorg-x11-proto-devel for openSUSE:Factory
checked in at Wed Apr 7 13:15:04 CEST 2010.
--------
--- xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2010-03-17 18:04:13.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2010-04-04 16:43:56.000000000 +0200
@@ -1,0 +2,16 @@
+Sun Apr 4 16:39:21 CEST 2010 - sndirsch@suse.de
+
+- compositeproto 0.4.1
+- damageproto 1.2.0
+- fontsproto 2.1.0
+- kbproto 1.0.4
+- randrproto 1.3.1
+- resourceproto 1.1.0
+- scrnsaverproto 1.2.0
+- videoproto 2.3.0
+- windowswmproto 1.0.4
+- xineramaproto 1.2
+- xproto 7.0.16
+- bumped version number to 7.5
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
compositeproto-0.4.tar.bz2
damageproto-1.1.0.tar.bz2
fontsproto-X11R7.0-2.0.2.tar.bz2
kbproto-1.0.3.tar.bz2
randrproto-1.3.0.tar.bz2
resourceproto-X11R7.0-1.0.2.tar.bz2
scrnsaverproto-X11R7.1-1.1.0.tar.bz2
videoproto-X11R7.0-2.2.2.tar.bz2
windowswmproto-X11R7.0-1.0.3.tar.bz2
xineramaproto-X11R7.0-1.1.2.tar.bz2
xproto-7.0.15.tar.bz2
New:
----
compositeproto-0.4.1.tar.bz2
damageproto-1.2.0.tar.bz2
fontsproto-2.1.0.tar.bz2
kbproto-1.0.4.tar.bz2
randrproto-1.3.1.tar.bz2
resourceproto-1.1.0.tar.bz2
scrnsaverproto-1.2.0.tar.bz2
videoproto-2.3.0.tar.bz2
windowswmproto-1.0.4.tar.bz2
xineramaproto-1.2.tar.bz2
xproto-7.0.16.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-proto-devel.spec ++++++
--- /var/tmp/diff_new_pack.SqbM94/_old 2010-04-07 13:14:19.000000000 +0200
+++ /var/tmp/diff_new_pack.SqbM94/_new 2010-04-07 13:14:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package xorg-x11-proto-devel (Version 7.4)
+# spec file for package xorg-x11-proto-devel (Version 7.5)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -21,33 +21,33 @@
Name: xorg-x11-proto-devel
BuildRequires: python-base
Url: http://xorg.freedesktop.org/
-Version: 7.4
-Release: 23
+Version: 7.5
+Release: 1
License: GPLv2+ ; MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Development/Libraries/X11
Summary: Include Files and Libraries mandatory for X11 Development
Source0: applewmproto-1.4.1.tar.bz2
Source1: bigreqsproto-1.1.0.tar.bz2
-Source2: compositeproto-0.4.tar.bz2
-Source3: damageproto-1.1.0.tar.bz2
+Source2: compositeproto-0.4.1.tar.bz2
+Source3: damageproto-1.2.0.tar.bz2
Source4: dmxproto-2.3.tar.bz2
Source5: fixesproto-4.1.1.tar.bz2
Source6: fontcacheproto-X11R7.0-0.1.2.tar.bz2
-Source7: fontsproto-X11R7.0-2.0.2.tar.bz2
+Source7: fontsproto-2.1.0.tar.bz2
Source8: glproto-1.4.11.tar.bz2
Source9: inputproto-2.0.tar.bz2
-Source10: kbproto-1.0.3.tar.bz2
+Source10: kbproto-1.0.4.tar.bz2
Source11: printproto-1.0.4.tar.bz2
-Source12: randrproto-1.3.0.tar.bz2
+Source12: randrproto-1.3.1.tar.bz2
Source13: recordproto-1.14.tar.bz2
Source14: renderproto-0.11.tar.bz2
-Source15: resourceproto-X11R7.0-1.0.2.tar.bz2
-Source16: scrnsaverproto-X11R7.1-1.1.0.tar.bz2
+Source15: resourceproto-1.1.0.tar.bz2
+Source16: scrnsaverproto-1.2.0.tar.bz2
Source17: trapproto-X11R7.0-3.4.3.tar.bz2
Source18: util-macros-1.6.0.tar.bz2
-Source19: videoproto-X11R7.0-2.2.2.tar.bz2
-Source20: windowswmproto-X11R7.0-1.0.3.tar.bz2
+Source19: videoproto-2.3.0.tar.bz2
+Source20: windowswmproto-1.0.4.tar.bz2
Source21: xcmiscproto-1.2.0.tar.bz2
Source22: xextproto-7.1.1.tar.bz2
Source23: xf86bigfontproto-1.2.0.tar.bz2
@@ -56,8 +56,8 @@
Source26: xf86miscproto-X11R7.0-0.9.2.tar.bz2
Source27: xf86rushproto-X11R7.0-1.1.2.tar.bz2
Source28: xf86vidmodeproto-2.3.tar.bz2
-Source29: xineramaproto-X11R7.0-1.1.2.tar.bz2
-Source30: xproto-7.0.15.tar.bz2
+Source29: xineramaproto-1.2.tar.bz2
+Source30: xproto-7.0.16.tar.bz2
Source31: xproxymanagementprotocol-X11R7.0-1.0.2.tar.bz2
Source32: evieext-X11R7.0-1.0.2.tar.bz2
Source33: xcb-proto-1.6.tar.bz2
++++++ compositeproto-0.4.tar.bz2 -> compositeproto-0.4.1.tar.bz2 ++++++
++++ 11947 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/compositeproto-0.4/ChangeLog new/compositeproto-0.4.1/ChangeLog
--- old/compositeproto-0.4/ChangeLog 2006-07-01 09:00:07.000000000 +0200
+++ new/compositeproto-0.4.1/ChangeLog 2009-10-03 04:00:50.000000000 +0200
@@ -1,88 +1,232 @@
-2006-3-30 Deron Johnson
+commit 39612a7153ac3e800c5dbb11a7f760c53797bf73
+Author: Alan Coopersmith
+Date: Fri Oct 2 18:59:54 2009 -0700
- * composite.h
- * compositeproto.h
- * configure.ac
- Composite Version 0.3: CompositeGetOverlayWindow, CompositeReleaseOverlayWindow
- Moved Coordinate Transform Redirect defines to 0.4 and bumped request numbers
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2004-07-08 Keith Packard
-
- * composite.h:
- * compositeproto.h:
- * protocol:
- Add NameWindowPixmap request.
- Bump protocol to 0.2
-
-2004-06-27 Eric Anholt
-
- * protocol:
- Fix some apostrophe issues.
-
-2004-02-03 Jim Gettys
-
- * AUTHORS: needed author's attribution
-
-2004-01-15 Daniel Stone
- * Tag release 2.0 for first freedesktop.org clientside release.
-
-2003-11-08 Keith Packard
-
- * protocol:
- Note that Manual Subwindows mode disables background painting.
-
-2003-11-06 Keith Packard
-
- * composite.h:
- * compositeproto.h:
- Add update mode to Unredirect requests so clients
- can redirect multiple times (and then unredirect)
- Add CompositeNumberRequests
- Fix some typeos
-
-2003-11-04 Keith Packard
-
- * COPYING:
- * INSTALL:
- * Makefile.am:
- * README:
- * composite.h:
- * compositeext.pc.in:
- * compositeproto.h:
- * configure.ac:
- * protocol:
- Change name from Apportion to Composite
- Clarify that root cannot be redirected.
- Add more error values.
-
-2003-10-29 Keith Packard
-
- * COPYING:
- * INSTALL:
- * Makefile.am:
- * README:
- * apportion.h:
- * apportionext.pc.in:
- * apportionproto.h:
- * autogen.sh:
- * configure.ac:
- * protocol:
- autofoo
- Add protocol headers
- Use enum for update mode instead of bool
-
-2003-10-29 Keith Packard
-
- * protocol:
- Define clipping while redirected
-
-2003-10-24 Keith Packard
-
- * ChangeLog
- * protocol
- Initial protocol design imported
+ compositeproto 0.4.1
+
+ Signed-off-by: Alan Coopersmith
+
+commit ad173235db562b7f788ad82e5b4849c1519bd0b5
+Author: Alan Coopersmith
+Date: Fri Oct 2 18:57:51 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit bbdc2ae4f4115332337460631911857cbadaf603
+Author: Alan Coopersmith
+Date: Fri Oct 2 18:52:44 2009 -0700
+
+ Add pointers to mailing list, git repo, and wiki to README
+
+ Signed-off-by: Alan Coopersmith
+
+commit 961dbcda7fcfd15a3e60bfb905f05286ba33508f
+Author: Gaetan Nadon
+Date: Wed Jul 8 10:03:40 2009 -0400
+
+ compositeproto: use XORG_CHANGELOG macro to create ChangeLog. #22611
+
+ Build break: Makefile.am: command not found: git-log
+ Adding the macro in configure.ac and use it in Makefile.am
+ Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611
+ Tested: running autogen.sh, make and 'make dist'
+
+ Signed-off-by: Gaetan Nadon
+ Signed-off-by: Peter Hutterer
+
+commit 2ffb32d61cbed1452d67abb2028ac13910550392
+Author: James Cloos
+Date: Thu Dec 6 16:38:57 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 5ac473a9375fa43896e379da96d1955653960350
+Author: Jeremy C. Reed
+Date: Thu Aug 16 11:28:30 2007 -0500
+
+ Temporarily define Pixmap (just like Window and Region). (From pkgsrc.)
+
+commit 25e8047e25652be388dc66d85c180dcc4ccea4f6
+Author: Keith Packard
+Date: Tue Jul 3 14:11:10 2007 -0700
+
+ Bump version in configure.ac to 0.4
+
+commit 1838412121d0bac8ce443d362e75439d58a93a4d
+Author: Keith Packard
+Date: Tue Jul 3 14:09:41 2007 -0700
+
+ Define new manual-redirect clipping semantics and bump version to 0.4.
+
+ Manual-redirect windows no longer clip their parents, nor do they affect
+ expose event computation. This makes it possible to create application-level
+ composited windows which can be damaged by other window manipulations.
+
+ This patch also removes the coordinate transformation stuff which was never
+ released.
+
+commit bca9592612d60142e3c624b90649475b561b8eda
+Author: Alan Coopersmith
+Date: Tue Apr 17 20:48:18 2007 -0700
+
+ Add *~ to .gitignore to skip emacs/patch droppings
+
+commit 6acacb52efd6f0927c9b82fe864f17623e7dc8c2
+Author: Alan Coopersmith
+Date: Tue Apr 17 20:47:50 2007 -0700
+
+ Protocol spec nit cleanups
+
+ Fix versioning from 0.3/0.4 merge
+ Update description of RedirectWindow to match names in protocol diagrams
+
+commit dd2133540f8dd0f0f66ecf24e01113184045af83
+Author: Eric Anholt
+Date: Tue Jan 9 10:42:31 2007 -0800
+
+ Update protocol spec for 0.3 -> 0.4 rename and new 0.3 request.
+
+ The original overlay window text was from Deron Johnson, but I moved it
+ around to be where I understand the pieces of the description were meant to go.
+
+commit ea2c1d120e58e3eb5f2d8eedb3c32b2cfa052366
+Author: Eric Anholt
+Date: Tue Jan 9 09:46:31 2007 -0800
+
+ Move composite protocol description to the new canonical location/name.
+
+commit 34251361a60c9e0c0f3c51416985e067c2aa255a
+Author: Aaron Plattner
+Date: Tue Dec 5 12:39:15 2006 -0800
+
+ Have NameWindowPixmap return a Match error on unrealized windows.
+
+commit 5ecbf06cb7786009e8e1547f4bc2b0640599f655
+Author: root
+Date: Tue Aug 15 14:30:32 2006 -0700
+
+ Correct the spelling of compositedocdir_DATA. Otherwise automake complains.
+
+commit ba9ca99638fac157b126a2d9a3e57385bad32998
+Author: Deron
+Date: Fri Mar 31 03:29:42 2006 -0800
+
+ Sync'd with modular proto/Composite (Version 0.3 definitions).
+ Also changed CTR definitions to Version 0.4 and increased the
+ request numbers to be above those of Version 0.3.
+
+commit 565c0bcc569f5ab9114314185316fe2129aa5a3e
+Author: Keith Packard
+Date: Fri Feb 24 02:55:19 2006 +0100
+
+ Add coordinate transform redirect protocol bits
+
+commit 8e0790045d33525ec182afd3997014b46ef77b66
+Author: Keith Packard
+Date: Fri Feb 24 02:06:13 2006 +0100
+
+ Clean up mistakes integrating xorg changes
+
+commit 1d43eaf21b32fef4aba8a58dee323344b7f48d16
+Author: Keith Packard
+Date: Fri Feb 24 02:03:25 2006 +0100
+
+ Remove .cvsignore
+
+commit 694da3931be9bb03e23e4fbaf54d331c2202b2fc
+Author: Keith Packard
+Date: Fri Feb 24 02:01:54 2006 +0100
+
+ Add .gitignore
+
+commit 369d28141b1b296abeb4365b5c57846d72faeb82
+Author: Keith Packard
+Date: Fri Feb 24 02:01:10 2006 +0100
+
+ Paste Xorg changes on top of historical xlibs repository
+
+commit 7388d4f6dd9e0c71d79c33905135622be15ccd13
+Author: Keith Packard
+Date: Mon Feb 20 18:41:15 2006 +0000
+
+ Update to include CTR
+
+commit 90d453e5ab0cd140e936c71c118e442f6f6563f7
+Author: Daniel Stone
+Date: Mon Jan 3 05:16:04 2005 +0000
+
+ New autogen.sh from Thomas Fitzsimmons that works with srcdir != objdir.
+
+commit 734331f433e1d853aba942e17b3ed3efb0d972ab
+Author: Keith Packard
+Date: Thu Jul 8 07:20:55 2004 +0000
+
+ Add NameWindowPixmap request. Bump protocol to 0.2
+
+commit 19bb2c38370f5ef9296d451970f93e570b5a8546
+Author: Eric Anholt
+Date: Sun Jun 27 07:23:56 2004 +0000
+
+ Fix some apostrophe issues.
+
+commit 47c46ad42a57d1dc8f2cf2e9e5d8b1478e75cd3b
+Author: Jim Gettys
+Date: Tue Feb 3 20:42:46 2004 +0000
+
+ Add author's information
+
+commit cad37f16480f8f3f51e5dd9d3b3314ec8f73cee9
+Author: Daniel Stone
+Date: Thu Jan 15 03:42:08 2004 +0000
+
+ Tag release 2.0 for first freedesktop.org clientside release.
+
+commit 0acceb62100f3acb3a00615c51bfd8e3f57e3ff9
+Author: Carl Worth
+Date: Tue Nov 11 18:34:48 2003 +0000
+
+ Updated .cvsignore
+
+commit 35a9c80252b35720c1afc5dc53153228e2084b10
+Author: Keith Packard
+Date: Sun Nov 9 07:07:21 2003 +0000
+
+ Note that Manual Subwindows mode disables background painting.
+
+commit 11105d870631fe5f858291fbf167f1da400d7fa9
+Author: Keith Packard
+Date: Fri Nov 7 04:21:01 2003 +0000
+
+ Add update mode to Unredirect requests so clients can redirect multiple times (and then unredirect) Add CompositeNumberRequests Fix some typeos
+
+commit 0b7b69d3b678f584062ca352f60382325057d9f1
+Author: Keith Packard
+Date: Wed Nov 5 05:39:58 2003 +0000
+
+ Change name from Apportion to Composite Clarify that root cannot be redirected. Add more error values.
+
+commit 5113df7e49393afb5d9199f030b6f4e025a54039
+Author: Keith Packard
+Date: Thu Oct 30 04:31:19 2003 +0000
+
+ autofoo Add protocol headers Use enum for update mode instead of bool
+
+commit 00b320e307a997677e74c73f9c856e7b08bc20e2
+Author: Keith Packard
+Date: Wed Oct 29 23:48:40 2003 +0000
+
+ Define clipping while redirected
+
+commit 7cc591f9ffac4a01f7801d924beace89ed3460bb
+Author: Keith Packard
+Date: Tue Oct 28 20:43:27 2003 +0000
+
+ spelling mistake
+
+commit faa486b819f8b3088201923541a1c0a71efa249a
+Author: Keith Packard
+Date: Fri Oct 24 23:05:41 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/compositeproto-0.4/Makefile.am new/compositeproto-0.4.1/Makefile.am
--- old/compositeproto-0.4/Makefile.am 2007-07-03 22:40:36.000000000 +0200
+++ new/compositeproto-0.4.1/Makefile.am 2009-07-16 06:20:21.000000000 +0200
@@ -33,3 +33,13 @@
compositedoc_DATA = compositeproto.txt
EXTRA_DIST = autogen.sh compositeproto.pc.in $(compositedoc_DATA)
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/compositeproto-0.4/README new/compositeproto-0.4.1/README
--- old/compositeproto-0.4/README 2006-07-01 09:00:07.000000000 +0200
+++ new/compositeproto-0.4.1/README 2009-10-03 03:51:50.000000000 +0200
@@ -7,3 +7,27 @@
Keith Packard
keithp@keithp.com
+
+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/proto/compositeproto
+
+ http://cgit.freedesktop.org/xorg/proto/compositeproto
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/compositeproto-0.4/compositeproto.h new/compositeproto-0.4.1/compositeproto.h
--- old/compositeproto-0.4/compositeproto.h 2007-07-03 23:01:16.000000000 +0200
+++ new/compositeproto-0.4.1/compositeproto.h 2007-08-21 04:42:42.000000000 +0200
@@ -51,6 +51,7 @@
#define Window CARD32
#define Region CARD32
+#define Pixmap CARD32
/*
* requests and replies
@@ -187,5 +188,6 @@
#undef Window
#undef Region
+#undef Pixmap
#endif /* _COMPOSITEPROTO_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/compositeproto-0.4/configure.ac new/compositeproto-0.4.1/configure.ac
--- old/compositeproto-0.4/configure.ac 2007-07-03 23:10:29.000000000 +0200
+++ new/compositeproto-0.4.1/configure.ac 2009-10-03 03:59:14.000000000 +0200
@@ -24,11 +24,15 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT([CompositeProto], [0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([CompositeProto], [0.4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-XORG_RELEASE_VERSION
+# 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)
+
+XORG_DEFAULT_OPTIONS
AC_OUTPUT([Makefile
compositeproto.pc])
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/compositeproto-0.4/missing new/compositeproto-0.4.1/missing
--- old/compositeproto-0.4/missing 2007-07-03 23:01:38.000000000 +0200
+++ new/compositeproto-0.4.1/missing 2009-10-03 04:00:22.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:
++++++ damageproto-1.1.0.tar.bz2 -> damageproto-1.2.0.tar.bz2 ++++++
++++ 7033 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/damageproto-1.1.0/ChangeLog new/damageproto-1.2.0/ChangeLog
--- old/damageproto-1.1.0/ChangeLog 2007-01-10 01:19:05.000000000 +0100
+++ new/damageproto-1.2.0/ChangeLog 2009-08-27 07:43:56.000000000 +0200
@@ -1,39 +1,146 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 1950869c1640590b2ce7a96e2a97746b308093f8
+Author: Peter Hutterer
+Date: Thu Aug 27 15:43:27 2009 +1000
- * configure.ac:
- Update package version for X11R7 release.
+ damageproto 1.2.0
-2005-01-16 Chris Larson
+commit d25f083ba38d796e9a91de468fc8bec33545e400
+Author: Peter Hutterer
+Date: Tue Aug 25 17:48:20 2009 +1000
- * configure.ac: Fix to work with automake 1.9.x.
+ Remove RCS tags
+
+ Signed-off-by: Peter Hutterer
-2004-02-03 Jim Gettys
+commit 12b708a2fe5cb538c87239b35822ccc318f98b12
+Author: Gaetan Nadon
+Date: Wed Jul 8 10:11:26 2009 -0400
- * AUTHORS: Add AUTHORS to file
+ damageproto: use XORG_CHANGELOG macro to create ChangeLog. #22611
+
+ Build break: Makefile.am: command not found: git-log
+ Adding the macro in configure.ac and use it in Makefile.am
+ Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611
+ Tested: running autogen.sh, make and 'make dist'
+
+ Signed-off-by: Gaetan Nadon
+ Signed-off-by: Peter Hutterer
-2004-01-15 Daniel Stone
- * Tag release 1.0 for first freedesktop.org clientside lib release.
+commit c25bdf1cce48ad1b2bb33ba45969572e6e4d385f
+Author: Owen Taylor
+Date: Fri Sep 19 09:52:07 2008 -0400
-2003-11-03 Keith Packard
+ Document that 'parts' may be None for DamageSubtract
+
+ The server code has handled parts == None since at least 2004.
- * protocol:
- Mark document revision
- Credit Havoc the Tolerant for his earlier design and implementation
+commit ad1a35b351012a347c49246f986655e3a91431df
+Author: James Cloos
+Date: Thu Dec 6 16:38:57 2007 -0500
-2003-10-23 Keith Packard
+ Replace static ChangeLog with dist-hook to generate from git log
- * COPYING:
- * INSTALL:
- * Makefile.am:
- * README:
- * autogen.sh:
- * configure.ac:
- * damageext.pc.in:
- * damageproto.h:
- * damagewire.h:
- * protocol:
- Initial working version -- added DamageDestroy and damage objects
+commit 63881a6b3f5571ba4c4b3614ea9346c733eb471b
+Author: James Cloos
+Date: Mon Sep 3 05:54:00 2007 -0400
-2003-10-18 Keith Packard
+Date: Tue Jan 9 16:19:30 2007 -0800
+
+ Rename DamagePost to DamageAdd per suggestion from keithp.
+
+commit 97c47fc81f0dc152e1d32800ce5022d2d25c3c43
+Author: Eric Anholt
+Date: Mon Jan 8 13:45:10 2007 -0800
+
+ Install the protocol doc as damageproto.txt in its canonical doc dir.
+
+commit 7a6e37818a6854ec4d74f80ce5053e04b7ae75ba
+Author: Eric Anholt
+Date: Mon Jan 8 13:41:20 2007 -0800
+
+ Documentation and copyright updates for 1.1 protocol (and other fixes).
+
+commit df33455a4506362eff4d393dc7d58c9d73ddf870
+Author: Eric Anholt
+Date: Fri Jan 5 17:52:49 2007 -0800
+
+ Add a request to report a region of damage to a drawable.
+
+ This bumps the protocol (and package) version to 1.1.
+
+commit 03e7a652b1674530e0d06ca8e2f869c0ba473f9f
+Author: Keith Packard
+Date: Fri Feb 24 02:15:53 2006 +0100
+
+ reflect filename change to .gitignore
+
+commit e6392f4199532cfd61195e45b784a252879e4750
+Author: Keith Packard
+Date: Fri Feb 24 02:15:27 2006 +0100
+
+ Import changes from X.org repository
+
+commit 1a28d9a791ed918172286110e0dcffe458489b1a
+Author: Keith Packard
+Date: Fri Feb 24 02:09:04 2006 +0100
+
+ rename damageext.pc.in to damageproto.pc.in as per xorg
+
+commit 44c98d231588b6bdc1884ba7e6999b706238ecd7
+Author: Chris Larson
+Date: Sun Jan 16 17:30:53 2005 +0000
+
+ Fix to work with automake 1.9.x.
+
+commit e86de666f5c9629cd98ed2b0460033da5d89a55b
+Author: Daniel Stone
+Date: Mon Jan 3 05:16:14 2005 +0000
+
+ New autogen.sh from Thomas Fitzsimmons that works with srcdir != objdir.
+
+commit 648b14e2d0c1222cbe7571443ba00bb777fee2d4
+Author: Jim Gettys
+Date: Tue Feb 3 20:44:42 2004 +0000
+
+ add author to AUTHOR's file.
+
+commit 513adccc0f3db333c4b946e7173e0f286cc5b58e
+Author: Daniel Stone
+Date: Thu Jan 15 03:40:44 2004 +0000
+
+ Tag release 1.0 for first freedesktop.org clientside lib release.
+
+commit d3ba8ef49c46fc691458ae319b80a85ccc25c121
+Author: Chris Lee
+Date: Wed Nov 26 03:47:58 2003 +0000
+
+ Fixes to make these work on Debian's libtool (which seems to still be buggy).
+ -clee
+
+commit b5f3d0fe86af6e077cda237fcb1b2f34ab9c1eea
+Author: Keith Packard
+Date: Tue Nov 4 03:30:32 2003 +0000
+
+ Mark document revision Credit Havoc the Tolerant for his earlier design and implementation
+
+commit 4abd06d76008abede31086fccb7c0136732241a9
+Author: Keith Packard
+Date: Fri Oct 24 06:39:35 2003 +0000
+
+ Add .cvsignore
+
+commit a4b351053662f4db4a165117cb18555dc4fabd33
+Author: Keith Packard
+Date: Fri Oct 24 06:16:46 2003 +0000
+
+ Initial working version -- added DamageDestroy and damage objects
+
+commit 1b3ffaa1a673418fab22383bf509040924d177d3
+Author: Keith Packard
+Date: Sun Oct 19 04:55:31 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/damageproto-1.1.0/Makefile.am new/damageproto-1.2.0/Makefile.am
--- old/damageproto-1.1.0/Makefile.am 2007-01-10 01:19:05.000000000 +0100
+++ new/damageproto-1.2.0/Makefile.am 2009-08-27 07:42:17.000000000 +0200
@@ -1,6 +1,4 @@
#
-# $Id: Makefile.am,v 1.1 2003-10-24 06:16:46 keithp Exp $
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
@@ -34,3 +32,13 @@
EXTRA_DIST = autogen.sh damageproto.pc.in $(damagedoc_DATA)
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/damageproto-1.1.0/configure.ac new/damageproto-1.2.0/configure.ac
--- old/damageproto-1.1.0/configure.ac 2007-01-10 01:19:05.000000000 +0100
+++ new/damageproto-1.2.0/configure.ac 2009-08-27 07:42:45.000000000 +0200
@@ -1,6 +1,4 @@
dnl
-dnl $Id: configure.ac,v 1.3 2005-01-16 17:30:53 pb Exp $
-dnl
dnl Copyright © 2003 Keith Packard, Noah Levitt
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@@ -24,11 +22,16 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT([DamageProto], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DamageProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_RELEASE_VERSION XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
damageproto.pc])
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/damageproto-1.1.0/damageproto.h new/damageproto-1.2.0/damageproto.h
--- old/damageproto-1.1.0/damageproto.h 2007-01-10 01:19:05.000000000 +0100
+++ new/damageproto-1.2.0/damageproto.h 2009-08-25 09:47:53.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id: damageproto.h,v 1.1 2003-10-24 06:16:46 keithp Exp $
- *
* Copyright © 2003 Keith Packard
* Copyright © 2007 Eric Anholt
*
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/damageproto-1.1.0/damageproto.txt new/damageproto-1.2.0/damageproto.txt
--- old/damageproto-1.1.0/damageproto.txt 2007-01-10 01:19:05.000000000 +0100
+++ new/damageproto-1.2.0/damageproto.txt 2009-03-10 00:28:53.000000000 +0100
@@ -191,20 +191,21 @@
damage: DAMAGE
repair: Region or None
- parts: Region
+ parts: Region or None
Synchronously modifies the regions in the following manner:
If repair is None:
- 1) parts = damage
+ 1) if parts is not None, parts = damage
2) damage = <empty>
Otherwise:
- 1) parts = damage INTERSECT repair
- 2) damage = damage - parts
- 3) Generate DamageNotify for remaining damage areas
+ 1) tmp = damage INTERSECT repair
+ 2) damage = damage - tmp
+ 3) if parts is not None, parts = tmp
+ 4) Generate DamageNotify for remaining damage areas
DamageAdd
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/damageproto-1.1.0/damagewire.h new/damageproto-1.2.0/damagewire.h
--- old/damageproto-1.1.0/damagewire.h 2007-01-10 01:19:05.000000000 +0100
+++ new/damageproto-1.2.0/damagewire.h 2009-08-25 09:48:14.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id: damagewire.h,v 1.1 2003-10-24 06:16:46 keithp Exp $
- *
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
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/damageproto-1.1.0/missing new/damageproto-1.2.0/missing
--- old/damageproto-1.1.0/missing 2007-01-10 01:19:05.000000000 +0100
+++ new/damageproto-1.2.0/missing 2009-03-10 00:35:27.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,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 +46,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 +79,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
@@ -106,7 +109,7 @@
# 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
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,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";;
@@ -192,8 +195,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
@@ -214,25 +217,25 @@
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
;;
@@ -244,18 +247,18 @@
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
;;
@@ -267,11 +270,9 @@
\`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
@@ -289,11 +290,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
@@ -317,13 +324,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
++++++ fontsproto-X11R7.0-2.0.2.tar.bz2 -> fontsproto-2.1.0.tar.bz2 ++++++
++++ 8054 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/fontsproto-X11R7.0-2.0.2/ChangeLog new/fontsproto-2.1.0/ChangeLog
--- old/fontsproto-X11R7.0-2.0.2/ChangeLog 2005-12-15 01:24:37.000000000 +0100
+++ new/fontsproto-2.1.0/ChangeLog 2009-08-27 08:21:54.000000000 +0200
@@ -1,4 +1,167 @@
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 8ce8e2e50381e8cc7f21af58e6481175d1689ea6
+Author: Peter Hutterer
+Date: Thu Aug 27 16:21:09 2009 +1000
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ fontsproto 2.1.0
+
+ Signed-off-by: Peter Hutterer
+
+commit c2c7f7c5b7bc45a2ff99fe252892b803c3d222fd
+Author: Peter Hutterer
+Date: Thu Aug 27 16:16:36 2009 +1000
+
+ Remove RCS tags
+
+ Signed-off-by: Peter Hutterer
+
+commit 72c22dd717afe4c7e796eae634e8c4ec175af677
+Author: Paulo Cesar Pereira de Andrade
+Date: Tue Jan 27 20:06:28 2009 -0200
+
+ Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit 451d42b3e5a32b91e874a32d0874485899e3b350
+Author: James Cloos
+Date: Thu Dec 6 16:39:01 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 863651c2af7b32bba7eedf5d43fdbd97998bd580
+Author: James Cloos
+Date: Mon Sep 3 05:54:04 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 8d5cafd32d08753050738314a291dd2fd3ad91c2
+Author: Alan Coopersmith
+Date: Fri Jul 14 18:56:15 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 6ddcf067a4b10a306f13b2732c712c0a95fe26ea
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:37 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit bb2fe46e444a270e506904856e4f989deb67c1bc
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:14 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 9956a3dd5c2931a790c6e7150ddfbd0d620fdf1f
+Author: Eric Anholt
+Date: Tue Aug 2 19:19:38 2005 +0000
+
+ Add basic .cvsignore files for proto modules.
+
+commit d63eb21475e0c75a6bf3bb1eeef12b395ccab7b0
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:55 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 4a938cdb4e61bb249c36a36ed480033282dba0c4
+Author: Daniel Stone
+Date: Sat May 21 03:52:47 2005 +0000
+
+ Change version to 2.0.
+
+commit 82b845b9a129ec244e42a5718867bdb3f4c5e62d
+Author: Adam Jackson
+Date: Thu May 19 00:22:39 2005 +0000
+
+ revert last change, didn't do right thing at all, sorry for the noise
+
+commit 46342b904dfb936a8859c1d9a268f0d8c8af123a
+Author: Adam Jackson
+Date: Thu May 19 00:10:18 2005 +0000
+
+ Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit e25b847cf67fd41ad36c4cb7b900bf0ed5ce8fb9
+Author: Josh Triplett
+Date: Sat May 14 09:35:25 2005 +0000
+
+ The headers should go in include/X11/fonts, not include/X11/extensions.
+
+commit 747b5f710fd29f8e34d7d5eefbbca3a728fa8346
+Author: Josh Triplett
+Date: Sat May 14 08:58:05 2005 +0000
+
+ Add COPYING file for Fonts.
+
+commit f875959fca0981f17522c6325e072391582090de
+Author: Søren Sandmann Pedersen
+Date: Mon May 9 18:20:04 2005 +0000
+
+ Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit 79c89e7f8bd4a291cc58bc18727503ab853764db
+Author: Kevin E Martin
+Date: Fri May 6 01:46:30 2005 +0000
+
+ Initial build system files for proto module.
+
+commit f8419f84622bf0b65e1ed62c1828d041613a3e01
+Author: Egbert Eich
+Date: Fri Apr 23 18:43:08 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 89c4f5b099d21bab972166ea898d8f333d98dad5
+Author: Egbert Eich
+Date: Sun Mar 14 08:31:37 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit ae0ac1684eca92422687ae874e058f17239f503e
+Author: Egbert Eich
+Date: Wed Mar 3 12:10:54 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 08666a657f4c63581c582807760d53dbd44d068f
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:14 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit bd9361f063b45969747cc3458c4028aeb63a17d1
+Author: Egbert Eich
+Date: Thu Feb 26 09:22:28 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit ba8889a4f7dff3d3f4ca15e7cde42baa792cecea
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:28:02 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 5be5f868949cb6cd23acf73db79193c9adca9681
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:44 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit d551e3eaf4060cb24ed68eee06323337f12a95ad
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:44 2003 +0000
+
+ Initial revision
+
+commit 387de4c2e956ae535a37da724803bc4acdd9ae3c
+Author: Kaleb Keithley
+Date: Fri Nov 14 15:54:35 2003 +0000
+
+ R6.6 is the Xorg base-line
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fontsproto-X11R7.0-2.0.2/FS.h new/fontsproto-2.1.0/FS.h
--- old/fontsproto-X11R7.0-2.0.2/FS.h 2004-04-23 20:43:08.000000000 +0200
+++ new/fontsproto-2.1.0/FS.h 2009-08-27 08:16:13.000000000 +0200
@@ -1,5 +1,3 @@
-/* $Xorg: FS.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-
/*
* Copyright 1990, 1991 Network Computing Devices;
* Portions Copyright 1987 by Digital Equipment Corporation
@@ -50,7 +48,6 @@
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/include/fonts/FS.h,v 1.9 2003/07/09 15:27:28 tsi Exp $ */
#ifndef _FS_H_
#define _FS_H_
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fontsproto-X11R7.0-2.0.2/FSproto.h new/fontsproto-2.1.0/FSproto.h
--- old/fontsproto-X11R7.0-2.0.2/FSproto.h 2004-04-23 20:43:08.000000000 +0200
+++ new/fontsproto-2.1.0/FSproto.h 2009-08-27 08:16:24.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: FSproto.h,v 1.4 2001/02/09 02:03:25 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/include/fonts/FSproto.h,v 1.2 2001/08/01 00:44:37 tsi Exp $ */
#ifndef _FS_PROTO_H_
#define _FS_PROTO_H_
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fontsproto-X11R7.0-2.0.2/Makefile.am new/fontsproto-2.1.0/Makefile.am
--- old/fontsproto-X11R7.0-2.0.2/Makefile.am 2005-05-14 11:35:25.000000000 +0200
+++ new/fontsproto-2.1.0/Makefile.am 2009-08-27 08:15:37.000000000 +0200
@@ -10,4 +10,14 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = fontsproto.pc
-EXTRA_DIST = autogen.sh fontsproto.pc.in
+EXTRA_DIST = fontsproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fontsproto-X11R7.0-2.0.2/autogen.sh new/fontsproto-2.1.0/autogen.sh
--- old/fontsproto-X11R7.0-2.0.2/autogen.sh 2005-05-06 03:46:30.000000000 +0200
+++ new/fontsproto-2.1.0/autogen.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fontsproto-X11R7.0-2.0.2/configure.ac new/fontsproto-2.1.0/configure.ac
--- old/fontsproto-X11R7.0-2.0.2/configure.ac 2005-12-15 01:24:37.000000000 +0100
+++ new/fontsproto-2.1.0/configure.ac 2009-08-27 08:20:59.000000000 +0200
@@ -1,8 +1,12 @@
AC_PREREQ([2.57])
-AC_INIT([FontsProto], [2.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([FontsProto], [2.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
+# Require xorg-macros: XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
fontsproto.pc])
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/fontsproto-X11R7.0-2.0.2/font.h new/fontsproto-2.1.0/font.h
--- old/fontsproto-X11R7.0-2.0.2/font.h 2004-04-23 20:43:08.000000000 +0200
+++ new/fontsproto-2.1.0/font.h 2009-08-27 08:15:50.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: font.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,8 +20,6 @@
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/include/fonts/font.h,v 3.4 2000/11/27 00:10:02 dawes Exp $ */
-/* $NCDXorg: @(#)font.h,v 1.7 1991/06/24 17:00:23 lemke Exp $ */
#ifndef FONT_H
#define FONT_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fontsproto-X11R7.0-2.0.2/fontproto.h new/fontsproto-2.1.0/fontproto.h
--- old/fontsproto-X11R7.0-2.0.2/fontproto.h 2004-04-23 20:43:08.000000000 +0200
+++ new/fontsproto-2.1.0/fontproto.h 2009-08-27 08:16:01.000000000 +0200
@@ -1,5 +1,3 @@
-/* $XFree86: xc/include/fonts/fontproto.h,v 1.2 1999/09/04 09:14:08 dawes Exp $ */
-
/***********************************************************
Copyright (c) 1999 The XFree86 Project Inc.
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/fontsproto-X11R7.0-2.0.2/fontstruct.h new/fontsproto-2.1.0/fontstruct.h
--- old/fontsproto-X11R7.0-2.0.2/fontstruct.h 2004-04-23 20:43:08.000000000 +0200
+++ new/fontsproto-2.1.0/fontstruct.h 2009-08-27 08:16:06.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: fontstruct.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/include/fonts/fontstruct.h,v 3.3 1999/08/21 13:47:34 dawes Exp $ */
#ifndef FONTSTR_H
#define FONTSTR_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fontsproto-X11R7.0-2.0.2/fsmasks.h new/fontsproto-2.1.0/fsmasks.h
--- old/fontsproto-X11R7.0-2.0.2/fsmasks.h 2003-11-14 17:48:44.000000000 +0100
+++ new/fontsproto-2.1.0/fsmasks.h 2009-08-27 08:16:17.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: fsmasks.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
/*
* Copyright 1990, 1991 Network Computing Devices;
* Portions Copyright 1987 by Digital Equipment Corporation
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/fontsproto-X11R7.0-2.0.2/missing new/fontsproto-2.1.0/missing
--- old/fontsproto-X11R7.0-2.0.2/missing 2005-12-21 07:55:27.000000000 +0100
+++ new/fontsproto-2.1.0/missing 2009-03-10 00:35:50.000000000 +0100
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2006-05-10.23
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -15,8 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -29,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -38,18 +44,24 @@
configure_ac=configure.in
fi
-case "$1" in
+msg="missing on your system"
+
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -67,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -74,11 +87,15 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to ."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,14 +104,44 @@
exit 1
;;
- aclocal*)
+esac
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case $1 in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $1 in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
@@ -102,13 +149,8 @@
;;
autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
@@ -116,13 +158,8 @@
;;
autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -130,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -140,13 +177,8 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -156,20 +188,15 @@
;;
autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- 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
@@ -185,74 +212,67 @@
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -262,32 +282,36 @@
;;
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -300,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -323,8 +347,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +358,10 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
++++++ kbproto-1.0.3.tar.bz2 -> kbproto-1.0.4.tar.bz2 ++++++
++++ 13400 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/kbproto-1.0.3/ChangeLog new/kbproto-1.0.4/ChangeLog
--- old/kbproto-1.0.3/ChangeLog 2006-07-18 21:20:58.000000000 +0200
+++ new/kbproto-1.0.4/ChangeLog 2009-10-13 07:41:20.000000000 +0200
@@ -1,4 +1,208 @@
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 4e3ccd5b2144005af1d5d2f9b96275a01156aec5
+Author: Alan Coopersmith
+Date: Mon Oct 12 22:39:05 2009 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ kbproto 1.0.4
+
+ Signed-off-by: Alan Coopersmith
+
+commit 6472994ea38a8416214b5ce12a34437541e6d15e
+Author: Alan Coopersmith
+Date: Mon Oct 12 22:38:03 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit 5273e7bc22cc7f11f2461ba1f5f30cbdecda1289
+Author: Jeremy Huddleston
+Date: Mon Apr 6 17:54:12 2009 -0700
+
+ Made some defines typedefs for better compatability
+
+commit 3baa0be057f2bf2e2f0f049c0dded4a93c68819e
+Author: Paulo Cesar Pereira de Andrade
+Date: Tue Jan 27 20:06:28 2009 -0200
+
+ Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit 0396fb99f96ff15e1000a6e4b5ccdca119319a8a
+Author: James Cloos
+Date: Thu Dec 6 16:39:02 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 1a41bb4ff63d0fa27238be2af6a8b59941c0f7db
+Author: James Cloos
+Date: Mon Sep 3 05:54:08 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit c4f5dac457e13d2cd5a1d8a1e28e56dd5d3be856
+Author: Daniel Stone
+Date: Tue Jul 18 15:21:43 2006 -0400
+
+ Bump to 1.0.3.
+
+commit b23c0835504887f460deeac55b8be94d07336745
+Author: Daniel Stone
+Date: Tue Jul 18 15:21:28 2006 -0400
+
+ unconditionally declare XFree86Private
+ This could probably be moved to generic DDX private.
+
+commit 85c889c725de1a0233c845c75ad62b39940b120a
+Author: Alan Coopersmith
+Date: Fri Jul 14 18:56:20 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit d15dc14c2fb8996e1da9daaef748ff35f7844809
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:38 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 9d625ab848eee9a7488e6ee3d4cfbeea5198f61b
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:14 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit b9a70202a5d2edc2d62cbe2776635e994f07bb2d
+Author: Kristian Høgsberg
+Date: Thu Sep 1 19:56:14 2005 +0000
+
+ Teach xkb how to optionally run xkbcomp from $bindir instead of
+ $datadir/xkb.
+
+commit ac13227d0007b6fac32af6281ae2e49f5e8fa90c
+Author: Eric Anholt
+Date: Tue Aug 2 19:19:39 2005 +0000
+
+ Add basic .cvsignore files for proto modules.
+
+commit 81b6633f6509e0d8053a40cc9fe4025202991112
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:55 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 234e6351e159ec892c0f9878663819c32a88fabd
+Author: Alan Coopersmith
+Date: Thu Jul 7 19:07:28 2005 +0000
+
+ More compiler warning fixes for missing prototypes:
+ Add prototype for XkbSetExtension()
+ Add #include for isspace() & isdigit()
+ Add #include (for initgroups()) and remove extra *
+ Add prototype for xorgGetVersion()
+
+commit 4a9390f0bfc464967151b670179998d375e28d75
+Author: Alan Coopersmith
+Date: Sun May 22 01:12:49 2005 +0000
+
+ Bugzilla #2800 https://bugs.freedesktop.org/show_bug.cgi?id=2800 Xevie
+ extension crash with signal 11 on keyboard Bugzilla #1205
+ https://bugs.freedesktop.org/show_bug.cgi?id=1205 Xevie client
+ receives two KeyPress events on consumed keys when XKB is enabled
+ Patch #2223 https://bugs.freedesktop.org/attachment.cgi?id=2223 Fixes for
+ both of these and some other Xevie bugs (Derek Wang - Sun Microsystems)
+
+commit 3c68899e6798045e60d3c99900ab73825a612237
+Author: Daniel Stone
+Date: Sat May 21 04:12:09 2005 +0000
+
+ Set version to 1.0.
+
+commit d346d81559dc1c8ca0d52c98c667a1afec40ce71
+Author: Adam Jackson
+Date: Thu May 19 00:22:39 2005 +0000
+
+ revert last change, didn't do right thing at all, sorry for the noise
+
+commit 6882836c45e5a5e1caef49aa33b6fc1db0b48e27
+Author: Adam Jackson
+Date: Thu May 19 00:10:18 2005 +0000
+
+ Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit d4a17c55d88d4a373fb1ade20001be80c5a956db
+Author: Josh Triplett
+Date: Mon May 16 03:53:47 2005 +0000
+
+ Add COPYING file for KB.
+
+commit 19bc22d68a990a2498934695f4d938519345a1b0
+Author: Søren Sandmann Pedersen
+Date: Mon May 9 18:20:05 2005 +0000
+
+ Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit aaef7b5591cfaaa08ca1d03b113e04dd726059a1
+Author: Kevin E Martin
+Date: Fri May 6 01:46:31 2005 +0000
+
+ Initial build system files for proto module.
+
+commit b5bacc5786658560870cc24975d29d582e9a335c
+Author: Egbert Eich
+Date: Fri Apr 23 18:43:06 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 50b5d3dd26018cec029d04413bc8deabb83a3845
+Author: Egbert Eich
+Date: Sun Mar 14 08:31:35 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit f121988370dcc8b5dbdc5b77c49e3c2fb2558fb2
+Author: Egbert Eich
+Date: Wed Mar 3 12:10:54 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 85a3d5bced3a1907fe42bbd25b77b3d2e35b1935
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:11 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 27095f92dfad92436113534f850098810d067fb0
+Author: Egbert Eich
+Date: Thu Feb 26 09:22:27 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 532eebc568179adf69317855e2c3c9cf305ef81c
+Author: Egbert Eich
+Date: Thu Jan 29 08:07:56 2004 +0000
+
+ Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit 66aafd71e17dbaeb0ba7fa4bf72f17e57d9022e5
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:28:02 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit bae998431a7285432eb5d1f519246e41832754d0
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:42 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 209ae2d4c9cd739e91f8c00184dc6f2f48e21100
+Author: Kaleb Keithley
+Date: Fri Nov 14 15:54:35 2003 +0000
+
+ R6.6 is the Xorg base-line
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kbproto-1.0.3/Makefile.am new/kbproto-1.0.4/Makefile.am
--- old/kbproto-1.0.3/Makefile.am 2006-07-18 21:20:58.000000000 +0200
+++ new/kbproto-1.0.4/Makefile.am 2009-01-28 03:27:57.000000000 +0100
@@ -9,4 +9,14 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = kbproto.pc
-EXTRA_DIST = autogen.sh kbproto.pc.in
+EXTRA_DIST = kbproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kbproto-1.0.3/XKBsrv.h new/kbproto-1.0.4/XKBsrv.h
--- old/kbproto-1.0.3/XKBsrv.h 2006-07-18 21:20:58.000000000 +0200
+++ new/kbproto-1.0.4/XKBsrv.h 2009-04-15 23:10:09.000000000 +0200
@@ -330,9 +330,9 @@
#undef IsKeypadKey
#define IsKeypadKey(s) XkbKSIsKeypad(s)
-#define Status int
-#define XPointer pointer
-#define Display struct _XDisplay
+typedef int Status;
+typedef pointer XPointer;
+typedef struct _XDisplay Display;
#ifndef True
#define True 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kbproto-1.0.3/autogen.sh new/kbproto-1.0.4/autogen.sh
--- old/kbproto-1.0.3/autogen.sh 2006-07-18 21:20:58.000000000 +0200
+++ new/kbproto-1.0.4/autogen.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kbproto-1.0.3/configure.ac new/kbproto-1.0.4/configure.ac
--- old/kbproto-1.0.3/configure.ac 2006-07-18 21:21:35.000000000 +0200
+++ new/kbproto-1.0.4/configure.ac 2009-10-13 07:38:44.000000000 +0200
@@ -1,8 +1,12 @@
AC_PREREQ([2.57])
-AC_INIT([KBProto], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([KBProto], [1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-XORG_RELEASE_VERSION
+# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
AC_OUTPUT([Makefile
kbproto.pc])
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/kbproto-1.0.3/missing new/kbproto-1.0.4/missing
--- old/kbproto-1.0.3/missing 2006-07-18 21:22:06.000000000 +0200
+++ new/kbproto-1.0.4/missing 2009-10-13 07:39:25.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:
++++++ randrproto-1.3.0.tar.bz2 -> randrproto-1.3.1.tar.bz2 ++++++
++++ 11060 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/randrproto-1.3.0/ChangeLog new/randrproto-1.3.1/ChangeLog
--- old/randrproto-1.3.0/ChangeLog 2009-03-06 15:04:52.000000000 +0100
+++ new/randrproto-1.3.1/ChangeLog 2009-10-06 05:22:54.000000000 +0200
@@ -1,3 +1,72 @@
+commit 240bb6051dccd072c95c8569a62b1222213ef396
+Author: Keith Packard
+Date: Mon Oct 5 20:04:11 2009 -0700
+
+ Bump version to 1.3.1
+
+ Signed-off-by: Keith Packard
+
+commit e5ea87cd2a1c7b636d95f42daf3f36ba3104d59d
+Author: Keith Packard
+Date: Mon Oct 5 20:20:14 2009 -0700
+
+ Add XORG_DEFAULT_OPTIONS invocation in configure.ac
+
+ This should be included in all xorg configure.ac files to provide a
+ hook for setting various default values.
+
+ Signed-off-by: Keith Packard
+
+commit d9ee6abdef13d04f6e7015c0cc39e3855aa01bbf
+Author: Keith Packard
+Date: Fri Jun 5 20:37:24 2009 -0700
+
+ Remove trailing white space from randrproto.txt
+
+commit 92789c6c3a78bb64e391f1deec1d613900604985
+Author: Keith Packard
+Date: Fri Jun 5 20:35:46 2009 -0700
+
+ Allow inactive outputs to be set as primary
+
+commit 993dbda7b42caed7480dcff0eca4f9af9c1163ba
+Author: Matthias Hopf
+Date: Tue Aug 18 12:08:25 2009 +0200
+
+ Add Backlight property description.
+
+commit 77c7ab02bf62f057c32f666168fd0ceb03a85a2d
+Author: Matthias Hopf
+Date: Tue Aug 18 12:00:10 2009 +0200
+
+ Should read "EDID", not "EdidData" (2).
+
+ Also include reference to former name.
+
+commit 5c95df133062570fe134be002dcb167ac059203d
+Author: Matthias Hopf
+Date: Tue Aug 18 11:56:38 2009 +0200
+
+ Sort properties alphabetically.
+
+commit 27529caf7912094bc83b47b8251205029c35d52c
+Author: Adam Jackson
+Date: Wed Apr 1 11:48:26 2009 -0400
+
+ Update reference to renderproto.txt
+
+commit 8ae7f1d202279959fdad84d30054b52ef021a9cc
+Author: Adam Jackson
+Date: Wed Apr 1 11:47:52 2009 -0400
+
+ Clarify that GetOutputPrimary is per-screen.
+
+commit 4036cdcc064db952286a74d679147d280b1a5f1f
+Author: Adam Jackson
+Date: Wed Apr 1 11:47:03 2009 -0400
+
+ Punctuation fix.
+
commit 94e22fecc66590f81ca280517505c721a5f54497
Author: Matthias Hopf
Date: Fri Mar 6 15:03:09 2009 +0100
@@ -67,7 +136,7 @@
Add [GS]etOutputPrimary
commit 1334866b4aa025bce745140aa0f71f6493408ffa
-Merge: ad65017... e719120...
+Merge: ad65017 e719120
Author: Keith Packard
Date: Tue Dec 9 20:59:47 2008 -0800
@@ -142,7 +211,7 @@
Update to version 1.2.99.1
commit 6c17940a7960885695aa6033de58c3cd2bb6fb79
-Merge: c998b46... 8793429...
+Merge: c998b46 8793429
Author: Keith Packard
Date: Mon Nov 24 16:22:11 2008 -0800
@@ -282,7 +351,7 @@
sz_xRROUtputChangeNotifyEvent -> sz_xRROutputChangeNotifyEvent
commit 504556a9f886c84798ae8e0e46896a7c74b95c61
-Merge: c27ece2... 3d521b3...
+Merge: c27ece2 3d521b3
Author: Keith Packard
Date: Thu Nov 30 09:44:20 2006 -0800
@@ -295,7 +364,7 @@
Fix padding bugs discovered in XCB work
commit c27ece25924115448bf9e1dc461d5e7f4112f112
-Merge: 3305f63... 7363d44...
+Merge: 3305f63 7363d44
Author: Eric Anholt
Date: Mon Nov 27 15:31:33 2006 -0800
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/randrproto-1.3.0/configure.ac new/randrproto-1.3.1/configure.ac
--- old/randrproto-1.3.0/configure.ac 2009-03-06 15:03:06.000000000 +0100
+++ new/randrproto-1.3.1/configure.ac 2009-10-06 05:21:28.000000000 +0200
@@ -22,13 +22,17 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT([RandrProto], [1.3.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([RandrProto], [1.3.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
-XORG_RELEASE_VERSION
+
+# 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)
+
+XORG_DEFAULT_OPTIONS
+
XORG_CHANGELOG
AC_OUTPUT([Makefile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/randrproto-1.3.0/missing new/randrproto-1.3.1/missing
--- old/randrproto-1.3.0/missing 2008-03-11 16:01:37.000000000 +0100
+++ new/randrproto-1.3.1/missing 2006-07-10 23:24:04.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2005-06-08.21
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,8 +33,6 @@
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.
@@ -46,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=
@@ -79,7 +77,6 @@
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
@@ -109,7 +106,7 @@
# 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
+case "$1" in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -138,7 +135,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case "$1" in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -167,7 +164,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";;
@@ -195,8 +192,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
if test -f "$file"; then
touch $file
else
@@ -217,25 +214,25 @@
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 test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if test ! -f y.tab.h; then
+ if [ ! -f y.tab.h ]; then
echo >y.tab.h
fi
- if test ! -f y.tab.c; then
+ if [ ! -f y.tab.c ]; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -247,18 +244,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if test ! -f lex.yy.c; then
+ if [ ! -f lex.yy.c ]; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -270,9 +267,11 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
+ 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
touch $file
else
test -z "$file" || exec >$file
@@ -290,17 +289,11 @@
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 "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
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
@@ -324,13 +317,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
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/randrproto-1.3.0/randr.h new/randrproto-1.3.1/randr.h
--- old/randrproto-1.3.0/randr.h 2008-12-17 13:21:21.000000000 +0100
+++ new/randrproto-1.3.1/randr.h 2009-10-06 04:25:02.000000000 +0200
@@ -151,6 +151,7 @@
/* Conventional RandR output properties */
+#define RR_PROPERTY_BACKLIGHT "Backlight"
#define RR_PROPERTY_RANDR_EDID "EDID"
#define RR_PROPERTY_SIGNAL_FORMAT "SignalFormat"
#define RR_PROPERTY_SIGNAL_PROPERTIES "SignalProperties"
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/randrproto-1.3.0/randrproto.txt new/randrproto-1.3.1/randrproto.txt
--- old/randrproto-1.3.0/randrproto.txt 2009-02-25 17:07:26.000000000 +0100
+++ new/randrproto-1.3.1/randrproto.txt 2009-10-06 05:21:28.000000000 +0200
@@ -1,13 +1,13 @@
The X Resize, Rotate and Reflect Extension
- Version 1.3
- 2006-20-7
-
+ Version 1.3.1
+ 2009-10-5
+
Jim Gettys
Jim.Gettys@hp.com
Cambridge Research Laboratory
HP Labs
Hewlett Packard Company
-
+
Keith Packard
keith.packard@intel.com
Open Source Technology Center
@@ -35,13 +35,13 @@
on laptops or desktop systems
► The continued decline of legacy toolkits whose design would have
required depth switching to support migration
- ► The lack of depth switching implementation experience in the
+ ► The lack of depth switching implementation experience in the
intervening time, due to events beyond our control
Additionally, the requirement to support depth switching might
complicate other re-engineering of the device independent part of the
X server that is currently being contemplated.
-
+
Rather than further delaying RandR's widespread deployment for a feature
long wanted by the community (resizing of screens, particularly on laptops),
or the deployment of a protocol design that might be flawed due to lack of
@@ -61,7 +61,7 @@
zero or more video outputs are associated with each CRT controller which
defines both a set of video timings and a 'viewport' within the larger
screen. This viewport is independent of the overall size of the screen, and
-may be located anywhere within the screen.
+may be located anywhere within the screen.
The effect is to decouple the reported size of the screen from the size
presented by each video output, and to permit multiple outputs to present
@@ -85,7 +85,7 @@
┃ ┏━━━╋━━━━━━━━━━━━━━━┫ ║ ║ ║ ║
┣━━━╋━━━┛ ┃ ╚════════╝ ╚════════╝
│ ┃ 2 ┃─────────────────┐
- │ ┃ ┃ ╔═══════════════════╗
+ │ ┃ ┃ ╔═══════════════════╗
│ ┃ ┃ ║ ║
│ ┗━━━━━━━━━━━━━━━━━━━┫ ║ C ║
└───────────────────────┘ ║ ║
@@ -215,7 +215,7 @@
A value of type RRCONFIGSTATUS returned when manipulating the output
configuration or querying information from the server that has some
time-dependency.
-
+
InvalidConfigTime indicates that the supplied configuration
timestamp does not match the current X server configuration
timestamp. Usually this means that the output configuration has
@@ -249,7 +249,7 @@
RRSELECTMASK { RRScreenChangeNotifyMask
RRCrtcChangeNotifyMask (New in version 1.2)
- RROutputChangeNotifyMask (New in version 1.2)
+ RROutputChangeNotifyMask (New in version 1.2)
RROutputPropertyNotifyMask (New in version 1.2) }
SIZEID { CARD16 }
@@ -342,25 +342,25 @@
the client connected, to avoid race conditions.
New for version 1.2:
-
+
If 'enable' contains RRCrtcChangeMask, RRCrtcChangeNotify events
will be sent when a the configuration for a CRTC associated with the
screen changes, either through this protocol extension or due to
detected external changes. RRCrtcChangeNotify may also be sent when
this request executes if the CRTC configuration has changed since
- the client connected, to avoid race conditions.
-
+ the client connected, to avoid race conditions.
+
If 'enable' contains RROutputChangeMask, RROutputChangeNotify events
will be sent when a the configuration for an output associated with
the screen changes, either through this protocol extension or due to
detected external changes. RROutputChangeNotify may also be sent
when this request executes if the output configuration has changed
- since the client connected, to avoid race conditions.
+ since the client connected, to avoid race conditions.
If 'enable' contains RROutputPropertyNotifyMask,
RROutputPropertyNotify events will be sent when properties change on
this output.
-
+
┌───
RRSetScreenConfig
window: WINDOW
@@ -381,7 +381,7 @@
If 'timestamp' is less than the time when the configuration was last
successfully set, the request is ignored and InvalidTime returned in
status.
-
+
If 'config-timestamp' is not equal to when the server's screen
configurations last changed, the request is ignored and
InvalidConfigTime returned in status. This could occur if the
@@ -396,19 +396,19 @@
This request may fail for other indeterminate reasons, in which case
'status' will be set to Failed and no configuration change will be
made.
-
+
This request sets the screen to the specified size, rate, rotation
and reflection.
When this request succeeds, 'status' contains Success and the
requested changes to configuration will have been made.
-
+
'new-time-stamp' contains the time at which this request was
executed.
-
+
'config-timestamp' contains the time when the possible screen
configurations were last changed.
-
+
'root' contains the root window for the screen indicated by the
window.
@@ -421,7 +421,7 @@
┌───
RRGetScreenInfo
window: WINDOW
- ▶
+ ▶
rotations: SETofROTATION
root: WINDOW
timestamp: TIMESTAMP
@@ -442,15 +442,15 @@
by the screen.
'root' is the root window of the screen.
-
+
'config-timestamp' indicates when the screen configuration
information last changed: requests to set the screen will fail
unless the timestamp indicates that the information the client
is using is up to date, to ensure clients can be well behaved
- in the face of race conditions.
-
+ in the face of race conditions.
+
'timestamp' indicates when the configuration was last set.
-
+
'size-id' indicates which size is active.
'rate' is the current refresh rate. This is zero when the refresh
@@ -533,7 +533,7 @@
to the screen associated with 'window'.
'timestamp' indicates when the configuration was last set.
-
+
'config-timestamp' indicates when the configuration information last
changed. Requests to configure the output will fail unless the
timestamp indicates that the information the client is using is up
@@ -545,7 +545,7 @@
'outputs' contains the list of outputs associated with the screen.
'modes' contains the list of modes associated with the screen
-
+
This request explicitly asks the server to ensure that the
configuration data is up-to-date wrt the hardware. If that requires
polling, this is when such polling would take place. If the
@@ -560,7 +560,7 @@
status: RRCONFIGSTATUS
timestamp: TIMESTAMP
crtc: CRTC
-
+
name: STRING
connection: CONNECTION
subpixel-order: SUBPIXELORDER
@@ -573,15 +573,15 @@
Errors: Output
RRGetOutputInfo returns information about the current and available
- configurations 'output'.
-
+ configurations 'output'.
+
If 'config-timestamp' does not match the current configuration
timestamp (as returned by RRGetScreenResources), 'status' is set to
InvalidConfigTime and the remaining reply data is empty. Otherwise,
'status' is set to Success.
'timestamp' indicates when the configuration was last set.
-
+
'crtc' is the current source CRTC for video data, or Disabled if the
output is not connected to any CRTC.
@@ -592,7 +592,7 @@
device connected to this output. If the hardware cannot determine
whether something is connected, it will set this to
UnknownConnection.
-
+
'subpixel-order' contains the resulting subpixel order of the
connected device to allow correct subpixel rendering.
@@ -648,7 +648,7 @@
and be automatically copied to the current value on the next
RRSetCrtcConfig request involving the named output. If 'pending' is
FALSE, changes are copied immediately.
-
+
If 'range' is TRUE, then the valid-values list will contain
precisely two values indicating the minimum and maximum allowed
values. If 'range' is FALSE, then the valid-values list will contain
@@ -658,7 +658,7 @@
If 'immutable' is TRUE, then the property configuration cannot be
changed by clients. Immutable properties are interpreted by the X
server.
-
+
┌───
RRConfigureOutputProperty
output: OUTPUT
@@ -687,7 +687,7 @@
data: LISTofINT8 or LISTofINT16 or LISTofINT32
└───
Errors: Alloc, Atom, Match, Value, Output
-
+
This request alters the value of the property for the specified
output. If the property is marked as a 'pending' property, only the
pending value of the property is changed. Otherwise, changes are
@@ -702,7 +702,7 @@
match the existing property value (or a Match error results). If
the property is undefined, it is treated as defined with the correct
type and format with zero-length data.
-
+
For Prepend, the data is tacked on to the beginning of the existing
data, and for Append, it is tacked on to the end of the existing data.
@@ -713,7 +713,7 @@
destroyed, or until server reset (see section 10).
The maximum size of a property is server-dependent and may vary
- dynamically.
+ dynamically.
┌───
RRDeleteOutputProperty
@@ -721,7 +721,7 @@
property: ATOM
└───
Errors: Atom, Output
-
+
This request deletes the property from the specified window if the
property exists and generates a OutputPropertyNotify event unless
the property does not exist.
@@ -745,28 +745,28 @@
If the specified property does not exist for the specified output,
then the return type is None, the format and bytes-after are zero,
and the value is empty. The delete argument is ignored in this
- case.
-
+ case.
+
If the specified property exists but its type does not match the
specified type, then the return type is the actual type of the
property, the format is the actual format of the property (never
zero), the bytes-after is the length of the property in bytes (even
if the format is 16 or 32), and the value is empty. The delete
- argument is ignored in this case.
-
+ argument is ignored in this case.
+
If the specified property exists and either AnyPropertyType is
specified or the specified type matches the actual type of the
property, then the return type is the actual type of the property,
the format is the actual format of the property (never zero), and
the bytes-after and value are as follows, given:
- N = actual length of the stored property in bytes
+ N = actual length of the stored property in bytes
(even if the format is 16 or 32)
I = 4 × offset
T = N - I
L = MINIMUM(T, 4 × long-length)
A = N - (I + L)
-
+
If 'pending' is true, and if the property holds a pending value,
then the value returned will be the pending value of the property
rather than the current value. The returned value starts at byte
@@ -785,14 +785,14 @@
mode: MODE
└───
Errors: Window, Name, Value
-
+
'modeinfo' provides a new mode for outputs on the screen
associated with 'window'. If the name of 'modeinfo' names an
existing mode, a Name error is returned. If some parameter of the
mode is not valid in some other way, a Value error is returned.
The returned 'mode' provides the id for the mode.
-
+
┌───
RRDestroyMode
mode: MODE
@@ -803,7 +803,7 @@
defined with RRCreateMode, else an Match error is returned. If
'mode' is in use by some CRTC or Output, then an Access error is
returned.
-
+
┌───
RRAddOutputMode
output: OUTPUT
@@ -814,10 +814,10 @@
'output' indicates which output is to be configured.
'mode' specifies which mode to add. If 'mode' is not valid for
- 'output', then a Match error is generated.
+ 'output', then a Match error is generated.
This request generates OutputChangeNotify events.
-
+
┌───
RRDeleteOutputMode
output: OUTPUT
@@ -845,7 +845,7 @@
mode: MODE
rotation: ROTATION
outputs: LISTofOUTPUT
-
+
rotations: SETofROTATION
possible-outputs: LISTofOUTPUT
└───
@@ -860,23 +860,23 @@
timestamp (as returned by RRGetScreenResources), 'status' is set to
InvalidConfigTime and the remaining reply data is empty. Otherwise,
'status' is set to Success.
-
+
'timestamp' indicates when the configuration was last set.
-
+
'x' and 'y' indicate the position of this CRTC within the screen
region. They will be set to 0 when the CRTC is disabled.
'width' and 'height' indicate the size of the area within the screen
presented by this CRTC. This may be different than the size of the
- mode due to rotation. They will be set to 0 when the CRTC is
- disabled.
-
+ mode due to rotation. They will be set to 0 when the CRTC
+ is disabled.
+
'mode' indicates which mode is active, or None indicating that the
CRTC has been disabled and is not displaying the screen contents.
'rotation' indicates the active rotation. It is set to Rotate_0
when the CRTC is disabled.
-
+
'outputs' is the list of outputs currently connected to this CRTC
and is empty when the CRTC is disabled.
@@ -904,7 +904,7 @@
If 'timestamp' is less than the time when the configuration was last
successfully set, the request is ignored and InvalidTime returned in
status.
-
+
If 'config-timestamp' is not equal to when the monitor's
configuration last changed, the request is ignored and
InvalidConfigTime returned in status. This could occur if the
@@ -929,16 +929,16 @@
'outputs' contains the set of outputs that this CRTC should be
connected to. The set must be among the list of acceptable output
- sets for this CRTC or a Match error results.
-
+ sets for this CRTC or a Match error results.
+
If 'mode' is None, then 'outputs' must be empty, else a Match error
results. Conversely, if 'mode' is not None, then 'outputs' must not be
empty, else a Match error results.
-
+
This request may fail for other indeterminate reasons, in which case
'status' will be set to Failed and no configuration change will be
made.
-
+
This request sets the CRTC to the specified position, mode, rotation
and reflection. The entire area of the CRTC must fit within the
screen size, else a Match error results. As an example, rotating the
@@ -955,10 +955,10 @@
When this request succeeds, 'status' contains Success and the
requested changes to configuration will have been made.
-
+
'new-time-stamp' contains the time at which this request was
executed.
-
+
┌───
RRGetCrtcGammaSize
crtc: CRTC
@@ -976,13 +976,13 @@
red: LISTofCARD16
green: LISTofCARD16
blue: LISTofCARD16
-└───
+└───
Errors: Crtc
-
+
This request returns the currently set gamma ramps for 'crtc'. All
three lists will be the size returned by the RRGetCrtcGammaSize
request.
-
+
┌───
RRSetCrtcGamma
crtc: CRTC
@@ -991,7 +991,7 @@
blue: LISTofCARD16
└───
Errors: Crtc, Match
-
+
This request sets the gamma ramps for 'crtc'. All three lists
must be the size returned by RRGetCrtcGammaSize else a Value error
results.
@@ -1014,7 +1014,7 @@
connected to the screen associated with 'window'.
'timestamp' indicates when the configuration was last set.
-
+
'config-timestamp' indicates when the configuration information last
changed. Requests to configure the output will fail unless the
timestamp indicates that the information the client is using is up
@@ -1025,8 +1025,8 @@
'outputs' contains the list of outputs associated with the screen.
- 'modes' contains the list of modes associated with the screen
-
+ 'modes' contains the list of modes associated with the screen.
+
Unlike RRGetScreenResources, this merely returns the current
configuration, and does not poll for hardware changes.
@@ -1211,10 +1211,6 @@
desktop environments to mark the screen that should hold the primary
menu bar or panel.
- If the named output is not connected to any CRTC, or if the Window
- and Output are not attached to the same screen, BadMatch is generated.
- In the latter case, errorValue will be the Window, not the Output.
-
As this changes the logical layout of the screen, ConfigureNotify
and RRScreenChangeNotify will be generated on the appropriate root
window when the primary output is changed by this call. This request
@@ -1238,7 +1234,7 @@
└───
Errors: Window
- RRGetOutputPrimary returns the primary output for the system.
+ RRGetOutputPrimary returns the primary output for the screen.
❧❧❧❧❧❧❧❧❧❧❧
@@ -1401,6 +1397,83 @@
9.1 Known properties
+ "Backlight" aka RR_PROPERTY_BACKLIGHT
+ Type: int32
+ Flags: -
+ Range/List: 0-x (driver specific)
+
+ This property controls the brightness on laptop panels and equivalent
+ displays with a backlight controller. The driver specific maximum
+ value MUST turn the backlight to full brightness, 1 SHOULD turn the
+ backlight to minimum brightness, 0 SHOULD turn the backlight off.
+
+ "CloneList" aka RR_PROPERTY_CLONE_LIST
+ Type: int32 [2*n] / Atom pairs
+ Flags: Immutable
+ Range/List: 0-
+
+ Some combinations of outputs on some cards cannot be served
+ independently from each other, because they are wired up to the same
+ encoder outputs.
+ This property lists all output + signal format pairs that are
+ driven together with this output, and thus can only be programmed in
+ clone mode with the same CRTC.
+ This property MUST be symmetric, but may change with changing signal
+ format. I.e. if the property for DVI-1/VGA specifies VGA-1/VGA to be
+ cloned, VGA-1/VGA has to list DVI-1/VGA as well.
+ Outputs / format pairs listed in this property MUST be included in the
+ CompatibilityList.
+
+ "CompatibilityList" aka RR_PROPERTY_COMPATIBILITY_LIST
+ Type: int32 [2*n] / Atom pairs
+ Flags: Immutable
+ Range/List: 0-
+
+ Some combinations of outputs on some cards cannot be served at all,
+ because the according encoder is only capable of driving one output at
+ a time.
+ This property lists all output + signal format pairs that can be
+ driven together with this output. NULL atoms specify any output / any
+ signal format, respectively.
+ This property MUST be symmetric, but may change with changing signal
+ format. I.e. if the property for DVI-1/TMDS specifies VGA-1/VGA to be
+ available, VGA-1/VGA has to list DVI-1/TMDS as well.
+
+ "ConnectorNumber" aka RR_PROPERTY_CONNECTOR_NUMBER
+ Type: int32
+ Flags: Immutable, Static
+ Range/List: 0-
+
+ Outputs that route their signal to the same connector MUST
+ have the same connector number. Outputs with the same
+ connector number MUST route their signal to the same
+ connector, except if it is 0, which indicates unknown
+ connectivity. 1 is called the primary connector, 2 the
+ secondary. 3 is typically a TV connector, but that is completely
+ driver / hardware dependent.
+ Outputs with the same connector number SHOULD have the same
+ connector type. Meaning and client behavior for mismatching
+ connector types is undefined at the moment.
+
+ "ConnectorType" aka RR_PROPERTY_CONNECTOR_TYPE
+ Type: int32 / Atom
+ Flags: Immutable, Static
+ Range/List: unknown VGA DVI DVI‐I DVI‐A DVI‐D HDMI Panel
+ TV TV-Composite TV-SVideo TV-Component
+ TV-SCART TV-C4 DisplayPort
+
+ Connector type, as far as known to the driver.
+ Values with dashes (TV‐Composite) describe more specific versions of
+ the base values (TV). The former SHOULD be used if the connector is
+ not capable of producing other signal formats. The later SHOULD be
+ used if the exact connector is unknown, or the connector is a
+ multi‐format connector that is not described otherwise. DVI, for
+ instance, SHOULD be handled like a DVI‐I connector, unless additional
+ information is available to the user agent. PANEL describes
+ laptop‐internal (normally LVDS) displays. TV, TV‐SCART, TV‐Component,
+ and TV‐C4 with signal format VGA are valid combinations and describe
+ RGB TV signals.
+
"EDID" aka RR_PROPERTY_RANDR_EDID
Type: int8 [n]
Flags: Immutable
@@ -1408,7 +1481,7 @@
Raw EDID data from the device attached to the according
output. Should include main EDID data and all extension
- blocks.
+ blocks. Previously known as EdidData.
"SignalFormat" aka RR_PROPERTY_SIGNAL_FORMAT
Type: int32 / Atom
@@ -1454,93 +1527,32 @@
a signal change (e.g. TV formats). Clients are allowed to change the
properties in order to select a different signal subformat.
- "ConnectorType" aka RR_PROPERTY_CONNECTOR_TYPE
- Type: int32 / Atom
- Flags: Immutable, Static
- Range/List: unknown VGA DVI DVI‐I DVI‐A DVI‐D HDMI Panel
- TV TV-Composite TV-SVideo TV-Component
- TV-SCART TV-C4 DisplayPort
-
- Connector type, as far as known to the driver.
- Values with dashes (TV‐Composite) describe more specific versions of
- the base values (TV). The former SHOULD be used if the connector is
- not capable of producing other signal formats. The later SHOULD be
- used if the exact connector is unknown, or the connector is a
- multi‐format connector that is not described otherwise. DVI, for
- instance, SHOULD be handled like a DVI‐I connector, unless additional
- information is available to the user agent. PANEL describes
- laptop‐internal (normally LVDS) displays. TV, TV‐SCART, TV‐Component,
- and TV‐C4 with signal format VGA are valid combinations and describe
- RGB TV signals.
-
- "ConnectorNumber" aka RR_PROPERTY_CONNECTOR_NUMBER
- Type: int32
- Flags: Immutable, Static
- Range/List: 0-
-
- Outputs that route their signal to the same connector MUST
- have the same connector number. Outputs with the same
- connector number MUST route their signal to the same
- connector, except if it is 0, which indicates unknown
- connectivity. 1 is called the primary connector, 2 the
- secondary. 3 is typically a TV connector, but that is completely
- driver / hardware dependent.
- Outputs with the same connector number SHOULD have the same
- connector type. Meaning and client behavior for mismatching
- connector types is undefined at the moment.
-
- "CompatibilityList" aka RR_PROPERTY_COMPATIBILITY_LIST
- Type: int32 [2*n] / Atom pairs
- Flags: Immutable
- Range/List: 0-
-
- Some combinations of outputs on some cards cannot be served at all,
- because the according encoder is only capable of driving one output at
- a time.
- This property lists all output + signal format pairs that can be
- driven together with this output. NULL atoms specify any output / any
- signal format, respectively.
- This property MUST be symmetric, but may change with changing signal
- format. I.e. if the property for DVI-1/TMDS specifies VGA-1/VGA to be
- available, VGA-1/VGA has to list DVI-1/TMDS as well.
-
- "CloneList" aka RR_PROPERTY_CLONE_LIST
- Type: int32 [2*n] / Atom pairs
- Flags: Immutable
- Range/List: 0-
-
- Some combinations of outputs on some cards cannot be served
- independently from each other, because they are wired up to the same
- encoder outputs.
- This property lists all output + signal format pairs that are
- driven together with this output, and thus can only be programmed in
- clone mode with the same CRTC.
- This property MUST be symmetric, but may change with changing signal
- format. I.e. if the property for DVI-1/VGA specifies VGA-1/VGA to be
- cloned, VGA-1/VGA has to list DVI-1/VGA as well.
- Outputs / format pairs listed in this property MUST be included in the
- CompatibilityList.
-
9.2 Properties introduced with version 1.2 of the RandR extension
Property Immutable Mandatory since
──────── ───────── ───────────────
-EdidData yes n/a
+EDID yes n/a
-EdidData is provided by the RandR frontend, thus not driver specific.
+EDID is provided by the RandR frontend, thus not driver specific.
9.3 Properties introduced with version 1.3 of the RandR extension
Property Immutable Mandatory since
──────── ───────── ───────────────
+CloneList yes not mandatory
+CompatibilityList yes not mandatory
+ConnectorNumber yes: static not mandatory
+ConnectorType yes: static RandR 1.3
SignalFormat no RandR 1.3
SignalProperties no not mandatory
-ConnectorType yes: static RandR 1.3
-ConnectorNumber yes: static not mandatory
-CompatibilityList yes not mandatory
-CloneList yes not mandatory
+
+9.4 Properties introduced with version 1.4 of the RandR extension
+
+Property Immutable Mandatory since
+──────── ───────── ───────────────
+Backlight no not mandatory
❧❧❧❧❧❧❧❧❧❧❧
@@ -1655,7 +1667,7 @@
0x0008 OutputPropertyNotifyMask Added in version 1.2
└───
Event select mask for RRSelectInput
-
+
┌───
RRCONFIGSTATUS
0x0 Success
@@ -1664,7 +1676,7 @@
0x3 Failed
└───
Return status for requests which depend on time.
-
+
┌───
MODEINFO (32) Added in version 1.2
4 CARD32 id
@@ -1681,7 +1693,7 @@
2 CARD16 name length
4 SETofMODEFLAG mode flags
└───
-
+
An output mode specifies the complete CRTC timings for
a specific mode. The vertical and horizontal synchronization rates
can be computed given the dot clock and the h total/v total
@@ -1689,7 +1701,7 @@
parameters and flags are not used, and must be zero as this
indicates that the timings are unknown or otherwise unused.
The name itself will be encoded separately in each usage.
-
+
┌───
MODEFLAG
0x00000001 HSyncPositive
@@ -1738,7 +1750,7 @@
└───
┌───
RRSetScreenConfig
-
+
1 CARD8 major opcode
1 2 RandR opcode
2 6 length
@@ -2171,7 +2183,7 @@
p unused, p=pad(n)
4v FIXED filter params
└───
-
+
┌───
RRGetCrtcTransform
1 CARD8 major opcode
@@ -2199,7 +2211,7 @@
cnp unused, cnp=pad(cn)
4*cf FIXED current filter params
└───
-
+
┌───
RRGetPanning
1 CARD8 major opcode
@@ -2261,7 +2273,7 @@
4 WINDOW window
4 OUTPUT output
└───
-
+
┌───
RRGetOutputPrimary
1 CARD8 major opcode
@@ -2355,13 +2367,13 @@
Base + 1 Crtc
Base + 2 Mode
└───
-
+
Bibliography
[RANDR] Gettys, Jim and Keith Packard, "The X Resize and Rotate
Extension - RandR", Proceedings of the 2001 USENIX Annual
Technical Conference, Boston, MA
-[RENDER]
+[RENDER]
Packard, Keith, "The X Rendering Extension", work in progress,
- documents found in xc/specs/Render.
+ http://cgit.freedesktop.org/xorg/proto/renderproto/tree/renderproto.txt
++++++ resourceproto-X11R7.0-1.0.2.tar.bz2 -> resourceproto-1.1.0.tar.bz2 ++++++
++++ 7966 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/resourceproto-X11R7.0-1.0.2/ChangeLog new/resourceproto-1.1.0/ChangeLog
--- old/resourceproto-X11R7.0-1.0.2/ChangeLog 2005-12-15 01:24:38.000000000 +0100
+++ new/resourceproto-1.1.0/ChangeLog 2009-08-25 08:30:12.000000000 +0200
@@ -1,4 +1,157 @@
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 11843ce15572214833063a26ac87a2fa6ab74bca
+Author: Peter Hutterer
+Date: Tue Aug 25 16:13:15 2009 +1000
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ resourceproto 1.1.0
+
+commit 2388aa12158fca3d8c38ee59ecc5cf35eafa7d57
+Author: Peter Hutterer
+Date: Tue Aug 25 16:29:38 2009 +1000
+
+ Remove RCS tags.
+
+commit 0a4fd7fc0cf0f56fbe112bd14725560adfa67b73
+Author: Paulo Cesar Pereira de Andrade
+Date: Tue Jan 27 20:06:28 2009 -0200
+
+ Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit 40fded7637faa3548052cbf419d48ea081b1b5cb
+Author: James Cloos
+Date: Thu Dec 6 16:39:06 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 2740cf052e07fef8808991863409829bab22f016
+Author: James Cloos
+Date: Mon Sep 3 05:54:15 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit c24f19b61eb4a59b7a71f8aa238f3093d71b2fb2
+Author: Alan Coopersmith
+Date: Fri Jul 14 18:56:31 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 9268501218b3f4eb1b0ce13bfab9e9543adc01a1
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:38 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 0002f2f7e13aeabd494b55be2280b060410a6e8a
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:15 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit e09681a1043fbc48447033b78de2c87252507d1b
+Author: Eric Anholt
+Date: Tue Aug 2 19:19:39 2005 +0000
+
+ Add basic .cvsignore files for proto modules.
+
+commit f6008b2e1f5051ab421abbe08614aac67847742e
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:56 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 79eb18feab7f1a9e07d97adb3be754b3c863d696
+Author: Søren Sandmann Pedersen
+Date: Tue Jun 7 18:51:23 2005 +0000
+
+ - symlink.sh: Move XRes.h from proto/Resource to
+ lib/XRes/include/X11/extensions
+ - symlink.sh: Add XRes linking
+ - xc/lib/XRes/*.c: conditionally include config.h
+ - lib/XRes: add directories and build system.
+
+commit 53500326172c6277a698926f78e042f80f03bb2d
+Author: Daniel Stone
+Date: Sat May 21 04:18:30 2005 +0000
+
+ Set version to 1.0.
+
+commit f5f3a42ee3de80dfbb798727c77ad0454b70723e
+Author: Adam Jackson
+Date: Thu May 19 00:22:40 2005 +0000
+
+ revert last change, didn't do right thing at all, sorry for the noise
+
+commit 5d91974af1155de1086434a36a6c1531a8d80d7b
+Author: Adam Jackson
+Date: Thu May 19 00:10:19 2005 +0000
+
+ Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit d66e491cd3a75b7e88177b9857dd7079d11361fe
+Author: Josh Triplett
+Date: Tue May 17 19:43:16 2005 +0000
+
+ Add COPYING file for Resource. Per the advice of Daniel Stone, Resource
+ falls under the generic XFree86 catch-all license (from before the
+ problematic license change).
+
+commit 7e6e21adc53035ddffba7bb29676b7f483956df8
+Author: Søren Sandmann Pedersen
+Date: Mon May 9 18:20:06 2005 +0000
+
+ Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit f7ef242967454e96ecc41751ed04b8ec434d17c8
+Author: Kevin E Martin
+Date: Fri May 6 01:46:31 2005 +0000
+
+ Initial build system files for proto module.
+
+commit e33c0b156299bb0d582b573ffe185699d6415b88
+Author: Egbert Eich
+Date: Fri Apr 23 18:43:06 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit eeb54769c6aec119ae900ed41a1cd12d62c88aa9
+Author: Egbert Eich
+Date: Sun Mar 14 08:31:36 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 600d724bb28e8604eefa891daf2adefc38f6c03a
+Author: Egbert Eich
+Date: Wed Mar 3 12:10:54 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 17c656129e003eba2f71b644c335eabb96e3361a
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:11 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit d2ba0bfffba0903acdfd37973c0c11be3bbfec48
+Author: Egbert Eich
+Date: Thu Feb 26 09:22:27 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 7d9398ff4706c144a8562f2272c89b67947c7e0d
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:42 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 258c66ae0da974c415026fcf4961b1ced793eaaf
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:42 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/resourceproto-X11R7.0-1.0.2/Makefile.am new/resourceproto-1.1.0/Makefile.am
--- old/resourceproto-X11R7.0-1.0.2/Makefile.am 2005-06-07 20:51:23.000000000 +0200
+++ new/resourceproto-1.1.0/Makefile.am 2009-08-25 08:16:45.000000000 +0200
@@ -5,4 +5,14 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = resourceproto.pc
-EXTRA_DIST = autogen.sh resourceproto.pc.in
+EXTRA_DIST = resourceproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/resourceproto-X11R7.0-1.0.2/XResproto.h new/resourceproto-1.1.0/XResproto.h
--- old/resourceproto-X11R7.0-1.0.2/XResproto.h 2004-04-23 20:43:06.000000000 +0200
+++ new/resourceproto-1.1.0/XResproto.h 2009-08-25 08:29:48.000000000 +0200
@@ -1,7 +1,6 @@
/*
Copyright (c) 2002 XFree86 Inc
*/
-/* $XFree86: xc/include/extensions/XResproto.h,v 1.1 2002/03/04 19:31:35 mvojkovi Exp $ */
#ifndef _XRESPROTO_H
#define _XRESPROTO_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/resourceproto-X11R7.0-1.0.2/autogen.sh new/resourceproto-1.1.0/autogen.sh
--- old/resourceproto-X11R7.0-1.0.2/autogen.sh 2005-05-06 03:46:31.000000000 +0200
+++ new/resourceproto-1.1.0/autogen.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/resourceproto-X11R7.0-1.0.2/configure.ac new/resourceproto-1.1.0/configure.ac
--- old/resourceproto-X11R7.0-1.0.2/configure.ac 2005-12-15 01:24:38.000000000 +0100
+++ new/resourceproto-1.1.0/configure.ac 2009-08-25 08:29:49.000000000 +0200
@@ -1,8 +1,12 @@
AC_PREREQ([2.57])
-AC_INIT([ResourceProto], [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([ResourceProto], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
+# Require xorg-macros: XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
resourceproto.pc])
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/resourceproto-X11R7.0-1.0.2/missing new/resourceproto-1.1.0/missing
--- old/resourceproto-X11R7.0-1.0.2/missing 2005-12-21 07:56:18.000000000 +0100
+++ new/resourceproto-1.1.0/missing 2009-03-10 00:36:30.000000000 +0100
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2006-05-10.23
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -15,8 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -29,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -38,18 +44,24 @@
configure_ac=configure.in
fi
-case "$1" in
+msg="missing on your system"
+
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -67,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -74,11 +87,15 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to ."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,14 +104,44 @@
exit 1
;;
- aclocal*)
+esac
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case $1 in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $1 in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
@@ -102,13 +149,8 @@
;;
autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
@@ -116,13 +158,8 @@
;;
autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -130,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -140,13 +177,8 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -156,20 +188,15 @@
;;
autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- 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
@@ -185,74 +212,67 @@
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -262,32 +282,36 @@
;;
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -300,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -323,8 +347,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +358,10 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
++++++ scrnsaverproto-X11R7.1-1.1.0.tar.bz2 -> scrnsaverproto-1.2.0.tar.bz2 ++++++
++++ 7077 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/scrnsaverproto-X11R7.1-1.1.0/ChangeLog new/scrnsaverproto-1.2.0/ChangeLog
--- old/scrnsaverproto-X11R7.1-1.1.0/ChangeLog 2006-03-31 20:39:42.000000000 +0200
+++ new/scrnsaverproto-1.2.0/ChangeLog 2009-08-25 10:42:09.000000000 +0200
@@ -1,18 +1,185 @@
-2006-03-31 Fredrik Höglund
+commit bcc25e87ba8e93c306b3cd00317a6f550c73f5cf
+Author: Peter Hutterer
+Date: Tue Aug 25 18:34:56 2009 +1000
- * configure.ac:
- Update the package version number to 1.1.
+ scrnsaverproto 1.2.0
+
+ Signed-off-by: Peter Hutterer
- * saver.h:
- Increase the minor version to 1.
+commit a2f5eaf51b26616746fddcd3a60c3b939d1a018a
+Author: Peter Hutterer
+Date: Tue Aug 25 18:34:36 2009 +1000
- * saverproto.h:
- Add the ScreenSaverSuspend request.
+ Remove RCS tags
+
+ Signed-off-by: Peter Hutterer
- * scrnsaver.h:
- Add the prototype for XScreenSaverSuspend.
+commit 83974b2814eb18d9c86f41e39dfdafaf39759ced
+Author: Paulo Cesar Pereira de Andrade
+Date: Tue Jan 27 20:06:28 2009 -0200
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Janitor: Correct make distcheck and dont distribute autogen.sh
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+commit 88a1fe1ac27353b92836b9a21c5a1757bad64fad
+Author: Peter Hutterer
+Date: Mon May 19 20:08:12 2008 +0930
+
+ Remove scrnsaver.h. This is an xlib header, moved to libXScrnSaver.
+
+ For future amendments to this file, look at
+ git://anongit.freedesktop.org/git/xorg/lib/libXScrnSaver
+
+commit c993e0c422a52bc5f56f7fba29af82f78f7680a5
+Author: Peter Hutterer
+Date: Mon May 19 19:11:29 2008 +0930
+
+ Nuke RCS tags.
+
+commit 7e19b4a5ad470f1715046f56ea8149df851221e4
+Author: James Cloos
+Date: Thu Dec 6 16:39:07 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 00aa1552d0c151402173ce9e4f612d84e4bbddcf
+Author: James Cloos
+Date: Mon Sep 3 05:54:16 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 294d7788b9e4ee86d93992ea074b169bf2ede25e
+Author: Alan Coopersmith
+Date: Fri Jul 14 18:56:32 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit ac0b03f75facc368da302fa2f500dcfeafc04e15
+Author: Fredrik Höglund
+Date: Fri Mar 31 18:39:42 2006 +0000
+
+ Update the package version number to 1.1.
+ Increase the minor version to 1.
+ Add the ScreenSaverSuspend request.
+ Add the prototype for XScreenSaverSuspend.
+
+commit 2f091ac1252c833bf70639b718bb1ac738066016
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:38 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 7bc2f8f300a7fac1f86d281459e74f2c3aafde07
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:15 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit ab3d7b78cfd25882ff74159931c9b1e5a7f1e762
+Author: Eric Anholt
+Date: Tue Aug 2 19:19:39 2005 +0000
+
+ Add basic .cvsignore files for proto modules.
+
+commit 4a27d790b9e39c2bae6515ddc71cd7c710b9fd69
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:56 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 6f818dc15a71a0af7e9cf5806677722f99227ebd
+Author: Daniel Stone
+Date: Sat May 21 04:19:33 2005 +0000
+
+ Set version to 1.0.
+
+commit 450acca3dbce47f8fef56864235698715ba5122d
+Author: Adam Jackson
+Date: Thu May 19 00:22:40 2005 +0000
+
+ revert last change, didn't do right thing at all, sorry for the noise
+
+commit 15eaf97151b718e01eecac1aba75872e4c9d2ddc
+Author: Adam Jackson
+Date: Thu May 19 00:10:19 2005 +0000
+
+ Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit 771299cf2f6de82ac1bc58aaf4830cc514033569
+Author: Josh Triplett
+Date: Tue May 17 20:41:15 2005 +0000
+
+ Add COPYING file for ScrnSaver.
+
+commit e455c03bb7e498e7eaaf8ad815fb60355fb1f72e
+Author: Søren Sandmann Pedersen
+Date: Mon May 9 18:20:06 2005 +0000
+
+ Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit 22a2a1cdb0f6e05fa609fbd996c696aa509f1f83
+Author: Kevin E Martin
+Date: Fri May 6 01:46:31 2005 +0000
+
+ Initial build system files for proto module.
+
+commit df80fd315a3dedab112429d68c45adaf57e12c3d
+Author: Daniel Stone
+Date: Thu Jan 27 05:36:16 2005 +0000
+
+ Include X11/Xlib.h in scrnsaver.h
+
+commit fd13bc250b337d0510975b49a2432b0fd9e3753c
+Author: Egbert Eich
+Date: Fri Apr 23 18:43:06 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 30ce491906c32ed9137738cd97c13e2c346f4d48
+Author: Egbert Eich
+Date: Sun Mar 14 08:31:36 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 7e886322e57130ed3a2b4633cd93a9f6fe17c4c4
+Author: Egbert Eich
+Date: Wed Mar 3 12:10:54 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit bdcc80fa6a01bfdbaba23ed0ea265afbb3deff3c
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:14 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 6229c02f2d40f995b5f0067fab1ae1c281b3c5f9
+Author: Egbert Eich
+Date: Thu Feb 26 09:22:28 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 21e708cda17e86d513bbc8cd779fa5f35376b868
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:28:02 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 78c91d731d4b9e708e5187f7051022a9ee50563a
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:43 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 0c0b82a2143adfb443157badfe84093d8b74cc13
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:43 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/scrnsaverproto-X11R7.1-1.1.0/Makefile.am new/scrnsaverproto-1.2.0/Makefile.am
--- old/scrnsaverproto-X11R7.1-1.1.0/Makefile.am 2005-05-09 20:20:06.000000000 +0200
+++ new/scrnsaverproto-1.2.0/Makefile.am 2009-08-25 10:36:25.000000000 +0200
@@ -1,10 +1,19 @@
scrnsaverdir = $(includedir)/X11/extensions
scrnsaver_HEADERS = \
saver.h \
- saverproto.h \
- scrnsaver.h
+ saverproto.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = scrnsaverproto.pc
-EXTRA_DIST = autogen.sh scrnsaverproto.pc.in
+EXTRA_DIST = scrnsaverproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scrnsaverproto-X11R7.1-1.1.0/autogen.sh new/scrnsaverproto-1.2.0/autogen.sh
--- old/scrnsaverproto-X11R7.1-1.1.0/autogen.sh 2005-05-06 03:46:31.000000000 +0200
+++ new/scrnsaverproto-1.2.0/autogen.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scrnsaverproto-X11R7.1-1.1.0/configure.ac new/scrnsaverproto-1.2.0/configure.ac
--- old/scrnsaverproto-X11R7.1-1.1.0/configure.ac 2006-03-31 20:39:42.000000000 +0200
+++ new/scrnsaverproto-1.2.0/configure.ac 2009-08-25 10:36:25.000000000 +0200
@@ -1,8 +1,12 @@
AC_PREREQ([2.57])
-AC_INIT([ScrnSaverProto], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([ScrnSaverProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
+# Require xorg-macros: XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
scrnsaverproto.pc])
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/scrnsaverproto-X11R7.1-1.1.0/missing new/scrnsaverproto-1.2.0/missing
--- old/scrnsaverproto-X11R7.1-1.1.0/missing 2006-05-21 01:58:07.000000000 +0200
+++ new/scrnsaverproto-1.2.0/missing 2009-03-10 00:36:35.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,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 +46,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 +79,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
@@ -106,7 +109,7 @@
# 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
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,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";;
@@ -192,8 +195,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
@@ -214,25 +217,25 @@
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
;;
@@ -244,18 +247,18 @@
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
;;
@@ -267,11 +270,9 @@
\`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
@@ -289,11 +290,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
@@ -317,13 +324,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
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/scrnsaverproto-X11R7.1-1.1.0/saver.h new/scrnsaverproto-1.2.0/saver.h
--- old/scrnsaverproto-X11R7.1-1.1.0/saver.h 2006-03-31 20:39:42.000000000 +0200
+++ new/scrnsaverproto-1.2.0/saver.h 2009-08-25 10:36:25.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $XConsortium: saver.h,v 1.5 94/04/17 20:59:33 rws Exp $
- *
Copyright (c) 1992 X Consortium
Permission is hereby granted, free of charge, to any person obtaining a copy
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/scrnsaverproto-X11R7.1-1.1.0/saverproto.h new/scrnsaverproto-1.2.0/saverproto.h
--- old/scrnsaverproto-X11R7.1-1.1.0/saverproto.h 2006-03-31 20:39:42.000000000 +0200
+++ new/scrnsaverproto-1.2.0/saverproto.h 2009-08-25 10:36:25.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $XConsortium: saverproto.h,v 1.5 94/04/17 20:59:33 keith Exp $
- *
Copyright (c) 1992 X Consortium
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -26,7 +24,6 @@
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86$ */
#ifndef _SAVERPROTO_H_
#define _SAVERPROTO_H_
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scrnsaverproto-X11R7.1-1.1.0/scrnsaver.h new/scrnsaverproto-1.2.0/scrnsaver.h
--- old/scrnsaverproto-X11R7.1-1.1.0/scrnsaver.h 2006-03-31 20:39:42.000000000 +0200
+++ new/scrnsaverproto-1.2.0/scrnsaver.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,136 +0,0 @@
-/*
- * $XConsortium: scrnsaver.h,v 1.6 94/04/17 20:59:34 keith Exp $
- *
-Copyright (c) 1992 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
- *
- * Author: Keith Packard, MIT X Consortium
- */
-/* $XFree86$ */
-
-#ifndef _SCRNSAVER_H_
-#define _SCRNSAVER_H_
-
-#include
-#include
-#include
-
-typedef struct {
- int type; /* of event */
- unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if this came frome a SendEvent request */
- Display *display; /* Display the event was read from */
- Window window; /* screen saver window */
- Window root; /* root window of event screen */
- int state; /* ScreenSaverOff, ScreenSaverOn, ScreenSaverCycle*/
- int kind; /* ScreenSaverBlanked, ...Internal, ...External */
- Bool forced; /* extents of new region */
- Time time; /* event timestamp */
-} XScreenSaverNotifyEvent;
-
-typedef struct {
- Window window; /* screen saver window - may not exist */
- int state; /* ScreenSaverOff, ScreenSaverOn, ScreenSaverDisabled*/
- int kind; /* ScreenSaverBlanked, ...Internal, ...External */
- unsigned long til_or_since; /* time til or since screen saver */
- unsigned long idle; /* total time since last user input */
- unsigned long eventMask; /* currently selected events for this client */
-} XScreenSaverInfo;
-
-_XFUNCPROTOBEGIN
-
-extern Bool XScreenSaverQueryExtension (
- Display* /* display */,
- int* /* event_base */,
- int* /* error_base */
-);
-
-extern Status XScreenSaverQueryVersion (
- Display* /* display */,
- int* /* major_version */,
- int* /* minor_version */
-);
-
-extern XScreenSaverInfo *XScreenSaverAllocInfo (
- void
-);
-
-extern Status XScreenSaverQueryInfo (
- Display* /* display */,
- Drawable /* drawable */,
- XScreenSaverInfo* /* info */
-);
-
-extern void XScreenSaverSelectInput (
- Display* /* display */,
- Drawable /* drawable */,
- unsigned long /* eventMask */
-);
-
-extern void XScreenSaverSetAttributes (
- Display* /* display */,
- Drawable /* drawable */,
- int /* x */,
- int /* y */,
- unsigned int /* width */,
- unsigned int /* height */,
- unsigned int /* border_width */,
- int /* depth */,
- unsigned int /* class */,
- Visual * /* visual */,
- unsigned long /* valuemask */,
- XSetWindowAttributes * /* attributes */
-);
-
-extern void XScreenSaverUnsetAttributes (
- Display* /* display */,
- Drawable /* drawable */
-);
-
-extern Status XScreenSaverRegister (
- Display* /* display */,
- int /* screen */,
- XID /* xid */,
- Atom /* type */
-);
-
-extern Status XScreenSaverUnregister (
- Display* /* display */,
- int /* screen */
-);
-
-extern Status XScreenSaverGetRegistered (
- Display* /* display */,
- int /* screen */,
- XID* /* xid */,
- Atom* /* type */
-);
-
-extern void XScreenSaverSuspend (
- Display* /* display */,
- Bool /* suspend */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _SCRNSAVER_H_ */
++++++ videoproto-X11R7.0-2.2.2.tar.bz2 -> videoproto-2.3.0.tar.bz2 ++++++
++++ 8120 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/videoproto-X11R7.0-2.2.2/ChangeLog new/videoproto-2.3.0/ChangeLog
--- old/videoproto-X11R7.0-2.2.2/ChangeLog 2005-12-15 01:24:38.000000000 +0100
+++ new/videoproto-2.3.0/ChangeLog 2009-08-27 07:31:28.000000000 +0200
@@ -1,4 +1,177 @@
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 20dc47bfb9e6627e8335c870a808fdab72e82061
+Author: Peter Hutterer
+Date: Thu Aug 27 11:59:40 2009 +1000
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ videoproto 2.3.0
+
+ Signed-off-by: Peter Hutterer
+
+commit ed07cce6a0d54bf7ace0e672fe769a34fdac837a
+Author: Peter Hutterer
+Date: Thu Aug 27 11:55:47 2009 +1000
+
+ Remove RCS tags
+
+ Signed-off-by: Peter Hutterer
+
+commit cca2a3f1230bf21a1b4e4c255406b852c5c030c3
+Author: Paulo Cesar Pereira de Andrade
+Date: Tue Jan 27 20:06:28 2009 -0200
+
+ Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit 430e61ec31c975963a3495c81c360837584b0ef0
+Author: James Cloos
+Date: Thu Dec 6 16:39:08 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 35cde03805a6e6c4665a42e5c1657a88624710e6
+Author: James Cloos
+Date: Mon Sep 3 05:54:21 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 82643400f8b91f5bb13313cac5954f3e13455379
+Author: Alan Coopersmith
+Date: Fri Jul 14 18:56:36 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 1d8409f8b92026cf82b3c0356993ca3a5f18a1d1
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:38 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 7811bd17a495be2f42ffa66a399343ed2c54b7bd
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:15 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 8404664358642cd90952acf07957a57b678b54fe
+Author: Eric Anholt
+Date: Tue Aug 2 19:19:39 2005 +0000
+
+ Add basic .cvsignore files for proto modules.
+
+commit 8a08c1ccf233d725e0a12fc87cb6807f6fbb6fb2
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:57 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 d393967cb43b1050aa520e9fb738f2753f6a18b6
+Author: Daniel Stone
+Date: Tue Jul 12 01:22:22 2005 +0000
+
+ Move Xvlib.h and XvMClib.h to the libs.
+
+commit bae658b5c8d091a2deef3251ce07c0dff29af2ac
+Author: Daniel Stone
+Date: Sat May 21 04:52:54 2005 +0000
+
+ Change version to 2.2 (Xv major version; XvMC is 1.1 still).
+
+commit 7f0c0e550f1e3641bc895061d2ff76a8336fa5e7
+Author: Adam Jackson
+Date: Thu May 19 00:22:40 2005 +0000
+
+ revert last change, didn't do right thing at all, sorry for the noise
+
+commit 0662a3831996d2db4560c1e154db1a4995b70d14
+Author: Adam Jackson
+Date: Thu May 19 00:10:19 2005 +0000
+
+ Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit ff5a5dcd5e2bef26deca4be2d4541e9627544c89
+Author: Josh Triplett
+Date: Tue May 17 22:12:59 2005 +0000
+
+ Add COPYING file for Video.
+
+commit 47f7733ccc2a6deb8576b9d55a3a46c841a5560c
+Author: Søren Sandmann Pedersen