x11proto-xext: Changes to 'upstream-unstable'
.gitignore | 3
COPYING | 22 +
EVI.h | 36 ++
EVIproto.h | 96 +++++
MITMisc.h | 66 ---
Makefile.am | 68 +--
XEVI.h | 64 ---
XEVIstr.h | 98 -----
XLbx.h | 155 --------
XShm.h | 161 ---------
XTest.h | 164 ---------
Xag.h | 114 ------
Xagstr.h | 182 ----------
Xcup.h | 69 ---
Xcupstr.h | 109 ------
Xdbe.h | 136 -------
Xdbeproto.h | 277 ---------------
Xext.h | 57 ---
Xge.h | 55 ---
ag.h | 52 ++
agproto.h | 178 ++++++++++
configure.ac | 6
cup.h | 38 ++
cupproto.h | 105 +++++
dbe.h | 57 +++
dbeproto.h | 224 ++++++++++++
dpms.h | 67 ---
dpmsconst.h | 43 ++
dpmsproto.h | 175 +++++++++
dpmsstr.h | 186 ----------
extutil.h | 192 ----------
lbx.h | 73 ++++
lbxbuf.h | 51 --
lbxbufstr.h | 45 --
lbxdeltastr.h | 105 -----
lbximage.h | 151 --------
lbxopts.h | 133 -------
lbxproto.h | 975 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
lbxstr.h | 935 ----------------------------------------------------
lbxzlib.h | 64 ---
mitmiscconst.h | 38 ++
mitmiscproto.h | 68 +++
mitmiscstr.h | 70 ---
multibuf.h | 317 -----------------
multibufconst.h | 83 ++++
multibufproto.h | 295 ++++++++++++++++
multibufst.h | 609 ----------------------------------
secur.h | 61 +++
security.h | 111 ------
securproto.h | 110 ++++++
securstr.h | 116 ------
shape.h | 180 ----------
shapeconst.h | 55 +++
shapeproto.h | 237 +++++++++++++
shapestr.h | 234 -------------
shm.h | 44 ++
shmproto.h | 187 ++++++++++
shmstr.h | 217 ------------
sync.h | 469 --------------------------
syncconst.h | 179 ++++++++++
syncproto.h | 378 +++++++++++++++++++++
syncstr.h | 494 ---------------------------
xtestconst.h | 41 ++
xtestext1.h | 326 ------------------
xtestext1const.h | 160 +++++++++
xtestext1proto.h | 221 ++++++++++++
xtestproto.h | 124 ++++++
xteststr.h | 120 ------
68 files changed, 4393 insertions(+), 6938 deletions(-)
New commits:
commit 987aeb9bd1915a655f31e250ee9c02d04927b150
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 25 09:30:15 2009 +1000
xextproto 7.1.1
diff --git a/configure.ac b/configure.ac
index 598403e..4931d3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([XExtProto], [7.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XExtProto], [7.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_CHANGELOG
commit 55a0bbdde9b27b8dbc6e75d41c51af3f92dea6e3
Author: Eduard Bagrov <ebagrov@linuxtesting.org>
Date: Fri Aug 21 18:48:19 2009 +0200
Fix XSyncValueSubtract typo
X.Org bug#23438 <http://bugs.freedesktop.org/show_bug.cgi?id=23438>
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/syncconst.h b/syncconst.h
index 2ad5db7..926b60c 100644
--- a/syncconst.h
+++ b/syncconst.h
@@ -113,7 +113,7 @@ PERFORMANCE OF THIS SOFTWARE.
Bool signb = XSyncValueIsNegative(b);\
((presult)->lo = (a).lo - (b).lo);\
((presult)->hi = (a).hi - (b).hi);\
- if (t>(presult)->lo) (presult)->hi--;\
+ if (t<(presult)->lo) (presult)->hi--;\
*poverflow = ((signa == signb) && !(signa == XSyncValueIsNegative(*presult)));\
}
#define _XSyncMaxValue(pv) ((pv)->hi = 0x7fffffff, (pv)->lo = 0xffffffff)
commit 23ac4d5235862d51f0cfb080ad2118a9fb181673
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 5 15:09:11 2009 +1000
xextproto 7.1.0
diff --git a/configure.ac b/configure.ac
index 62b8db8..598403e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([XExtProto], [7.0.99.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XExtProto], [7.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_CHANGELOG
commit 5ffa318ddb35308e3a87122bfb3944e3201532ba
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 5 15:06:52 2009 +1000
lbxproto: remove debug macro and definition of lbxDebug.
This should not be in the protocol headers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/lbxproto.h b/lbxproto.h
index d613d42..a1ae62b 100644
--- a/lbxproto.h
+++ b/lbxproto.h
@@ -959,14 +959,7 @@ typedef struct _LbxFreeCellsEvent {
#define DBG_BLOCK 0x00000020
#define DBG_CLIENT 0x00000040
#define DBG_DELTA 0x00000080
-
-extern int lbxDebug;
-
-#define DBG(n,m) if (lbxDebug & (n)) { fprintf m; } else
-#else
-#define DBG(n,m)
#endif
-
/*
* Cancel the previous redefinition of the basic types, thus restoring their
* X.h definitions.
commit 5a266968b1ced367df1a47dc9729313c85be0516
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 22 20:26:35 2009 +1000
Bump to 7.0.99.3
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 89f29ee..62b8db8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([XExtProto], [7.0.99.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XExtProto], [7.0.99.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_CHANGELOG
commit d7ead7a591da851f6bb2efecdd35b63836df4ed0
Author: Magnus Kessler <Magnus.Kessler@gmx.net>
Date: Wed Jul 22 09:37:38 2009 +0100
Rename xtest.h to xtestconst.h to avoid a collision with XTest.h on case-insensitive filesystems
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/Makefile.am b/Makefile.am
index 6ba1b08..8cdd0ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ xext_HEADERS = \
EVIproto.h \
xtestext1proto.h \
xtestext1const.h \
- xtest.h \
+ xtestconst.h \
xtestproto.h
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/xtest.h b/xtest.h
deleted file mode 100644
index e74b904..0000000
--- a/xtest.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-
-Copyright 1992, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-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
-OPEN GROUP 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 Open Group 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 Open Group.
-
-*/
-
-#ifndef _XTEST_CONST_H_
-#define _XTEST_CONST_H_
-
-#define XTestNumberEvents 0
-
-#define XTestNumberErrors 0
-
-#define XTestCurrentCursor ((Cursor)1)
-
-#define XTestMajorVersion 2
-#define XTestMinorVersion 2
-
-#define XTestExtensionName "XTEST"
-
-#endif
diff --git a/xtestconst.h b/xtestconst.h
new file mode 100644
index 0000000..e74b904
--- /dev/null
+++ b/xtestconst.h
@@ -0,0 +1,41 @@
+/*
+
+Copyright 1992, 1998 The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+*/
+
+#ifndef _XTEST_CONST_H_
+#define _XTEST_CONST_H_
+
+#define XTestNumberEvents 0
+
+#define XTestNumberErrors 0
+
+#define XTestCurrentCursor ((Cursor)1)
+
+#define XTestMajorVersion 2
+#define XTestMinorVersion 2
+
+#define XTestExtensionName "XTEST"
+
+#endif
diff --git a/xtestproto.h b/xtestproto.h
index 2eb832e..4f8db26 100644
--- a/xtestproto.h
+++ b/xtestproto.h
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef _XTESTPROTO_H_
#define _XTESTPROTO_H_
-#include <X11/extensions/xtest.h>
+#include <X11/extensions/xtestconst.h>
#define Window CARD32
#define Time CARD32
commit 2fd05eca7dd501c58b284d9cceb73d6146672b0a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 21 13:35:58 2009 +1000
Bump to 7.0.99.2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 8c879ac..89f29ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([XExtProto], [7.0.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XExtProto], [7.0.99.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_CHANGELOG
commit a049c37f789f881fad09e60a061488cba2b4072e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jul 20 22:42:59 2009 +0100
Rename mitmisc.h to mitmiscconst.h to avoid a collision with MITMisc.h on case-insensitive filesystems
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/Makefile.am b/Makefile.am
index 40cc826..6ba1b08 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ xext_HEADERS = \
geproto.h \
lbx.h \
lbxproto.h \
- mitmisc.h \
+ mitmiscconst.h \
mitmiscproto.h \
multibufconst.h \
multibufproto.h \
diff --git a/mitmisc.h b/mitmisc.h
deleted file mode 100644
index 7c67f97..0000000
--- a/mitmisc.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/************************************************************
-
-Copyright 1989, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-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
-OPEN GROUP 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 Open Group 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 Open Group.
-
-********************************************************/
-
-/* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */
-
-
-#ifndef _MITMISC_H_
-#define _MITMISC_H_
-
-#define MITMiscNumberEvents 0
-#define MITMiscNumberErrors 0
-
-#define MITMISCNAME "MIT-SUNDRY-NONSTANDARD"
-
-#endif
diff --git a/mitmiscconst.h b/mitmiscconst.h
new file mode 100644
index 0000000..adc5f94
--- /dev/null
+++ b/mitmiscconst.h
@@ -0,0 +1,38 @@
+/************************************************************
+
+Copyright 1989, 1998 The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+********************************************************/
+
+/* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */
+
+
+#ifndef _MITMISCCONST_H_
+#define _MITMISCCONST_H_
+
+#define MITMiscNumberEvents 0
+#define MITMiscNumberErrors 0
+
+#define MITMISCNAME "MIT-SUNDRY-NONSTANDARD"
+
+#endif
diff --git a/mitmiscproto.h b/mitmiscproto.h
index 31a7af1..18c202a 100644
--- a/mitmiscproto.h
+++ b/mitmiscproto.h
@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef _MITMISCPROTO_H_
#define _MITMISCPROTO_H_
-#include <X11/extensions/mitmisc.h>
+#include <X11/extensions/mitmiscconst.h>
#define X_MITSetBugMode 0
#define X_MITGetBugMode 1
commit 609c3b03fbed24f05d636d98dad9febc7226624c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 15 16:28:12 2009 +1000
Remove RCS tags.
diff --git a/EVI.h b/EVI.h
index a164daf..7f3f733 100644
--- a/EVI.h
+++ b/EVI.h
@@ -1,4 +1,3 @@
-/* $Xorg: XEVI.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
/************************************************************
Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc.
Permission to use, copy, modify, and distribute this
@@ -21,7 +20,6 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#ifndef _EVI_H_
#define _EVI_H_
diff --git a/EVIproto.h b/EVIproto.h
index 5201bb5..afa282a 100644
--- a/EVIproto.h
+++ b/EVIproto.h
@@ -1,4 +1,3 @@
-/* $Xorg: XEVIstr.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
/************************************************************
Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc.
Permission to use, copy, modify, and distribute this
@@ -21,7 +20,6 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#ifndef _EVIPROTO_H_
#define _EVIPROTO_H_
diff --git a/ag.h b/ag.h
index b6dcd7d..be5883a 100644
--- a/ag.h
+++ b/ag.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/include/extensions/Xag.h,v 1.5 2001/12/17 20:52:24 dawes Exp $ */
/*
Copyright 1996, 1998 The Open Group
@@ -24,7 +23,6 @@ not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $Xorg: Xag.h,v 1.5 2001/02/09 02:03:24 xorgcvs Exp $ */
#ifndef _AG_H_
#define _AG_H_
diff --git a/agproto.h b/agproto.h
index 95442da..1086661 100644
--- a/agproto.h
+++ b/agproto.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/include/extensions/Xagstr.h,v 1.4 2001/12/14 19:53:28 dawes Exp $ */
/*
Copyright 1996, 1998, 2001 The Open Group
@@ -24,7 +23,6 @@ not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $Xorg: Xagstr.h,v 1.6 2001/02/09 02:03:24 xorgcvs Exp $ */
#ifndef _AGPROTO_H_ /* { */
#define _AGPROTO_H_
diff --git a/cup.h b/cup.h
index 6622451..cbbc34b 100644
--- a/cup.h
+++ b/cup.h
@@ -1,4 +1,3 @@
-/* $Xorg: Xcup.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
/*
Copyright 1987, 1988, 1998 The Open Group
@@ -24,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86$ */
#ifndef _CUP_H_
#define _CUP_H_
diff --git a/cupproto.h b/cupproto.h
index 8d2f7af..f61c9f0 100644
--- a/cupproto.h
+++ b/cupproto.h
@@ -1,5 +1,3 @@
-/* $Xorg: Xcupstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-
/*
Copyright 1987, 1988, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/include/extensions/Xcupstr.h,v 3.5 2001/08/01 00:44:35 tsi Exp $ */
#ifndef _XCUPPROTO_H_ /* { */
#define _XCUPPROTO_H_
diff --git a/dbe.h b/dbe.h
index 3fdab1c..7968552 100644
--- a/dbe.h
+++ b/dbe.h
@@ -1,4 +1,3 @@
-/* $Xorg: Xdbe.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
/******************************************************************************
*
* Copyright (c) 1994, 1995 Hewlett-Packard Company
@@ -30,7 +29,6 @@
* Header file for Xlib-related DBE
*
*****************************************************************************/
-/* $XFree86: xc/include/extensions/Xdbe.h,v 3.2 2001/08/01 00:44:35 tsi Exp $ */
#ifndef DBE_H
#define DBE_H
diff --git a/dbeproto.h b/dbeproto.h
index 2be53c0..784926e 100644
--- a/dbeproto.h
+++ b/dbeproto.h
@@ -1,4 +1,3 @@
-/* $Xorg: Xdbeproto.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
/******************************************************************************
*
* Copyright (c) 1994, 1995 Hewlett-Packard Company
diff --git a/dpmsconst.h b/dpmsconst.h
index 37091c1..75f0586 100644
--- a/dpmsconst.h
+++ b/dpmsconst.h
@@ -1,4 +1,3 @@
-/* $Xorg: dpms.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
/*****************************************************************
Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts.
@@ -26,7 +25,6 @@ dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
-/* $XFree86: xc/include/extensions/dpms.h,v 3.4 2000/03/15 16:51:51 tsi Exp $ */
#ifndef _DPMSCONST_H
#define _DPMSCONST_H 1
diff --git a/dpmsproto.h b/dpmsproto.h
index 1dfda5f..63fd3fc 100644
--- a/dpmsproto.h
+++ b/dpmsproto.h
@@ -1,4 +1,3 @@
-/* $Xorg: dpmsstr.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
/*****************************************************************
Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts.
@@ -26,14 +25,6 @@ dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
-/* $XFree86$ */
-
-/*
- * HISTORY
- */
-/*
- * @(#)RCSfile: dpmsstr.h,v Revision: 1.1.4.2 (DEC) Date: 1995/11/21 19:34:19
- */
#ifndef _DPMSPROTO_H_
#define _DPMSPROTO_H_
diff --git a/lbx.h b/lbx.h
index b93239d..ecd24ff 100644
--- a/lbx.h
+++ b/lbx.h
@@ -1,4 +1,3 @@
-/* $Xorg: XLbx.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
/*
* Copyright 1992 Network Computing Devices
*
@@ -20,7 +19,6 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/include/extensions/XLbx.h,v 1.3 2002/10/16 01:59:55 dawes Exp $ */
#ifndef _LBX_H_
#define _LBX_H_
diff --git a/lbxproto.h b/lbxproto.h
index 585f4c4..d613d42 100644
--- a/lbxproto.h
+++ b/lbxproto.h
@@ -1,4 +1,3 @@
-/* $Xorg: lbxstr.h,v 1.4 2001/02/13 20:14:04 pookie Exp $ */
/*
* Copyright 1992 Network Computing Devices
*
@@ -20,7 +19,6 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/include/extensions/lbxstr.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */
#ifndef _LBXPROTO_H_
#define _LBXPROTO_H_
diff --git a/mitmisc.h b/mitmisc.h
index 55863ef..7c67f97 100644
--- a/mitmisc.h
+++ b/mitmisc.h
@@ -26,7 +26,6 @@ in this Software without prior written authorization from The Open Group.
/* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */
-/* $Xorg: MITMisc.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
#ifndef _MITMISC_H_
#define _MITMISC_H_
diff --git a/mitmiscproto.h b/mitmiscproto.h
index 7de9d26..31a7af1 100644
--- a/mitmiscproto.h
+++ b/mitmiscproto.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/************************************************************
Copyright 1989, 1998 The Open Group
@@ -27,8 +26,6 @@ in this Software without prior written authorization from The Open Group.
/* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */
-/* $Xorg: mitmiscstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-
#ifndef _MITMISCPROTO_H_
#define _MITMISCPROTO_H_
diff --git a/multibufconst.h b/multibufconst.h
index d605287..2d1238c 100644
--- a/multibufconst.h
+++ b/multibufconst.h
@@ -1,6 +1,4 @@
/*
- * $Xorg: multibuf.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $
- *
Copyright 1989, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
@@ -24,8 +22,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/include/extensions/multibuf.h,v 3.4 2001/12/14 19:53:28 dawes Exp $ */
-
#ifndef _MULTIBUFCONST_H_
#define _MULTIBUFCONST_H_
diff --git a/multibufproto.h b/multibufproto.h
index b2c7bb6..e2184d3 100644
--- a/multibufproto.h
+++ b/multibufproto.h
@@ -1,6 +1,4 @@
/*
- * $Xorg: multibufst.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $
- *
Copyright 1989, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
@@ -24,8 +22,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/include/extensions/multibufst.h,v 3.8 2001/12/19 21:37:29 dawes Exp $ */
-
#ifndef _MULTIBUFPROTO_H_
#define _MULTIBUFPROTO_H_
diff --git a/secur.h b/secur.h
index 7a0b34a..ca27b29 100644
--- a/secur.h
+++ b/secur.h
@@ -1,4 +1,3 @@
-/* $Xorg: security.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
/*
Copyright 1996, 1998 The Open Group
@@ -24,7 +23,6 @@ not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/include/extensions/security.h,v 1.3 2001/12/14 19:53:29 dawes Exp $ */
#ifndef _SECUR_H
#define _SECUR_H
diff --git a/securproto.h b/securproto.h
index d954250..409a4c5 100644
--- a/securproto.h
+++ b/securproto.h
@@ -1,4 +1,3 @@
-/* $Xorg: securstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
/*
Copyright 1996, 1998 The Open Group
@@ -24,7 +23,6 @@ not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/include/extensions/securstr.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */
#ifndef _SECURPROTO_H
#define _SECURPROTO_H
diff --git a/shapeconst.h b/shapeconst.h
index 0ca8477..9088956 100644
--- a/shapeconst.h
+++ b/shapeconst.h
@@ -24,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
********************************************************/
-/* $Xorg: shapestr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-
#ifndef _SHAPECONST_H_
#define _SHAPECONST_H_
diff --git a/shapeproto.h b/shapeproto.h
index b98003a..49bd1a1 100644
--- a/shapeproto.h
+++ b/shapeproto.h
@@ -24,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
********************************************************/
-/* $Xorg: shapestr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-
#ifndef _SHAPEPROTO_H_
#define _SHAPEPROTO_H_
diff --git a/shm.h b/shm.h
index 37d616e..e076402 100644
--- a/shm.h
+++ b/shm.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/include/extensions/shmstr.h,v 3.3 2001/12/14 19:53:29 dawes Exp $ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/shmproto.h b/shmproto.h
index 1e2ee86..e5de377 100644
--- a/shmproto.h
+++ b/shmproto.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/include/extensions/shmstr.h,v 3.3 2001/12/14 19:53:29 dawes Exp $ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/syncconst.h b/syncconst.h
index 66a1a7f..2ad5db7 100644
--- a/syncconst.h
+++ b/syncconst.h
@@ -1,4 +1,3 @@
-/* $Xorg: sync.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
/*
Copyright 1991, 1993, 1994, 1998 The Open Group
@@ -48,7 +47,6 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
******************************************************************/
-/* $XFree86: xc/include/extensions/sync.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */
#ifndef _SYNCCONST_H_
#define _SYNCCONST_H_
diff --git a/syncproto.h b/syncproto.h
index cc79316..13b53d5 100644
--- a/syncproto.h
+++ b/syncproto.h
@@ -1,4 +1,3 @@
-/* $Xorg: syncstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
/*
Copyright 1991, 1993, 1994, 1998 The Open Group
@@ -48,7 +47,6 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
******************************************************************/
-/* $XFree86: xc/include/extensions/syncstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */
#ifndef _SYNCPROTO_H_
#define _SYNCPROTO_H_
diff --git a/xtest.h b/xtest.h
index 10404f4..e74b904 100644
--- a/xtest.h
+++ b/xtest.h
@@ -1,4 +1,3 @@
-/* $Xorg: XTest.h,v 1.5 2001/02/09 02:03:24 xorgcvs Exp $ */
/*
Copyright 1992, 1998 The Open Group
@@ -24,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/include/extensions/XTest.h,v 3.3 2001/12/14 19:53:28 dawes Exp $ */
#ifndef _XTEST_CONST_H_
#define _XTEST_CONST_H_
diff --git a/xtestext1const.h b/xtestext1const.h
index a65e8ea..656edc6 100644
--- a/xtestext1const.h
+++ b/xtestext1const.h
@@ -1,4 +1,3 @@
-/* $Xorg: xtestext1.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
/*
* xtestext1.h
*
diff --git a/xtestext1proto.h b/xtestext1proto.h
index a23e835..e9bdee0 100644
--- a/xtestext1proto.h
+++ b/xtestext1proto.h
@@ -1,4 +1,3 @@
-/* $Xorg: xtestext1.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
/*
* xtestext1.h
*
@@ -6,8 +5,6 @@
*/
/*
-
-
Copyright 1986, 1987, 1988, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/xtestproto.h b/xtestproto.h
index a8eadda..2eb832e 100644
--- a/xtestproto.h
+++ b/xtestproto.h
@@ -1,4 +1,3 @@
-/* $Xorg: xteststr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
/*
Copyright 1992, 1998 The Open Group
commit 6e9e47edf97a0bb504b4b65f5ef066f3d5e3d34b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 15 16:20:13 2009 +1000
Bump to 7.0.99.1
diff --git a/configure.ac b/configure.ac
index 5f613ee..8c879ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([XExtProto], [7.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XExtProto], [7.0.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_CHANGELOG
commit ef8766e44c5cdd1e3ba7ebabf576e2de77f57a09
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 25 11:43:12 2009 +1000
xtestext1: split xtestext1.h header into xtestext1proto.h
diff --git a/Makefile.am b/Makefile.am
index 5755ef4..40cc826 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,8 @@ xext_HEADERS = \
dbeproto.h \
EVI.h \
EVIproto.h \
- xtestext1.h \
+ xtestext1proto.h \
+ xtestext1const.h \
xtest.h \
xtestproto.h
diff --git a/xtestext1.h b/xtestext1.h
deleted file mode 100644
index 8f49cad..0000000
--- a/xtestext1.h
+++ /dev/null
@@ -1,326 +0,0 @@
-/* $Xorg: xtestext1.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-/*
- * xtestext1.h
- *
- * X11 Input Synthesis Extension include file
- */
-
-/*
-
-
-Copyright 1986, 1987, 1988, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-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
-OPEN GROUP 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 Open Group 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 Open Group.
-
-
-Copyright 1986, 1987, 1988 by Hewlett-Packard Corporation
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Hewlett-Packard not be used in
-advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-Hewlett-Packard makes no representations about the
-suitability of this software for any purpose. It is provided
-"as is" without express or implied warranty.
-
-This software is not subject to any license of the American
-Telephone and Telegraph Company or of the Regents of the
-University of California.
-
-*/
-
-/*
- * the typedefs for CARD8, CARD16, and CARD32 are defined in Xmd.h
- */
Reply to: