Hello community,
here is the log from the commit of package xorg-x11-proto-devel
checked in at Fri Mar 7 23:48:46 CET 2008.
--------
--- xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2007-11-15 12:33:20.000000000 +0100
+++ xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2008-03-07 20:21:45.264301000 +0100
@@ -1,0 +2,12 @@
+Fri Mar 7 20:38:16 CET 2008 - sndirsch@suse.de
+
+- printproto 1.0.4
+
+-------------------------------------------------------------------
+Thu Mar 6 07:55:44 CET 2008 - sndirsch@suse.de
+
+- util-macros 1.1.6
+- inputproto 1.4.3
+- xproto 7.0.12
+
+-------------------------------------------------------------------
Old:
----
inputproto-1.4.2.1.tar.bz2
printproto-X11R7.0-1.0.3.tar.bz2
util-macros-1.1.5.tar.bz2
xproto-7.0.11.tar.bz2
New:
----
inputproto-1.4.3.tar.bz2
printproto-1.0.4.tar.bz2
util-macros-1.1.6.tar.bz2
xproto-7.0.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-proto-devel.spec ++++++
--- /var/tmp/diff_new_pack.M19938/_old 2008-03-07 23:46:19.000000000 +0100
+++ /var/tmp/diff_new_pack.M19938/_new 2008-03-07 23:46:19.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xorg-x11-proto-devel (Version 7.3)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,10 +10,11 @@
# norootforbuild
+
Name: xorg-x11-proto-devel
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 8
+Release: 27
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Development/Libraries/X11
@@ -27,16 +28,16 @@
Source6: fontcacheproto-X11R7.0-0.1.2.tar.bz2
Source7: fontsproto-X11R7.0-2.0.2.tar.bz2
Source8: glproto-1.4.9.tar.bz2
-Source9: inputproto-1.4.2.1.tar.bz2
+Source9: inputproto-1.4.3.tar.bz2
Source10: kbproto-1.0.3.tar.bz2
-Source11: printproto-X11R7.0-1.0.3.tar.bz2
+Source11: printproto-1.0.4.tar.bz2
Source12: randrproto-1.2.1.tar.bz2
Source13: recordproto-X11R7.0-1.13.2.tar.bz2
Source14: renderproto-0.9.3.tar.bz2
Source15: resourceproto-X11R7.0-1.0.2.tar.bz2
Source16: scrnsaverproto-X11R7.1-1.1.0.tar.bz2
Source17: trapproto-X11R7.0-3.4.3.tar.bz2
-Source18: util-macros-1.1.5.tar.bz2
+Source18: util-macros-1.1.6.tar.bz2
Source19: videoproto-X11R7.0-2.2.2.tar.bz2
Source20: windowswmproto-X11R7.0-1.0.3.tar.bz2
Source21: xcmiscproto-X11R7.0-1.1.2.tar.bz2
@@ -48,7 +49,7 @@
Source27: xf86rushproto-X11R7.0-1.1.2.tar.bz2
Source28: xf86vidmodeproto-X11R7.0-2.2.2.tar.bz2
Source29: xineramaproto-X11R7.0-1.1.2.tar.bz2
-Source30: xproto-7.0.11.tar.bz2
+Source30: xproto-7.0.12.tar.bz2
Source31: xproxymanagementprotocol-X11R7.0-1.0.2.tar.bz2
Source32: evieext-X11R7.0-1.0.2.tar.bz2
Source33: xcb-proto-1.1.tar.bz2
@@ -129,25 +130,32 @@
/usr/%{_lib}/pkgconfig/*.pc
/usr/share/aclocal/*.m4
/usr/share/xcb/
+
%changelog
-* Thu Nov 15 2007 - sndirsch@suse.de
+* Fri Mar 07 2008 sndirsch@suse.de
+- printproto 1.0.4
+* Thu Mar 06 2008 sndirsch@suse.de
+- util-macros 1.1.6
+- inputproto 1.4.3
+- xproto 7.0.12
+* Thu Nov 15 2007 sndirsch@suse.de
- glproto 1.4.9
* Add proto structs for GLX_SGIX_pbuffer
-* Mon Nov 05 2007 - sndirsch@suse.de
+* Mon Nov 05 2007 sndirsch@suse.de
- xcb-proto 1.1
* In the eleven months since XCB's 1.0 release, a few portability
and correctness bugs have been found in libxcb. This release
fixes those, adds nicer handling of Xlib locking bugs, updates
pure-XCB extension support for RandR to version 1.2 and DAMAGE
to version 1.1, and enhances the libxcb documentation.
-* Sun Sep 30 2007 - sndirsch@suse.de
+* Sun Sep 30 2007 sndirsch@suse.de
- xproto 7.0.11
* Push out the keysym changes
-* Sun Sep 30 2007 - sndirsch@suse.de
+* Sun Sep 30 2007 sndirsch@suse.de
- removed obsolete patch 'inputproto-1.4.diff'
-* Sat Sep 29 2007 - sndirsch@suse.de
+* Sat Sep 29 2007 sndirsch@suse.de
- bumped version to 7.3
-* Sat Sep 29 2007 - sndirsch@suse.de
+* Sat Sep 29 2007 sndirsch@suse.de
- renderproto-0.9.3
* Along with documentation updates, this release fixes several
types for the X Server on 64-bit platforms, which had resulted
@@ -155,29 +163,29 @@
server ABI on those platforms in fixing them. This is intended
to be included in video driver ABI 2.0 (server 1.4), pending
merge of the server dependency on this version.
-* Thu Sep 06 2007 - sndirsch@suse.de
+* Fri Sep 07 2007 sndirsch@suse.de
- xf86dgaproto 2.0.3
* This release is part of a pair with libXxf86dga that fixes a
sign extension bug on I32L64 platforms.
-* Fri Aug 31 2007 - sndirsch@suse.de
+* Fri Aug 31 2007 sndirsch@suse.de
- inputproto 1.4.2.1:
* The inputproto-1.4.2 tarball had a busted configure script,
here are the new ones.
-* Fri Jul 13 2007 - sndirsch@suse.de
+* Fri Jul 13 2007 sndirsch@suse.de
- inputproto-1.4.diff (fixes build for some input drivers):
* readded missing defines TS_Raw/TS_Scaled
* xDeviceTSCalibrationCtl has been extended and renamed to
xDeviceAbsCalibCtl
-* Thu Jul 05 2007 - sndirsch@suse.de
+* Thu Jul 05 2007 sndirsch@suse.de
- inputproto 1.4.2:
* Just a little fix to stop compilation errors.
-* Wed Jul 04 2007 - sndirsch@suse.de
+* Wed Jul 04 2007 sndirsch@suse.de
- compositeproto 0.4
-* Tue May 01 2007 - sndirsch@suse.de
+* Tue May 01 2007 sndirsch@suse.de
- updated vncproto/xcliplistproto to current CVS (2007-05-01)
-* Fri Apr 06 2007 - sndirsch@suse.de
+* Fri Apr 06 2007 sndirsch@suse.de
- moved randr/damage proto spec to better location (Bug #260745)
-* Wed Feb 21 2007 - sndirsch@suse.de
+* Wed Feb 21 2007 sndirsch@suse.de
- updated randrpoto to release 1.2.1
* Install the randr protocol description.
* Fix the size of the padding fields of xRRGetCrtcGamma.
@@ -185,60 +193,60 @@
* Merge branch 'multi-monitor'
* More bugs found by Ian Osgood during the XCB work.
* Fix wording about requesting ConfigureNotify events.
-* Fri Jan 12 2007 - sndirsch@suse.de
+* Fri Jan 12 2007 sndirsch@suse.de
- added vncproto/xcliplistproto from xf4vnc project
-* Thu Jan 11 2007 - sndirsch@suse.de
+* Thu Jan 11 2007 sndirsch@suse.de
- updated damageproto to release 1.1.0
* adds new DamageAdd request which allows clients to report
damage from direct rendering.
-* Wed Dec 27 2006 - sndirsch@suse.de
+* Wed Dec 27 2006 sndirsch@suse.de
- updated util-macros to release 1.1.5
* X.Org Bug 9368: non portable sed usage in xorgversion.m4
-* Sun Dec 17 2006 - sndirsch@suse.de
+* Sun Dec 17 2006 sndirsch@suse.de
- updated util-macros to release 1.1.4
* Makefile.am: make ChangeLog hook safer
- updated xproto to release 7.0.10
* Makefile.am: make ChangeLog hook safer
* don't distribute Xfuncproto.h and Xpoll.h
-* Sun Dec 03 2006 - sndirsch@suse.de
+* Sun Dec 03 2006 sndirsch@suse.de
- udpated xcb-proto to release 1.0
- added libpthread-stubs (required since xcb 1.0)
- updated util-macros to release 1.1.3
* xorgversion: automatic PACKAGE_VERSION_* (bug #8590)
-* Wed Nov 08 2006 - sndirsch@suse.de
+* Wed Nov 08 2006 sndirsch@suse.de
- updated util-macros to release 1.1.2 (X.Org 7.2 RC2)
* Make building pdf's configurable, though only disabled when it
is explicitly set to no
* Add support for building docbook docs
* Fix handling of defs.ent to allow arbitrary install prefixes.
Introduce separate configure switches for each output format.
-* Fri Nov 03 2006 - sndirsch@suse.de
+* Fri Nov 03 2006 sndirsch@suse.de
- updated xcb-proto to release 1.0 RC3 (0.9.93)
-* Thu Oct 26 2006 - sndirsch@suse.de
+* Thu Oct 26 2006 sndirsch@suse.de
- updated xproto to release 7.0.9
* A very small release, that just fixes _X_INLINE for non-gcc
compilers, and adds _X_{,UN}LIKELY.
-* Thu Oct 26 2006 - sndirsch@suse.de
+* Thu Oct 26 2006 sndirsch@suse.de
- set version to 7.2 in specfile
-* Mon Oct 16 2006 - sndirsch@suse.de
+* Mon Oct 16 2006 sndirsch@suse.de
- added xcb-proto (required by optional libxcb)
-* Thu Sep 21 2006 - sndirsch@suse.de
+* Thu Sep 21 2006 sndirsch@suse.de
- updated xproto to release 7.0.8
* inlines and a couple of new keysyms, as well as an AIX fix
-* Wed Sep 20 2006 - sndirsch@suse.de
+* Wed Sep 20 2006 sndirsch@suse.de
- updated glproto to release 1.4.8:
* (hopefully) last update of the GLX_EXT_texture_from_pixmap
opcodes.
-* Sun Aug 27 2006 - sndirsch@suse.de
+* Mon Aug 28 2006 sndirsch@suse.de
- updated util-macros to release 1.1.1:
* remove man suffix special-casing for GNU userland systems
-* Fri Jul 28 2006 - sndirsch@suse.de
+* Fri Jul 28 2006 sndirsch@suse.de
- use "-fno-strict-aliasing"
- removed /usr/include/X11 from filelist (conflicts with filesystem)
-* Thu Jul 27 2006 - sndirsch@suse.de
+* Thu Jul 27 2006 sndirsch@suse.de
- use $RPM_OPT_FLAGS
- remove existing /usr/include/X11 symlink in %%pre
-* Fri Jul 21 2006 - sndirsch@suse.de
+* Fri Jul 21 2006 sndirsch@suse.de
- updated kbproto/util-macros
-* Thu Jun 22 2006 - sndirsch@suse.de
+* Thu Jun 22 2006 sndirsch@suse.de
- created package
++++++ inputproto-1.4.2.1.tar.bz2 -> inputproto-1.4.3.tar.bz2 ++++++
++++ 2708 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/inputproto-1.4.2.1/ChangeLog new/inputproto-1.4.3/ChangeLog
--- old/inputproto-1.4.2.1/ChangeLog 2007-08-31 10:27:29.000000000 +0200
+++ new/inputproto-1.4.3/ChangeLog 2008-03-06 04:06:10.000000000 +0100
@@ -1,4 +1,244 @@
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 096b20bf5492d248b5c8ff0c1c28e221d59db724
+Author: Jesse Barnes
+Date: Mon Jan 21 15:28:49 2008 -0800
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Use Xmd.h instead of X.h to pull in CARD32 definition
+
+ On 64 bit hosts, CARD32 may be undefined unless we use Xmd.h to define it for
+ us. Apparently X.h is no longer sufficient.
+
+commit 9359e625787761e6b3df15f29bbf842c67a9516d
+Author: James Cloos
+Date: Thu Dec 6 16:39:02 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 4b22047f347d8fd65a36b2fc90e1a87dff8e93e3
+Author: Eamon Walsh
+Date: Thu Sep 27 12:27:19 2007 -0400
+
+ XI.h needs X.h for CARD32 on 64-bit systems.
+
+commit f033750780b74d72056da93fd9a91140a978891b
+Merge: 369dd28... 96b0c13...
+Author: James Cloos
+Date: Mon Sep 3 06:17:20 2007 -0400
+
+ Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/proto/inputproto
+
+commit 369dd283cfcf006e2cfe3496ebc5157839a3d04e
+Author: James Cloos
+Date: Mon Sep 3 05:54:06 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 96b0c13a5a689b3a6dbc4249ca4ef364f778c003
+Author: Peter Hutterer
+Date: Fri Aug 31 17:58:27 2007 +0930
+
+ Bump to 1.4.2.1
+
+ No source changes, the 1.4.2 tarball had a busted configure script.
+
+commit 310a93f8e194aa070b0f1d40c8fd5ae941908dbe
+Author: Peter Hutterer
+Date: Thu Apr 26 11:06:18 2007 +0930
+
+ bump to 1.4.2
+
+commit c9bed7d4750c314002c16430a4dd75f95cc2f78d
+Author: Peter Hutterer
+Date: Tue Apr 24 22:53:27 2007 +0930
+
+ Add flags to be used for DevicePrensence's devchange field.
+
+commit c608d82c6b5b87ddc8d14862f528bdd69f5f5b72
+Author: Daniel Stone
+Date: Thu Feb 15 16:33:07 2007 +0200
+
+ bump to 1.4.1
+
+commit ad2edb61ffd8baf87b9ab249aa36b0c04a765f79
+Author: Peter Hutterer
+Date: Tue Jan 9 13:32:39 2007 +1030
+
+ Fix typo in DevicePresence() macro
+
+commit a0be30da79e35e7d503c6eeb9021c2f63beb2176
+Author: Daniel Stone
+Date: Sun Oct 22 16:40:11 2006 +0300
+
+ DeviceAbs{Area,Calib}: properly align 32-bit types
+ Decorate CARD32s and INT32s with B32.
+
+commit b1b3dbfd9b00d47c84c213bc6b7d61c5e8c80466
+Author: Daniel Stone
+Date: Sun Oct 22 16:30:56 2006 +0300
+
+ DevicePresenceNotify: add deviceid field, with explanation
+ Add deviceid field, and an explanation of same in XInput.h.
+ deviceid is only used if a specific device changed, and control
+ is non-zero if a specific control on that device changed.
+
+commit 06ffd1e6b600d4e3f55ce7da69448a284ff5dac6
+Author: Zephaniah E. Hull
+Date: Sat Oct 21 03:58:53 2006 -0400
+
+ DEVICE_TOUCHPAD -> DEVICE_ABS_CALIB.
+
+ As it's really calibration for absolute devices, add some stuff.
+
+ DEVICE_ABS_AREA
+
+ Defines the area of the screen that an absolute device covers if it is sending
+ core events.
+
+commit 1fab95863efc2bbf9a5b836b3de31da4a956b4bd
+Author: Daniel Stone
+Date: Fri Oct 20 00:33:13 2006 +0300
+
+ add DEVICE_ENABLE control, add core indication
+ Add DEVICE_ENABLE control, which allows specific devices to be
+ enabled or disabled at runtime.
+ Add 'iscore' flag to DEVICE_CORE, which indicates whether or not the
+ device is a virtual core device.
+
+commit 926251a486b57197d735a426887acad6fdfd7dc6
+Author: Daniel Stone
+Date: Tue Jul 18 11:56:37 2006 -0400
+
+ add XExtensionKeyboard and XExtensionPointer classes
+ Add two new classes of device, XExtensionKeyboard, and XExtensionPointer.
+
+commit 7a4a2a3e733378abced0a184627adfda4ed387b9
+Author: Daniel Stone
+Date: Mon Jul 17 19:34:45 2006 -0400
+
+ add DevicePresenceNotify event, clean up
+ Add DevicePresenceNotify event, which indicates that something in the device
+ list changed (Kristian Høgsberg, Red Hat).
+ Add a core event control, which toggles the sending or not of core events by
+ an extended device.
+ Clean up some random detritus from the MetroLink merge.
+
+commit 6767671f502964d385aa41de3a45fb479c6330c0
+Author: Alan Coopersmith
+Date: Fri Jul 14 18:56:18 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 4cc2697880ae61723094dacf78ffe77d81f6e0ee
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:37 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 3ade2fe8443f572abeee73b4fa8e986e4a054017
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:14 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 67498db2df7435d9d59eda4ac444c6560da839b3
+Author: Eric Anholt
+Date: Tue Aug 2 19:19:38 2005 +0000
+
+ Add basic .cvsignore files for proto modules.
+
+commit 742a1eb222d662fc9247ab7c1bd337ffef01eafb
+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 9161a356397a07002e03cf1846d212c7154f4c52
+Author: Daniel Stone
+Date: Sat May 21 04:04:21 2005 +0000
+
+ Set version to 1.3.
+
+commit 492f0a9e16bfe9cfb2c7b888b5b5e511db2bf83b
+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 ec71e17293b90ff5eeaa97566751fc5c3955904a
+Author: Adam Jackson
+Date: Thu May 19 00:10:18 2005 +0000
+
+ Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit 242316c65e53d1bba244e4f35e5a93718b0ea8d0
+Author: Josh Triplett
+Date: Mon May 16 03:30:03 2005 +0000
+
+ Add COPYING file for Input.
+
+commit 5c5945a47990b7bc077bcfdbabb6e0003cbf1659
+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 518f527ab685d2d082796460113bb7a9ea9bfe15
+Author: Kevin E Martin
+Date: Fri May 6 01:46:30 2005 +0000
+
+ Initial build system files for proto module.
+
+commit 4254b2967e3c5f256138f35de1ab49efff87220c
+Author: Egbert Eich
+Date: Fri Apr 23 18:43:06 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit ca910a158bdc060d17cf3c00f93c82c3a6ee6f05
+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 08e413c25f385e51466ef3309d880c1f63bf0a73
+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 1b98dbf2eab5a8ef74afda0c669c9fdfc6461cda
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:11 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit f276a601f272742ea8570fae4326c172cf4b8723
+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 47d36cccfdf0e65848bb2e9595779501a76d6000
+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 4383a95e0bbc2f09394deefc453c2edd1c813d0f
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:42 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 51468f1607f0b88576628c89e85d159afbb4628e
+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/inputproto-1.4.2.1/configure.ac new/inputproto-1.4.3/configure.ac
--- old/inputproto-1.4.2.1/configure.ac 2007-08-31 10:27:51.000000000 +0200
+++ new/inputproto-1.4.3/configure.ac 2008-03-06 04:05:48.000000000 +0100
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([InputProto], [1.4.2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [1.4.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/inputproto-1.4.2.1/Makefile.am new/inputproto-1.4.3/Makefile.am
--- old/inputproto-1.4.2.1/Makefile.am 2007-08-31 10:27:29.000000000 +0200
+++ new/inputproto-1.4.3/Makefile.am 2008-03-06 04:05:38.000000000 +0100
@@ -8,3 +8,13 @@
pkgconfig_DATA = inputproto.pc
EXTRA_DIST = autogen.sh inputproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
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/inputproto-1.4.2.1/missing new/inputproto-1.4.3/missing
--- old/inputproto-1.4.2.1/missing 2007-08-31 10:30:45.000000000 +0200
+++ new/inputproto-1.4.3/missing 2008-03-06 04:06:05.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2003-09-02.23
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -19,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
@@ -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=
@@ -60,11 +62,6 @@
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 "\
@@ -82,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
@@ -92,10 +90,12 @@
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 $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -104,12 +104,42 @@
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 $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
@@ -119,11 +149,6 @@
;;
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 $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -133,11 +158,6 @@
;;
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 $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -147,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";;
@@ -157,11 +177,6 @@
;;
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 $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
@@ -173,11 +188,6 @@
;;
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, but is $msg.
You might have modified some files without having the
@@ -185,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
@@ -207,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
;;
@@ -237,39 +247,32 @@
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 $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
@@ -279,11 +282,6 @@
;;
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 $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -291,20 +289,29 @@
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
@@ -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/inputproto-1.4.2.1/XI.h new/inputproto-1.4.3/XI.h
--- old/inputproto-1.4.2.1/XI.h 2007-08-31 10:27:29.000000000 +0200
+++ new/inputproto-1.4.3/XI.h 2008-03-06 04:05:38.000000000 +0100
@@ -50,9 +50,10 @@
/* Definitions used by the server, library and client */
#ifndef _XI_H_
-
#define _XI_H_
+#include /* CARD32 */
+
#define sz_xGetExtensionVersionReq 8
#define sz_xGetExtensionVersionReply 32
#define sz_xListInputDevicesReq 4
++++++ printproto-X11R7.0-1.0.3.tar.bz2 -> printproto-1.0.4.tar.bz2 ++++++
++++ 6662 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/printproto-X11R7.0-1.0.3/ChangeLog new/printproto-1.0.4/ChangeLog
--- old/printproto-X11R7.0-1.0.3/ChangeLog 2005-12-15 01:24:38.000000000 +0100
+++ new/printproto-1.0.4/ChangeLog 2008-03-06 22:12:58.000000000 +0100
@@ -1,10 +1,196 @@
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 1a3f6429362c505c1ab5df5fcc00cb913381c8c0
+Author: Eamon Walsh
+Date: Fri Dec 14 01:09:37 2007 -0500
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Update package version number for devPrivates rework.
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit f53c6b6069407a005b7911b5275761ff10c270cb
+Merge: e580369... 257f711...
+Author: Eamon Walsh
+Date: Fri Dec 7 20:20:45 2007 -0500
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Merge branch 'master' into XACE-SELINUX
+commit 257f7118e71ef4aa59bec55cd43bf1bdd228d152
+Author: James Cloos
+Date: Thu Dec 6 16:39:03 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 378417f12b1a8839c2943822545e8a9a74543d6d
+Merge: d284123... 4524de4...
+Author: James Cloos
+Date: Mon Sep 3 06:17:42 2007 -0400
+
+ Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/proto/printproto
+
+commit d284123348eeffdc8419144c7999c2b82b0cddc0
+Author: James Cloos
+Date: Mon Sep 3 05:54:11 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit e58036978c7c9077fe90517cd9e3e3c8035ca1f2
+Author: Eamon Walsh
+Date: Tue Aug 28 09:50:44 2007 -0400
+
+ Updates to printproto as part of devPrivates rework.
+
+commit 4524de4602ba112cef88fc01aaa3dedfa3e13b5d
+Merge: 4f039c9... e0972b5...
+Author: Eamon Walsh
+Date: Mon Aug 27 11:48:46 2007 -0400
+
+ Merge branch 'XACE-SELINUX'
+
+commit 4f039c9a8c7e9270cb41c3584a53a78610a804fd
+Author: Alan Coopersmith
+Date: Fri Jul 14 18:56:25 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit edf1eb2c9b0cb27f703a647c313f991df01a7a2c
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:38 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit fd24d13432838905386228344ef915cbfa4c228a
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:46 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 353a1f812eb7fcf560df8e8b4e08bc229ef78c0a
+Author: Kevin E Martin
+Date: Sat Nov 19 07:15:48 2005 +0000
+
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
+
+commit 9aba897159ed942e5399a4b2b6fff665deeac8d5
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:14 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 46bc30b476513df72ad9ef1fa0484338c69b2b33
+Author: Eric Anholt
+Date: Tue Aug 2 19:19:39 2005 +0000
+
+ Add basic .cvsignore files for proto modules.
+
+commit 89dbcc4915ae60e4a03142fe2b013ca7023499d1
+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 73623780051fecab6397cf075f87c707eca1a5ab
+Author: Alan Coopersmith
+Date: Mon Jul 25 16:15:05 2005 +0000
+
+ #include "fontstruct.h" -> for modularization
+ (Drew Parsons)
+
+commit 6b9a6d5696f2324b7982ee958f51de9a21297285
+Author: Daniel Stone
+Date: Sat May 21 04:13:23 2005 +0000
+
+ Set version to 1.0.
+
+commit 1cdce3bdede75f204d241c254c51b60c248369dc
+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 14bb8b2c0366c09f234c438a357adc0e40d767ad
+Author: Adam Jackson
+Date: Thu May 19 00:10:18 2005 +0000
+
+ Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit edb479dbcee12685ced059a70e4ad7a462d6a793
+Author: Josh Triplett
+Date: Mon May 16 08:42:55 2005 +0000
+
+ Add COPYING file for Print.
+
+commit 163d7443ea3776eeb00f85fdebebb53938924fb0
+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 61968cefee6fa47e6a2e99ac1277aa7496555d9b
+Author: Kevin E Martin
+Date: Fri May 6 01:46:31 2005 +0000
+
+ Initial build system files for proto module.
+
+commit 3450fba3cd4e37d66f612c06dae92b416ba267d7
+Author: Egbert Eich
+Date: Fri Apr 23 18:43:06 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit e33d669067beddc3f89cd5fbd91371a5f735ad27
+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 e0972b5ba2e9a39f5afa6ad17668dfa517e04cea
+Author: Egbert Eich
+Date: Fri Mar 5 13:38:51 2004 +0000
+
+ 23. Merged with XFree86 4.4.0. Added changes that went into infected files.
+ Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
+ future conflicts on ASCII but not humal readable files. (There should
+ probably be separate CreditsXorg.rtf files) (Egbert Eich).
+
+commit 3501dfac1febcaf4a6fd615216258cec5f8bdf98
+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 53d3ca9ad964d55afc04916ada912c06d10d5209
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:11 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit e91280eaba1651b9e600fe87c1760601981b9edf
+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 498f7aff528f11f2ad33a659c1634ae74d291aba
+Author: Kaleb Keithley
+Date: Mon Nov 17 19:03:40 2003 +0000
+
+ merge XFree86 4.3.0.1 to -CURRENT
+
+commit 2e88b0d462b9dc068096c6be7f0ba49e21f7e1c7
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:42 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 4382611f85dc0dcbfc7cca9a4ba175b3bc83da14
+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/printproto-X11R7.0-1.0.3/configure.ac new/printproto-1.0.4/configure.ac
--- old/printproto-X11R7.0-1.0.3/configure.ac 2005-12-15 01:24:38.000000000 +0100
+++ new/printproto-1.0.4/configure.ac 2007-12-14 07:09:10.000000000 +0100
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([PrintProto], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([PrintProto], [1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/printproto-X11R7.0-1.0.3/Makefile.am new/printproto-1.0.4/Makefile.am
--- old/printproto-X11R7.0-1.0.3/Makefile.am 2005-05-09 20:20:05.000000000 +0200
+++ new/printproto-1.0.4/Makefile.am 2007-12-08 02:20:45.000000000 +0100
@@ -7,3 +7,13 @@
pkgconfig_DATA = printproto.pc
EXTRA_DIST = autogen.sh printproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
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/printproto-X11R7.0-1.0.3/missing new/printproto-1.0.4/missing
--- old/printproto-X11R7.0-1.0.3/missing 2005-12-21 07:55:56.000000000 +0100
+++ new/printproto-1.0.4/missing 2007-11-06 00:21:17.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:
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/printproto-X11R7.0-1.0.3/Printstr.h new/printproto-1.0.4/Printstr.h
--- old/printproto-X11R7.0-1.0.3/Printstr.h 2005-07-25 18:15:05.000000000 +0200
+++ new/printproto-1.0.4/Printstr.h 2007-12-14 06:38:29.000000000 +0100
@@ -758,7 +758,7 @@
struct _XpClient *clientHead; /* list of clients */
CARD32 state;
VisualID pageWin;
- DevUnion *devPrivates;
+ PrivateRec *devPrivates;
XpDriverFuncs funcs;
ClientPtr clientSlept;
int imageRes;
@@ -766,11 +766,9 @@
#include /* FontResolutionPtr */
-extern Bool XpAllocateContextPrivate(int, unsigned);
extern FontResolutionPtr XpGetClientResolutions(ClientPtr, int *);
extern XpContextPtr XpContextOfClient(ClientPtr);
extern XpContextPtr XpGetPrintContext(ClientPtr);
-extern int XpAllocateContextPrivateIndex(void);
extern int XpRehashPrinterList(void);
extern void XpSetFontResFunc(ClientPtr);
extern void XpUnsetFontResFunc(ClientPtr);
++++++ util-macros-1.1.5.tar.bz2 -> util-macros-1.1.6.tar.bz2 ++++++
++++ 2329 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/util-macros-1.1.5/ChangeLog new/util-macros-1.1.6/ChangeLog
--- old/util-macros-1.1.5/ChangeLog 2006-12-24 05:17:23.000000000 +0100
+++ new/util-macros-1.1.6/ChangeLog 2008-03-05 20:52:23.000000000 +0100
@@ -1,3 +1,24 @@
+commit e1c1ee013e72dafd7b00ca96a8d4a25273b88e15
+Author: Jeremy Huddleston
+Date: Sat Feb 16 02:18:50 2008 -0800
+
+ Support version strings like 1.2.3-blah4
+
+commit e20c503d24e5ccf03035aa0f6d833d235d2179df
+Author: Keith Packard
+Date: Mon Aug 13 19:21:58 2007 -0700
+
+ Cannot use AC_CHECK_FILE when cross compiling; assume no LINUXDOC.
+
+ As AC_CHECK_FILE cannot be used when cross compiling, just assume linuxdoc
+ is not present.
+
+commit f2ddb356d86225a8ff6d1d1397fb2156cebd360f
+Author: Daniel Stone
+Date: Sun Dec 24 06:17:44 2006 +0200
+
+ bump to 1.1.5
+
commit e8b485d9252ffbb357a0b987ab1488d4033b555c
Author: Matthieu Herrb
Date: Mon Dec 18 18:25:25 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/util-macros-1.1.5/configure.ac new/util-macros-1.1.6/configure.ac
--- old/util-macros-1.1.5/configure.ac 2006-12-24 05:17:09.000000000 +0100
+++ new/util-macros-1.1.6/configure.ac 2008-03-05 20:52:00.000000000 +0100
@@ -23,7 +23,7 @@
AC_PREREQ([2.57])
AC_INIT([util-macros],
- [1.1.5],
+ [1.1.6],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
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/util-macros-1.1.5/missing new/util-macros-1.1.6/missing
--- old/util-macros-1.1.5/missing 2006-08-27 11:46:13.000000000 +0200
+++ new/util-macros-1.1.6/missing 2008-03-05 20:52:20.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/util-macros-1.1.5/xorg-macros.m4 new/util-macros-1.1.6/xorg-macros.m4
--- old/util-macros-1.1.5/xorg-macros.m4 2006-12-24 05:17:23.000000000 +0100
+++ new/util-macros-1.1.6/xorg-macros.m4 2008-03-05 20:52:22.000000000 +0100
@@ -45,7 +45,7 @@
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.5
+ [XORG_MACROS_version=1.1.6
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -194,7 +194,11 @@
XORG_SGML_PATH=$prefix/share/sgml
HAVE_DEFS_ENT=
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+if test x"$cross_compiling" = x"yes" ; then
+ HAVE_DEFS_ENT=no
+else
+ AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+fi
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
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/util-macros-1.1.5/xorg-macros.m4.in new/util-macros-1.1.6/xorg-macros.m4.in
--- old/util-macros-1.1.5/xorg-macros.m4.in 2006-11-08 15:23:10.000000000 +0100
+++ new/util-macros-1.1.6/xorg-macros.m4.in 2008-03-05 20:51:14.000000000 +0100
@@ -194,7 +194,11 @@
XORG_SGML_PATH=$prefix/share/sgml
HAVE_DEFS_ENT=
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+if test x"$cross_compiling" = x"yes" ; then
+ HAVE_DEFS_ENT=no
+else
+ AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+fi
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
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/util-macros-1.1.5/xorgversion.m4 new/util-macros-1.1.6/xorgversion.m4
--- old/util-macros-1.1.5/xorgversion.m4 2006-12-24 05:12:13.000000000 +0100
+++ new/util-macros-1.1.6/xorgversion.m4 2008-03-05 20:51:14.000000000 +0100
@@ -44,14 +44,14 @@
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of this package])
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
[$PVM],
[Minor version of this package])
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
++++++ xproto-7.0.11.tar.bz2 -> xproto-7.0.12.tar.bz2 ++++++
++++ 2981 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/xproto-7.0.11/ChangeLog new/xproto-7.0.12/ChangeLog
--- old/xproto-7.0.11/ChangeLog 2007-09-08 14:44:23.000000000 +0200
+++ new/xproto-7.0.12/ChangeLog 2008-03-06 04:08:45.000000000 +0100
@@ -1,18 +1,62 @@
+commit e4ad7a8080e4ac0b868fa7cf39bc5ad9a6e0bee1
+Author: Jeremy Huddleston
+Date: Sun Feb 10 19:07:49 2008 -0800
+
+ Fixed #ifdef checks that were using i386 to use __i386__
+
+ """
+ It's simply obsolete, sloppy, compiler namespace pollution. The
+ compiler is not allowed to predefine symbols that might conflict with
+ ordinary identifiers. For backwards compatibility gcc currently
+ predefines i386 when compiling for x86 32-bit (but not 64-bit), but that
+ will go away. It is also not defined if you specify -ansi when invoking
+ the compiler, because then it is seriously standards compliant. Other
+ compilers shouldn't define it either. Correct code shouldn't rely on it
+ being defined. However __i386__ is safe and proper.
+ """
+
+commit e49280c1c33622dbf288b0ac4f8324b01ff9b4aa
+Author: Jeremy Huddleston
+Date: Mon Dec 10 21:33:01 2007 -0800
+
+ Changed __DARWIN__ to __APPLE__
+
+commit 5ae4d304ecb5fb4af0435c9f2efde3d2da5905d1
+Author: Alan Coopersmith
+Date: Tue Oct 30 18:44:49 2007 -0700
+
+ Make Xalloca.h work with Sun C++ compiler
+
+commit 5ccc71161283fdb2c42da1eeb4049650f6a2f429
+Author: Ben Byer
+Date: Tue Oct 30 18:40:47 2007 -0700
+
+ fd_mask needs to be defined on OS X, too
+
+commit 8be48ca399c3efd0e5d59f53da1b37d02647f33b
+Author: Daniel Stone
+Date: Mon Sep 24 12:28:25 2007 +0300
+
+ Check headers before testing for fds_bits access method (bug #8442)
+
+ HP-UX doesn't have sys/select.h, so make sure we don't overzealously include
+ headers when we try to find out how to use fds_bits.
+
commit 68e841fb4bf489531635e6bee70f041d2c3cb87c
Author: James Cloos
-Date: Sat Sep 8 08:29:54 2007 -0400
+Date: Sat Sep 8 08:30:17 2007 -0400
bump to 7.0.11
commit 11fd082a384499c38065e06065bf80f244e9909a
Author: Eric Anholt
-Date: Tue Aug 28 14:54:21 2007 -0700
+Date: Tue Aug 28 14:54:44 2007 -0700
Describe what XF86XK_Display does (or now is meant to do).
commit 40ed4eef92e31fcf7ea0a436e1a00cdf49484c1b
Author: James Cloos
-Date: Wed Aug 22 21:10:24 2007 -0400
+Date: Wed Aug 22 21:10:47 2007 -0400
Add dead_abovecomma and dead_abovereversedcomma
@@ -24,7 +68,7 @@
commit ab74d270c76b17926504815ba43ee35b8b18d3be
Author: James Cloos
-Date: Wed Aug 22 21:01:25 2007 -0400
+Date: Wed Aug 22 21:01:48 2007 -0400
Comment on the new locations of the files referenced in keysymdef.h
keysymdef.h has a comment from the monolithic days suggesting that
@@ -35,107 +79,107 @@
commit 1edcfdb7f5c51e5c8014c56c4d5937337b7d4302
Author: James Cloos
-Date: Tue Aug 21 00:09:45 2007 -0400
+Date: Tue Aug 21 00:10:08 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
commit d8a49874bbd05a927c42102c0c5c147cf72cb1dd
Author: Colin Harrison
-Date: Wed May 9 16:46:02 2007 +0100
+Date: Wed May 9 16:46:25 2007 +0100
bcopy needs definition in Xfuncs.h for Xming
commit 7505880329d6b81f0c77d6aaa3995390659d5c63
Author: Tilman Sauerbeck
-Date: Tue May 1 14:54:04 2007 +0200
+Date: Tue May 1 14:54:27 2007 +0200
Added some more files to .gitignore.
commit 0c55a57dca2e888ba089e280f62e1c5bb55db7d7
Author: Tilman Sauerbeck
-Date: Tue May 1 14:52:34 2007 +0200
+Date: Tue May 1 14:52:57 2007 +0200
Enable GCC's visibility attributes on GCC 4 or greater only.
commit 30f5eedf800f6683161fca9fc3e2d6ddc9ce0ac3
Author: Zephaniah E. Hull
-Date: Fri Feb 2 15:11:03 2007 -0500
+Date: Fri Feb 2 15:11:26 2007 -0500
Add keysym definitions from Jim Gettys.
commit 5951f0355c6b1c591241bccb2023e6c4d493e701
Author: Daniel Stone
-Date: Sat Dec 16 01:09:27 2006 +0200
+Date: Sat Dec 16 01:09:50 2006 +0200
bump to 7.0.10
commit 0422755ef9373fbb6f69fbb599d791331837f747
Author: Daniel Stone
-Date: Sat Dec 16 01:09:21 2006 +0200
+Date: Sat Dec 16 01:09:44 2006 +0200
don't distribute Xfuncproto.h and Xpoll.h
Don't distribute these two files, as they're generated during the build.
commit cf44526713681ccfb6ef929a9c25ea650c5d1a32
Author: Daniel Stone
-Date: Wed Dec 6 19:01:56 2006 +0200
+Date: Wed Dec 6 19:02:19 2006 +0200
Makefile.am: make ChangeLog hook safer
Make ChangeLog hook as safe as possible.
commit 528e313fd1f1ae6f2303d3963afe41545f55ef88
Author: Daniel Stone
-Date: Thu Oct 26 00:45:21 2006 +0300
+Date: Thu Oct 26 00:45:44 2006 +0300
bump to 7.0.9
commit ab484c934301a61edc66dc1e4f554ec97b53aaf8
Author: Daniel Stone
-Date: Thu Oct 26 00:45:13 2006 +0300
+Date: Thu Oct 26 00:45:36 2006 +0300
Xfuncproto: add _X_LIKELY and _X_UNLIKELY
Add gcc branch hinting annotations.
commit 178cae180bc8b2e8feaaeda6d7c0317cf2715e14
Author: Daniel Stone
-Date: Thu Sep 21 18:42:43 2006 +0300
+Date: Thu Sep 21 18:43:06 2006 +0300
Xfuncproto: define _X_INLINE for older compilers
commit 241e9dfd400aa21919d06fb7c78b5730eee12aab
Author: Daniel Stone
-Date: Thu Sep 21 14:50:37 2006 +0300
+Date: Thu Sep 21 14:51:00 2006 +0300
bump to 7.0.8
commit e51b21e316a5a1b9442a5d972b4ffa03455aca6e
Author: Daniel Stone
-Date: Thu Sep 21 14:50:22 2006 +0300
+Date: Thu Sep 21 14:50:45 2006 +0300
XF86keysym: add keyboard/monitor brightness controls (Bug #8120)
Add XF86{Kbd,Mon}Brightness{Up,Down}, and XF86KbdLightOnOff.
commit c3f56593f776e7f9e3e0d220c6bcf8be38a16839
Author: Daniel Stone
-Date: Wed Sep 20 21:11:07 2006 +0300
+Date: Wed Sep 20 21:11:30 2006 +0300
Xfuncproto: add _X_INLINE
commit 4fb2e257ae6de38971be8005283402226aea1ee5
Author: Alan Coopersmith
-Date: Fri Jul 14 17:58:56 2006 -0700
+Date: Fri Jul 14 17:59:19 2006 -0700
Replace manual ChangeLog with dist-hook to generate from git log
commit 2153ef4b7c2a93cba39ae08352ea2c46e5f0eefb
Author: Alan Coopersmith
-Date: Fri Jul 14 17:54:15 2006 -0700
+Date: Fri Jul 14 17:54:38 2006 -0700
renamed: .cvsignore -> .gitignore
commit 0b76eb310307cd16e55d0c0792b54a2c6774fb88
Author: Dan McNichol
-Date: Fri Jul 14 17:53:11 2006 -0700
+Date: Fri Jul 14 17:53:34 2006 -0700
Bug #7458: AIX changes to Xmd.h
@@ -144,43 +188,43 @@
commit bb7584b5c88236c59c4e3040bc7c28c150abf048
Author: Daniel Stone
-Date: Sat Jun 10 15:33:27 2006 +0000
+Date: Sat Jun 10 15:33:50 2006 +0000
Add ISO_Level5_{Shift,Latch,Lock}.
commit e9aebeae3661d4c464c7aa53722d0a6bf915101a
Author: Daniel Stone
-Date: Thu Jun 1 23:30:57 2006 +0000
+Date: Thu Jun 1 23:31:20 2006 +0000
Bug #6887: Add dead_stroke, bump to 7.0.7. (Troy Korjuslommi)
commit f3886640d29026359ffc4add39b66b8ff48472d3
Author: Daniel Stone
-Date: Thu Jun 1 23:00:11 2006 +0000
+Date: Thu Jun 1 23:00:34 2006 +0000
Bump to 7.0.6.
commit d10d0302be37adb22804270926332e9d701935bb
Author: Daniel Stone
-Date: Thu Jun 1 22:59:40 2006 +0000
+Date: Thu Jun 1 23:00:03 2006 +0000
Bug #6296: Add support for Braille. (Samuel Thibault)
commit 0471bfcce2787d2f1ff0fc2d019840e2bae8bc49
Author: Adam Jackson
-Date: Wed Apr 26 23:26:26 2006 +0000
+Date: Wed Apr 26 23:26:49 2006 +0000
Bump to 7.0.5
commit 2a2b6db1f78f94c8f3690f675f0c032401fb2541
Author: Alan Coopersmith
-Date: Tue Apr 25 23:59:39 2006 +0000
+Date: Wed Apr 26 00:00:02 2006 +0000
Fix more comment typos.
commit 33cea539618d58d64efb6a5c0465d14a471256cd
Author: Alan Coopersmith
-Date: Thu Apr 20 01:24:02 2006 +0000
+Date: Thu Apr 20 01:24:25 2006 +0000
On Solaris, #include to be sure _LP64 is defined in 64-bit
builds.
@@ -188,31 +232,31 @@
commit 5e7d5cbf21c33f883ab508a51422775f59c4da00
Author: Kevin E Martin
-Date: Thu Dec 15 00:24:17 2005 +0000
+Date: Thu Dec 15 00:24:39 2005 +0000
Update package version number for final X11R7 release candidate.
commit 1827a78f3a23c77dbcddfc8227d85c5add59d819
Author: Kevin E Martin
-Date: Sat Dec 3 05:49:25 2005 +0000
+Date: Sat Dec 3 05:49:47 2005 +0000
Update package version number for X11R7 RC3 release.
commit 45811c86eb34e9f09e7d807ba4633107513f0d52
Author: Kevin E Martin
-Date: Sat Dec 3 01:13:14 2005 +0000
+Date: Sat Dec 3 01:13:36 2005 +0000
Automatically generate FUNCPROTO and NARROWPROTO defines in Xfuncproto.h.
commit c03cc7739b37ca504a2b56a73945755c41c68b2a
Author: Eric Anholt
-Date: Mon Nov 21 10:50:53 2005 +0000
+Date: Mon Nov 21 10:51:15 2005 +0000
Ignore Xpoll.h, which is generated now.
commit 54c8ddf303053fb398e00fc8a35df712a7f3d47d
Author: Alan Coopersmith
-Date: Mon Nov 21 02:46:59 2005 +0000
+Date: Mon Nov 21 02:47:21 2005 +0000
Change values of XK_MATHEMATICAL symbols to use 0x1000000 + Unicode value,
as Xorg Architecture Task Force agreed last year should be done for all
@@ -220,57 +264,57 @@
commit f13eca1bc0feba2476f87e019a4ef40693a61ed8
Author: Kevin E Martin
-Date: Wed Nov 9 21:20:11 2005 +0000
+Date: Wed Nov 9 21:20:33 2005 +0000
Update package version number for X11R7 RC2 release.
commit 448763bde4a31cb012ad17cd6c5159411102432b
Author: Kean Johnson
-Date: Tue Nov 8 06:33:03 2005 +0000
+Date: Tue Nov 8 06:33:25 2005 +0000
See ChangeLog entry 2005-11-07 for details.
commit 59a5a5ebb6781d417d7a4d5905999da5fc76a083
Author: Kevin E Martin
-Date: Wed Oct 19 02:47:53 2005 +0000
+Date: Wed Oct 19 02:48:15 2005 +0000
Update package version number for RC1 release.
commit 3f74cc5e8309b2a4ac7671ca3c52c304ec5aa57f
Author: Alan Coopersmith
-Date: Sat Oct 15 00:48:05 2005 +0000
+Date: Sat Oct 15 00:48:27 2005 +0000
Remove duplicate keysyms accidentally added to XK_MATHEMATICAL section.
commit eaffdc0d593b94d9036033911535371e73698573
Author: Daniel Stone
-Date: Sun Oct 9 15:37:07 2005 +0000
+Date: Sun Oct 9 15:37:29 2005 +0000
Bug #4688: Add various mathematical keysyms (all Unicode).
commit 40b6e64fb1084f7b0270c279ac7132e52886c912
Author: Matthieu Herrb
-Date: Sun Aug 21 15:27:05 2005 +0000
+Date: Sun Aug 21 15:27:27 2005 +0000
define CSRG_BASED here on systems that used to define it in Imake
configuration. For use in the modular tree.
commit 04f9f7fd17cab16e5b0b135409011c0d284b002c
Author: Eric Anholt
-Date: Tue Aug 2 19:19:18 2005 +0000
+Date: Tue Aug 2 19:19:40 2005 +0000
Add basic .cvsignore files for proto modules.
commit cd0400eeda5d7818232844d93343877ef0ff8168
Author: Adam Jackson
-Date: Tue Aug 2 18:36:08 2005 +0000
+Date: Tue Aug 2 18:36:30 2005 +0000
Fix the fds_bits test on OSX and maybe others. OSX defines fd_set in
just to be perverse.
commit a475adb523a4d24cd53d436ba8c98ac7c8d37934
Author: Alan Coopersmith
-Date: Sat Jul 30 21:07:03 2005 +0000
+Date: Sat Jul 30 21:07:25 2005 +0000
Add prototypes of Xalloc/free functions.
Export ImUtil.h to match modular tree install.
@@ -279,7 +323,7 @@
commit f6bd2288d3630ff7cb864e54cc7ebab1b3069067
Author: Kevin E Martin
-Date: Fri Jul 29 21:22:35 2005 +0000
+Date: Fri Jul 29 21:22:57 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
@@ -293,14 +337,14 @@
commit 74a3f7f77830e4417a4bc4145114030dfaef6f4e
Author: Daniel Stone
-Date: Sat Jul 23 02:53:10 2005 +0000
+Date: Sat Jul 23 02:53:32 2005 +0000
Remove all _XOPEN_SOURCE definitions from Xos.h, as Xpoll.h.in now deals
with this by using which of fds_bits or __fds_bits we have.
commit f97e34e65e403140dde00d260be0fd7f853ac8f0
Author: Daniel Stone
-Date: Fri Jul 22 08:01:17 2005 +0000
+Date: Fri Jul 22 08:01:39 2005 +0000
Add includex11dir as a path to the includes, sans X11/.
Turn Xpoll.h into a generated file. In the modular tree, substitute in
@@ -311,20 +355,20 @@
commit 7a9ce57163172557d6ba41119a5a3b2837dbbc8e
Author: Alan Coopersmith
-Date: Sat Jul 16 20:53:51 2005 +0000
+Date: Sat Jul 16 20:54:13 2005 +0000
Guard INCLUDE_ALLOCA_H define to end redefinition warnings.
commit 825b6ae347b3896b8ea38e6021170d45ae3bfd65
Author: Alan Coopersmith
-Date: Thu Jul 14 22:08:16 2005 +0000
+Date: Thu Jul 14 22:08:38 2005 +0000
Don't define _XOPEN_SOURCE on SVR4, because it will REMOVE required
definitions.
commit acc0551fb1af1152c1b630ff5e82f023f11751e2
Author: Alan Coopersmith
-Date: Wed Jul 13 23:42:46 2005 +0000
+Date: Wed Jul 13 23:43:08 2005 +0000
#define INCLUDE_ALLOCA_H when building with Sun compilers. (Imake *.cf
files define this for a number of platforms in the monolith, but these
@@ -333,14 +377,14 @@
commit b8301067b6e962a3dc786dd909726b7e6cb81085
Author: Alexander Gottwald
-Date: Wed Jul 13 20:11:51 2005 +0000
+Date: Wed Jul 13 20:12:13 2005 +0000
include instead of . Several namespace
conflicts are worked around in Xwindows.h
commit ec7a156bcdbe8e4bddf232d4a03f47d426096736
Author: Keith Packard
-Date: Wed Jul 13 07:23:34 2005 +0000
+Date: Wed Jul 13 07:23:56 2005 +0000
Make some minor source adjustments so that we don not need to use
-D_XOPEN_SOURCE -D_BSD_SOURCE everywhere as this will leak out of the
@@ -349,13 +393,13 @@
commit 2a0445903d06c332acf70cfd18ba57ddbbeada32
Author: Daniel Stone
-Date: Sun Jul 3 07:54:38 2005 +0000
+Date: Sun Jul 3 07:55:00 2005 +0000
Move misc.h and os.h from proto/X11 to xserver/xorg/include.
commit ef6f542053b30af29b8045ffa6ce26386aab7bba
Author: Søren Sandmann Pedersen
-Date: Tue Jun 28 13:15:05 2005 +0000
+Date: Tue Jun 28 13:15:27 2005 +0000
- Remove xfixes.pc.in from lib/lbxutil
- Add missing backslash in proto/X11/Makefile.am
@@ -363,7 +407,7 @@
commit 4cf89be7baf8a79d2d399abd17c4e23279cca364
Author: Søren Sandmann Pedersen
-Date: Mon Jun 27 17:40:47 2005 +0000
+Date: Mon Jun 27 17:41:09 2005 +0000
- Add os.h and misc.h to proto/X11
- In symlink.sh move os.h and misc.h from xserver/include to proto/X11
@@ -371,7 +415,7 @@
commit e575c5104a8627428dd18c4040d4ad787655164a
Author: Søren Sandmann Pedersen
-Date: Wed May 25 22:11:59 2005 +0000
+Date: Wed May 25 22:12:21 2005 +0000
- Use XTRANS_CONNECTION_FLAGS macro in lib/FS/configure.ac
- Don't symlink transport.c, which is a generated file
@@ -379,7 +423,7 @@
commit 207e3f82011d5f83db0eca318a1de50f0c1da0dc
Author: Søren Sandmann Pedersen
-Date: Wed May 25 21:47:34 2005 +0000
+Date: Wed May 25 21:47:56 2005 +0000
- Add FSlib to symlink.sh
- Change Xtrans includedir back to be X11/Xtrans, so that users of it can
@@ -391,7 +435,7 @@
commit a5a4bfe9b432e7d8238f9a02d80be4ce6bb64978
Author: Josh Triplett
-Date: Mon May 23 01:21:48 2005 +0000
+Date: Mon May 23 01:22:10 2005 +0000
The macros in Xpoll.h poke at the guts of struct fd_set in ways that only
work if _XOPEN_SOURCE is defined, so define it in Cflags in the
@@ -399,37 +443,37 @@
commit 2f4c3aa871a047359f8121e6401be1ba4cf0b8e0
Author: Adam Jackson
-Date: Thu May 19 00:22:18 2005 +0000
+Date: Thu May 19 00:22:40 2005 +0000
revert last change, didn't do right thing at all, sorry for the noise
commit 4809dd9150599a9e88f64cd1b82737872b7b1b94
Author: Adam Jackson
-Date: Thu May 19 00:09:57 2005 +0000
+Date: Thu May 19 00:10:19 2005 +0000
Require automake 1.7 in AM_INIT_AUTOMAKE
commit 6ff17c33f0773e152122d66cbaffaa54e53e086c
Author: Josh Triplett
-Date: Sat May 14 07:56:27 2005 +0000
+Date: Sat May 14 07:56:49 2005 +0000
Add AUTHORS file for X11 from xlibs tree.
commit 3f8b0ba6071dcdd62ea424cab0bddb39db2ebe6a
Author: Josh Triplett
-Date: Sat May 14 07:54:48 2005 +0000
+Date: Sat May 14 07:55:10 2005 +0000
Add some COPYING files.
commit 803c8ecaba2f8c703bbb46c0d740bfa349ce0245
Author: Kevin E Martin
-Date: Fri May 6 01:46:09 2005 +0000
+Date: Fri May 6 01:46:31 2005 +0000
Initial build system files for proto module.
commit a870c60741273ebd6cb1e69b4e535ce3a6bc76bf
Author: Alan Coopersmith
-Date: Thu Apr 28 22:03:50 2005 +0000
+Date: Thu Apr 28 22:04:12 2005 +0000
Don't define X_NOT_STDC_ENV on Solaris x86. Bugzilla #3158:
https://bugs.freedesktop.org/show_bug.cgi?id=3158 Patch #2588:
@@ -438,13 +482,13 @@
commit 372f37171ba3875ea4bf7f60150d92869e06010f
Author: Alexander Gottwald
-Date: Wed Apr 20 13:57:55 2005 +0000
+Date: Wed Apr 20 13:58:17 2005 +0000
check for define PATH_MAX before referencing it
commit e489ec65b4b2ab0a050d8dbf7ec0658e6decb8b3
Author: Alan Coopersmith
-Date: Wed Mar 2 19:29:09 2005 +0000
+Date: Wed Mar 2 19:29:31 2005 +0000
Patch #2007 https://bugs.freedesktop.org/attachment.cgi?id=2007
1) Fix Solaris #ifdefs to choose between UI/SVR4 (early POSIX draft) and
@@ -455,7 +499,7 @@
commit d761e87224d3e60c5355ac3e3468835fc3b4be92
Author: Roland Mainz
-Date: Wed Mar 2 11:20:07 2005 +0000
+Date: Wed Mar 2 11:20:29 2005 +0000
xc/config/cf/DragonFly.cf
xc/config/cf/Imake.cf
@@ -475,99 +519,99 @@
commit 1cae0cb4b1442b34d76ee5623fb2a17ed2353c50
Author: Alexander Gottwald
-Date: Sun Jan 9 15:05:42 2005 +0000
+Date: Sun Jan 9 15:06:04 2005 +0000
Make sure PATH_MAX is at least 1024
commit 9df4ffce552a0f6eca47764a3f79b466629e8bab
Author: Egbert Eich
-Date: Mon Jan 3 18:03:27 2005 +0000
+Date: Mon Jan 3 18:03:49 2005 +0000
gcc 4 doesn't like predeffines line 'linux' any more. To muffle the
compiler replace them with __linux__ (Bugzilla #2207).
commit dd82af84ed67f439444e75ea1d032c082e15db51
Author: Alexander Gottwald
-Date: Mon Nov 15 15:06:31 2004 +0000
+Date: Mon Nov 15 15:06:53 2004 +0000
Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added
mingw (Win32) port
commit 618956f1f783a8c330aab8eac425937f0b8e50e1
Author: Markus Kuhn
-Date: Sun Sep 26 20:45:56 2004 +0000
+Date: Sun Sep 26 20:46:18 2004 +0000
The big keysym cleanup, to bring implementation in line with the recent
revision of Appendix A of the protocol spec. (Markus Kuhn)
commit 7cb1490d8932d745b3a5e2b3370a000da064306f
Author: Kevin E Martin
-Date: Wed Aug 11 21:13:54 2004 +0000
+Date: Wed Aug 11 21:14:16 2004 +0000
Apply PPC64 build patch (Bug #303, Mike A. Harris, Alan Coopersmith).
commit 5b67de2bce0e33a4a85439ebcf7b726a6da24545
Author: Egbert Eich
-Date: Fri Apr 23 18:42:43 2004 +0000
+Date: Fri Apr 23 18:43:05 2004 +0000
Merging XORG-CURRENT into trunk
commit e88a09c1df46637979c4d131a8e41af923ff4d45
Author: Egbert Eich
-Date: Sun Mar 14 08:31:12 2004 +0000
+Date: Sun Mar 14 08:31:34 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit 9259b43390c50d330f557390cc4576f5315c3f53
Author: Egbert Eich
-Date: Wed Mar 3 12:10:31 2004 +0000
+Date: Wed Mar 3 12:10:53 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit 99bbbc3fcaf67b02a50e4ff4007225b1b64beb36
Author: Egbert Eich
-Date: Thu Feb 26 13:34:49 2004 +0000
+Date: Thu Feb 26 13:35:11 2004 +0000
readding XFree86's cvs IDs
commit 82d7bb39bc84eb16134e931263f53bc88d1788ac
Author: Egbert Eich
-Date: Thu Feb 26 09:22:02 2004 +0000
+Date: Thu Feb 26 09:22:24 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
commit 0700ff31a84abc06fdf4b05c2328ff2329dc909c
Author: Egbert Eich
-Date: Thu Jan 29 08:07:32 2004 +0000
+Date: Thu Jan 29 08:07:54 2004 +0000
Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
commit ad76b5cc436937d9fb945bd43d9356651fe182ca
Author: Kaleb Keithley
-Date: Fri Dec 19 20:53:58 2003 +0000
+Date: Fri Dec 19 20:54:20 2003 +0000
XFree86 4.3.99.902 (RC 2)
commit 376f9efdab6ef2dce267caa0a0228892e768e390
Author: Kaleb Keithley
-Date: Tue Nov 25 19:27:39 2003 +0000
+Date: Tue Nov 25 19:28:01 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
commit 5ec315b967cb1ae519f514896f0b48fb5407f863
Author: Kaleb Keithley
-Date: Fri Nov 14 16:48:20 2003 +0000
+Date: Fri Nov 14 16:48:42 2003 +0000
XFree86 4.3.0.1
commit f2001f5bd5316842106a98b23f09400688575fa3
Author: Kaleb Keithley
-Date: Fri Nov 14 16:48:20 2003 +0000
+Date: Fri Nov 14 16:48:42 2003 +0000
Initial revision
commit ee0a1a43dc707f960e637fdf2118723e4de0a55d
Author: Kaleb Keithley
-Date: Fri Nov 14 15:54:13 2003 +0000
+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/xproto-7.0.11/configure.ac new/xproto-7.0.12/configure.ac
--- old/xproto-7.0.11/configure.ac 2007-09-08 13:16:09.000000000 +0200
+++ new/xproto-7.0.12/configure.ac 2008-03-06 04:08:25.000000000 +0100
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([Xproto], [7.0.11], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([Xproto], [7.0.12], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AC_CONFIG_HEADER([do-not-use-config.h])
@@ -32,6 +32,8 @@
[WIDEPROTO=$enableval], [WIDEPROTO=auto])
+AC_CHECK_HEADERS([sys/select.h sys/param.h sys/types.h sys/time.h])
+
# Handle Xpoll.h.in
fds_bits_found=false;
@@ -42,8 +44,18 @@
USE_FDS_BITS="fds_bits"
],,
[
+ #ifdef HAVE_SYS_PARAM_H
+ #include
+ #endif
+ #ifdef HAVE_SYS_TYPES_H
#include
+ #endif
+ #ifdef HAVE_SYS_TIME_H
+ #include
+ #endif
+ #ifdef HAVE_SYS_SELECT_H
#include
+ #endif
])
fi
@@ -54,8 +66,18 @@
USE_FDS_BITS="__fds_bits"
],,
[
- #include
- #include
+ #ifdef HAVE_SYS_PARAM_H
+ #include
+ #endif
+ #ifdef HAVE_SYS_TYPES_H
+ #include
+ #endif
+ #ifdef HAVE_SYS_TIME_H
+ #include
+ #endif
+ #ifdef HAVE_SYS_SELECT_H
+ #include
+ #endif
])
fi
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/xproto-7.0.11/do-not-use-config.h.in new/xproto-7.0.12/do-not-use-config.h.in
--- old/xproto-7.0.11/do-not-use-config.h.in 2007-09-08 14:44:11.000000000 +0200
+++ new/xproto-7.0.12/do-not-use-config.h.in 2008-03-06 04:08:38.000000000 +0100
@@ -3,6 +3,42 @@
/* FUNCPROTO */
#undef FUNCPROTO
+/* Define to 1 if you have the header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_SELECT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_UNISTD_H
+
/* Narrow prototypes */
#undef NARROWPROTO
@@ -33,5 +69,8 @@
/* Patch version of this package */
#undef PACKAGE_VERSION_PATCHLEVEL
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* Version number of package */
#undef VERSION
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xproto-7.0.11/Xalloca.h new/xproto-7.0.12/Xalloca.h
--- old/xproto-7.0.11/Xalloca.h 2007-03-05 13:21:50.000000000 +0100
+++ new/xproto-7.0.12/Xalloca.h 2008-03-06 04:08:11.000000000 +0100
@@ -62,7 +62,8 @@
#define XALLOCA_H 1
#ifndef INCLUDE_ALLOCA_H
-# if defined(__SUNPRO_C) /* Need to add more here to match Imake *.cf's */
+/* Need to add more here to match Imake *.cf's */
+# if defined(HAVE_ALLOCA_H) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
# define INCLUDE_ALLOCA_H
# endif
#endif
@@ -111,16 +112,14 @@
* decide that you don't want to use alloca, you might want to fix it here.
*/
/* alloca might be a macro taking one arg (hi, Sun!), so give it one. */
-# ifndef __sgi /* IRIX 5/6 has definition */
-# ifndef __QNX__
+# if !defined(__sgi) && !defined(__QNX__) && !defined(__cplusplus)
# define __Xnullarg /* as nothing */
# ifndef X_NOT_STDC_ENV
extern void *alloca(__Xnullarg);
# else
extern char *alloca(__Xnullarg);
# endif
-# endif /* __QNX__ */
-# endif /* __sgi */
+# endif /* !__sgi && !__QNX && !__cplusplus */
# define ALLOCATE_LOCAL(size) alloca((int)(size))
# endif /* who does alloca */
# endif /* NCR */
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/xproto-7.0.11/Xosdefs.h new/xproto-7.0.12/Xosdefs.h
--- old/xproto-7.0.11/Xosdefs.h 2007-03-05 13:21:50.000000000 +0100
+++ new/xproto-7.0.12/Xosdefs.h 2008-03-06 04:08:11.000000000 +0100
@@ -86,7 +86,7 @@
#endif
#endif
-#ifdef i386
+#ifdef __i386__
#ifdef SYSV
#if !defined(ISC) && !defined(__SCO__) && !defined(_SEQUENT_) && \
!defined(__UNIXWARE__) && !defined(sun)
@@ -133,7 +133,7 @@
#define NULL_NOT_ZERO
#endif
-#ifdef __DARWIN__
+#ifdef __APPLE__
#define NULL_NOT_ZERO
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xproto-7.0.11/Xos.h new/xproto-7.0.12/Xos.h
--- old/xproto-7.0.11/Xos.h 2007-03-05 13:21:50.000000000 +0100
+++ new/xproto-7.0.12/Xos.h 2008-03-06 04:08:11.000000000 +0100
@@ -149,7 +149,7 @@
*/
#if defined(X_NOT_POSIX)
#include
-#if defined(USL) || defined(CRAY) || defined(MOTOROLA) || (defined(i386) && (defined(SYSV) || defined(SVR4))) || defined(__sxg__)
+#if defined(USL) || defined(CRAY) || defined(MOTOROLA) || (defined(__i386__) && (defined(SYSV) || defined(SVR4))) || defined(__sxg__)
#include
#endif
#ifdef WIN32
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/xproto-7.0.11/Xos_r.h new/xproto-7.0.12/Xos_r.h
--- old/xproto-7.0.11/Xos_r.h 2007-03-05 13:21:50.000000000 +0100
+++ new/xproto-7.0.12/Xos_r.h 2008-03-06 04:08:11.000000000 +0100
@@ -237,7 +237,7 @@
#elif !defined(XTHREADS) && !defined(X_FORCE_USE_MTSAFE_API)
/* Use regular, unsafe API. */
-# if defined(X_NOT_POSIX) && !defined(i386) && !defined(SYSV)
+# if defined(X_NOT_POSIX) && !defined(__i386__) && !defined(SYSV)
extern struct passwd *getpwuid(), *getpwnam();
# endif
typedef int _Xgetpwparams; /* dummy */
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/xproto-7.0.11/Xpoll.h.in new/xproto-7.0.12/Xpoll.h.in
--- old/xproto-7.0.11/Xpoll.h.in 2007-03-05 13:21:50.000000000 +0100
+++ new/xproto-7.0.12/Xpoll.h.in 2008-03-06 04:08:11.000000000 +0100
@@ -91,7 +91,7 @@
#ifdef CSRG_BASED
#include
-# if BSD < 199103
+# if BSD < 199103 || defined(__APPLE__)
typedef long fd_mask;
# endif
#endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org