x11proto-core: Changes to 'debian-experimental'
.gitignore | 83
COPYING | 21
ChangeLog | 383 +++
DECkeysym.h | 2
HPkeysym.h | 1
Makefile.am | 12
Makefile.in | 628 -----
README | 25
Sunkeysym.h | 50
X.h | 5
XF86keysym.h | 6
XWDFile.h | 1
Xalloca.h | 31
Xarch.h | 133 -
Xdefs.h | 2
Xfuncproto.h.in | 10
Xfuncs.h | 81
Xmd.h | 162 -
Xos.h | 280 --
Xos_r.h | 103
Xosdefs.h | 182 -
Xpoll.h.in | 41
Xproto.h | 4
Xprotostr.h | 1
Xthreads.h | 401 +--
Xw32defs.h | 140 -
Xwindows.h | 47
Xwinsock.h | 9
aclocal.m4 | 930 -------
config.guess | 1526 ------------
config.sub | 1658 -------------
configure | 6044 -------------------------------------------------
configure.ac | 12
debian/README.source | 73
debian/changelog | 39
debian/control | 26
debian/copyright | 22
debian/rules | 29
debian/xsfbs/repack.sh | 32
debian/xsfbs/xsfbs.mk | 21
debian/xsfbs/xsfbs.sh | 311 --
do-not-use-config.h.in | 76
install-sh | 519 ----
keysym.h | 3
keysymdef.h | 21
missing | 367 --
mkinstalldirs | 161 -
47 files changed, 1358 insertions(+), 13356 deletions(-)
New commits:
commit c0ccac4f459a9462598960fb4b5effa8e748bf01
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 7 16:24:59 2010 +0100
Update debian/copyright.
diff --git a/debian/changelog b/debian/changelog
index 69531d5..0e3270d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ x11proto-core (7.0.17-1) UNRELEASED; urgency=low
* Remove myself from Uploaders
* New upstream release.
* Bump xutils-dev build-dep for xorg-macros.
+ * Update debian/copyright.
-- Julien Cristau <jcristau@debian.org> Sat, 03 Jul 2010 20:04:15 +0100
diff --git a/debian/copyright b/debian/copyright
index 5924e14..a1e993d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,6 +8,27 @@ significant contributions from Jim Gettys, Phil Karlton and Scott
McGregor of Digital, Dave Rosenthal of Sun, and many others of
the xpert mailing list.
+Copyright © 1991 Sun Microsystems, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
Copyright 1987, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
@@ -50,3 +71,4 @@ ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
+
commit ca88bff1a15347d0683cb8e7f6d1231592e55a22
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 7 16:19:27 2010 +0100
Bump xutils-dev build-dep for xorg-macros.
diff --git a/debian/changelog b/debian/changelog
index d69e929..69531d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x11proto-core (7.0.17-1) UNRELEASED; urgency=low
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
* New upstream release.
+ * Bump xutils-dev build-dep for xorg-macros.
-- Julien Cristau <jcristau@debian.org> Sat, 03 Jul 2010 20:04:15 +0100
diff --git a/debian/control b/debian/control
index a18501c..edf6295 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
automake,
- xutils-dev (>= 1:7.4+4)
+ xutils-dev (>= 1:7.5),
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-core
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-core.git
commit 2e92a7f40e198e4b43fdd7b7348acd5a97ac08c1
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 7 16:10:17 2010 +0100
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index eb1bd67..c2e3246 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,149 @@
+commit 9ffca704438993516016671e9a7f67c5ca21f142
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sat May 15 17:43:32 2010 +0200
+
+ xproto 7.0.17
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit 81c3cc1ce1f163de91d33bfa1b335f8b4d309c13
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Mar 28 19:25:52 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 1f442cdd1c26fa10e654ef2e957e24c2306abb11
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Mar 28 19:00:31 2010 -0400
+
+ config: remove the pkgconfig pc.in file from EXTRA_DIST
+
+ Automake always includes it in the tarball.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 1511eb6065c103149b7ce59b4cc0aa538449cf80
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sat Mar 27 19:42:59 2010 -0700
+
+ Add _X_NORETURN macro to signify functions that don't return
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit e7d73aec46f2ebc21e8b80378c3647b69f098b9a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sat Mar 27 16:38:27 2010 -0400
+
+ config: remove execute permission on configuration file
+
+ Introduced in commit c879dab58f82f4789f27933c22706c84015f8684
+ "avoid checking for fds_bits on mingw"
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit bf25d06799da98c3df655d8a734fe98c98bf143e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jan 15 13:31:40 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit d02f4b124489016f43478ac2ca2fbb2d0253ba02
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date: Tue Oct 13 16:51:14 2009 -0500
+
+ xproto: Cygwin GCC does not support visibility attributes
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+ Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit ec13f2cc5af936aafc3a483f441c44aa5ed14fe3
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Nov 22 19:24:48 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 45135e80f1e1f8818159f7d80372a77df0537738
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Nov 16 11:13:30 2009 -0500
+
+ README: file created or updated #24206
+
+ Contains a set of URLs to freedesktop.org.
+
+commit cdd22487f12f7058404759bd138ada421debc93a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Nov 15 19:45:27 2009 -0500
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit b99b992915dd19914c9464d9a96278d2cc2ceeeb
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Nov 15 18:31:29 2009 -0500
+
+ Makefile.am: INSTALL file is missing or incorrect #24206
+
+ The standard GNU file on building/installing tarball is copied
+ using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS
+ Add INSTALL target
+
+commit caea0fd5a966a74465d965ecab89f4829dced157
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Nov 15 18:11:36 2009 -0500
+
+ configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242
+
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file from
+ future changes.
+
+commit f1b1d45cd955f24a338af098ebd6a181b1454b38
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sat Nov 14 20:47:09 2009 -0500
+
+ configure.ac: AM_MAINTAINER_MODE missing #24238
+
+ This turns off maintainer mode build rules in tarballs.
+ Works in conjunction with autogen.sh --enable-maintainer-mode
+
+commit 78947b5a7e0ef934fdce7e1bce734d2cf29639b4
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sat Nov 14 18:26:47 2009 -0500
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
+commit 3ec82cd722407e4dccd6165786d3452f3ab80bea
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Oct 2 10:46:06 2009 +1000
+
+ Add XF86XK_TouchpadToggle
+
+ Many laptops provide a key to enable or disable the touchpad and the
+ trackstick. On Lenovo T61s, this key is located on Fn + F8.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
commit 4253e208088d166a8666f673360ef69a3c86f8b0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Sep 23 17:04:09 2009 -0700
diff --git a/debian/changelog b/debian/changelog
index 42618d4..d69e929 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-x11proto-core (7.0.16-2) UNRELEASED; urgency=low
+x11proto-core (7.0.17-1) UNRELEASED; urgency=low
* Get rid of the x-dev transitional package.
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
+ * New upstream release.
- -- Julien Cristau <jcristau@debian.org> Sat, 21 Nov 2009 10:34:47 +0100
+ -- Julien Cristau <jcristau@debian.org> Sat, 03 Jul 2010 20:04:15 +0100
x11proto-core (7.0.16-1) unstable; urgency=low
commit 9ffca704438993516016671e9a7f67c5ca21f142
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 15 17:43:32 2010 +0200
xproto 7.0.17
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/configure.ac b/configure.ac
index ec1b825..f45250e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([Xproto], [7.0.16], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([Xproto], [7.0.17], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 9df33457830769804a65cac5a27bf996768374f7
Author: Mikhail Gusarov <dottedmag@debian.org>
Date: Fri May 7 18:58:51 2010 +0700
Remove duplicate xorg.fd.o URL and confusing mailing list URL from debian/control
diff --git a/debian/control b/debian/control
index 27c8c63..a18501c 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,5 @@ Description: X11 core wire protocol and auxiliary headers
.
More information about X.Org can be found at:
<URL:http://www.X.org>
- <URL:http://xorg.freedesktop.org>
- <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
.
This package is built from the X.org xproto proto module.
commit 81c3cc1ce1f163de91d33bfa1b335f8b4d309c13
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Mar 28 19:25:52 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index e885fa4..ec1b825 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
AC_INIT([Xproto], [7.0.16], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 1f442cdd1c26fa10e654ef2e957e24c2306abb11
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Mar 28 19:00:31 2010 -0400
config: remove the pkgconfig pc.in file from EXTRA_DIST
Automake always includes it in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 98263f3..26b9995 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,6 @@ nodist_xproto_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xproto.pc
-EXTRA_DIST = xproto.pc.in
MAINTAINERCLEANFILES = ChangeLog INSTALL
commit 1511eb6065c103149b7ce59b4cc0aa538449cf80
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Mar 27 19:42:59 2010 -0700
Add _X_NORETURN macro to signify functions that don't return
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/Xfuncproto.h.in b/Xfuncproto.h.in
index afdd95b..96a585c 100644
--- a/Xfuncproto.h.in
+++ b/Xfuncproto.h.in
@@ -117,4 +117,10 @@ in this Software without prior written authorization from The Open Group.
# define _X_DEPRECATED
#endif
+#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)
+# define _X_NORETURN __attribute((noreturn))
+#else
+# define _X_NORETURN
+#endif /* GNUC */
+
#endif /* _XFUNCPROTO_H_ */
commit e7d73aec46f2ebc21e8b80378c3647b69f098b9a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Mar 27 16:38:27 2010 -0400
config: remove execute permission on configuration file
Introduced in commit c879dab58f82f4789f27933c22706c84015f8684
"avoid checking for fds_bits on mingw"
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
old mode 100755
new mode 100644
commit 9325e5ebeccde98c224c3c6590c09b538071e00a
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 23 01:46:45 2010 +0100
Remove myself from Uploaders
diff --git a/debian/changelog b/debian/changelog
index e9d22a3..42618d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11proto-core (7.0.16-2) UNRELEASED; urgency=low
* Get rid of the x-dev transitional package.
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
+ * Remove myself from Uploaders
-- Julien Cristau <jcristau@debian.org> Sat, 21 Nov 2009 10:34:47 +0100
diff --git a/debian/control b/debian/control
index cee5828..27c8c63 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11proto-core
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
automake,
commit 84a86fa8b608e0252cd82215e56b1a635aff4e5e
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 16 16:48:59 2010 +0000
Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson!
diff --git a/debian/changelog b/debian/changelog
index 7812f25..e9d22a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
x11proto-core (7.0.16-2) UNRELEASED; urgency=low
* Get rid of the x-dev transitional package.
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
-- Julien Cristau <jcristau@debian.org> Sat, 21 Nov 2009 10:34:47 +0100
diff --git a/debian/rules b/debian/rules
index 84bc68b..aedb95a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,12 +38,12 @@ configure:
build: build-stamp
build-stamp: configure
dh_testdir
- mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
- cd obj-$(DEB_BUILD_GNU_TYPE) && \
+ mkdir -p build
+ cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --disable-shared \
$(confflags) CFLAGS="$(CFLAGS)"
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
>$@
clean:
@@ -55,7 +55,7 @@ clean:
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
- rm -rf obj-*
+ rm -rf build
rm -f aclocal.m4 config.guess config.sub configure
rm -f do-not-use-config.h.in install-sh missing mkinstalldirs
rm -f $$(find -name Makefile.in)
@@ -68,7 +68,7 @@ install: build
dh_clean -k
dh_installdirs
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-independent files here.
binary-indep: build install
commit bf25d06799da98c3df655d8a734fe98c98bf143e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 15 13:31:40 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/COPYING b/COPYING
index 1724bb2..e514d36 100644
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,24 @@
+Copyright © 1991 Sun Microsystems, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
Copyright 1987, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/Sunkeysym.h b/Sunkeysym.h
index be1b21d..87e7f11 100644
--- a/Sunkeysym.h
+++ b/Sunkeysym.h
@@ -1,3 +1,25 @@
+/*
+ * Copyright © 1991 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
/************************************************************
Copyright 1991, 1998 The Open Group
@@ -22,32 +44,6 @@ 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 1991 by Sun Microsystems, Inc. Mountain View, CA.
-
- All Rights Reserved
-
-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 no-
-tice appear in all copies and that both that copyright no-
-tice and this permission notice appear in supporting docu-
-mentation, and that the name of Sun not be used in
-advertising or publicity pertaining to distribution of the
-software without specific prior written permission. Sun
-makes no representations about the suitability of this
-software for any purpose. It is provided "as is" without any
-express or implied warranty.
-
-SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT-
-NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE LI-
-ABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
***********************************************************/
/*
commit d02f4b124489016f43478ac2ca2fbb2d0253ba02
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Oct 13 16:51:14 2009 -0500
xproto: Cygwin GCC does not support visibility attributes
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/Xfuncproto.h.in b/Xfuncproto.h.in
index 0843491..afdd95b 100644
--- a/Xfuncproto.h.in
+++ b/Xfuncproto.h.in
@@ -83,7 +83,7 @@ in this Software without prior written authorization from The Open Group.
# define _X_ATTRIBUTE_PRINTF(x,y)
#endif /* GNUC >= 4 */
-#if defined(__GNUC__) && (__GNUC__ >= 4)
+#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__)
# define _X_EXPORT __attribute__((visibility("default")))
# define _X_HIDDEN __attribute__((visibility("hidden")))
# define _X_INTERNAL __attribute__((visibility("internal")))
commit ec13f2cc5af936aafc3a483f441c44aa5ed14fe3
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 22 19:24:48 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
diff --git a/Makefile.am b/Makefile.am
index eb7090b..98263f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,8 @@ pkgconfig_DATA = xproto.pc
EXTRA_DIST = xproto.pc.in
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
.PHONY: ChangeLog INSTALL
INSTALL:
commit 14463afe7460e66b62e83e936c63af3f6d329868
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Nov 21 10:35:31 2009 +0100
Get rid of the x-dev transitional package.
diff --git a/debian/changelog b/debian/changelog
index 02b4c8e..7812f25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-core (7.0.16-2) UNRELEASED; urgency=low
+
+ * Get rid of the x-dev transitional package.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 21 Nov 2009 10:34:47 +0100
+
x11proto-core (7.0.16-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 9f95226..cee5828 100644
--- a/debian/control
+++ b/debian/control
@@ -19,21 +19,9 @@ Description: X11 core wire protocol and auxiliary headers
for the core X11 protocol, and also provides a number of utility headers,
used to abstract OS-specific functions.
.
- This package deprecates 'x-dev', a package from the monolithic builds of
- XFree86 and X.Org.
- .
More information about X.Org can be found at:
<URL:http://www.X.org>
<URL:http://xorg.freedesktop.org>
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
.
This package is built from the X.org xproto proto module.
-
-Package: x-dev
-Section: libdevel
-Architecture: all
-Depends: x11proto-core-dev
-Description: dummy package for transition purposes
- This package is a dummy package for transition purposes, and only exists to
- depend on x11proto-core-dev. You may safely remove it if it will not
- remove other packages.
commit e4170d1d5b52ad84d25e26c7d00392ca96c93c51
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Nov 20 19:19:33 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index ffee2f1..02b4c8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-core (7.0.16-1) UNRELEASED; urgency=low
+x11proto-core (7.0.16-1) unstable; urgency=low
[ Julien Cristau ]
* Make build-dep on xutils-dev versioned (closes: #521230). Lenny's version
@@ -10,7 +10,7 @@ x11proto-core (7.0.16-1) UNRELEASED; urgency=low
was needed for upgrades from sarge.
* Bump Standards-Version to 3.8.3.
- -- Julien Cristau <jcristau@debian.org> Wed, 10 Jun 2009 22:53:41 +0200
+ -- Julien Cristau <jcristau@debian.org> Fri, 20 Nov 2009 19:18:21 +0100
x11proto-core (7.0.15-1) unstable; urgency=low
commit cfac284ac26d3f419ec26afcad6e8939a3ccff77
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Nov 20 17:03:05 2009 +0200
Update the ChangeLog.
diff --git a/ChangeLog b/ChangeLog
index 4c217aa..eb1bd67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,139 @@
+commit 4253e208088d166a8666f673360ef69a3c86f8b0
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Sep 23 17:04:09 2009 -0700
+
+ xproto 7.0.16
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 05914c82696432126a72845dd061c7f5e24963c5
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Sep 23 17:00:18 2009 -0700
+
+ Don't need an #ifdef when both cases just include the same file
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit ef37625372546efb32cdb37823b9927cf16b0840
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Wed Jun 17 15:28:54 2009 +0100
+
+ Restore macro definition of sleep(), needed by Xming
+
+ Removed in error by commit 1defe6b37c23941fe2a67ad4fa66e8ab5f37f9b3
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+
+commit e9df99b12ef9fefdbc1c05ff51bddffe723051e9
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sun Jun 14 09:54:58 2009 -0700
+
+ Drop #ifdef USG checks for some truly ancient (pre-SVR4) SysV's
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 385c1343f7e0782b89e40fa17e378bc1f75ce62e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sun Jun 14 09:43:53 2009 -0700
+
+ Get rid of unneeded && clause in list of LP64 ifdefs in Xmd.h
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 5aaec3c7a583354a07ec765327fd0edd6216981f
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sun Jun 14 09:33:16 2009 -0700
+
+ Drop support for SunOS 4 and Solaris releases older than 2.5 (1995)
+
+ Includes changing remaining sun ifdef's to check for standard-conformant /
+ non-namespace-polluting #ifdef __sun instead of older #ifdef sun.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 5bad478221c54c0dbf682ef2569f6ca5ac050049
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sun Jun 14 09:10:06 2009 -0700
+
+ Use indentation to provide a map through the twisty maze of ifdefs, all alike
+
+ git diff -w shows no changes other than whitespace in this patch
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 1f59b5f8eac522bb0a5155393224496c39deca42
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sun Jun 14 08:31:13 2009 -0700
+
+ Removing dangling #else block from X_NOT_STDC_ENV removal
+
+ Fixes mass damage caused by ced38e880b54f2aae31a5354aecb4235a129f0a4
+ moving the includes for unistd.h, fcntl.h, etc. from the else for
+ X_NOT_STDC_ENV into the #else for #ifndef _XOS_H_, which made them
+ go away for everyone.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 4435ea3d806f5b9cd66b563a6b751ac5020404e3
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Jun 12 12:41:57 2009 -0400
+
+ Use ## catenation not /**/
+
+commit 74d18e89a3a315ae9ee4fb3efcaf515abd339b1d
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Jun 12 12:39:06 2009 -0400
+
+ __STDC__ is always defined in C89.
+
+commit bab9c572cd4dc916ff0acab99de8bb526212d77f
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Jun 12 12:33:22 2009 -0400
+
+ Remove a bunch of garbage for unsupported platforms.
+
+commit ced38e880b54f2aae31a5354aecb4235a129f0a4
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Jun 12 11:55:37 2009 -0400
+
+ Remove all trace of X_NOT_STDC_ENV (#6527)
+
+ Seriously C89 already you guys.
+
+commit 3fc87608d4b3f85d0dbd44ee9040d5ab60130bea
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Jun 12 11:43:45 2009 -0400
+
+ Death to RCS tags.
+
+commit a2a0f01d367050ca182927b8219deb581a497c2c
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Tue Jun 9 00:47:25 2009 -0700
+
+ Apple: Only define _DARWIN_C_SOURCE if it isn't already defined
+
+commit 1defe6b37c23941fe2a67ad4fa66e8ab5f37f9b3
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Fri Jun 5 18:04:58 2009 +0100
+
+ Cygwin/X: Don't destroy min/max macros in Xwindows.h
+
+ Now that macros named min/max rather than MIN/MAX are used consistently in the
+ X server, we need to ensure they work for Xwin builds. Change Xwindows.h from
+ simply destroying any definition of min/max, to avoiding defining them but
+ allowing any pre-existing definition to stand.
+
+ Also, try to improve the comment describing why this madness is needed in the
+ first place, and remove a no-longer needed macro definition of sleep()
+
+commit 32d14e349964c5b16e83eda902d9724aac380b59
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Mar 5 15:12:26 2009 -0800
+
+ Remove #ifdef macII code left over from ancient A/UX 3.0 support
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
commit 034319189648eaaa483f9546c62451edb7be0c28
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Mar 2 12:54:41 2009 -0500
commit af818b14f4551d9728dff81911cb51a599046465
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Nov 20 16:35:50 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 08d5941..ffee2f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ x11proto-core (7.0.16-1) UNRELEASED; urgency=low
* New upstream release 7.0.16.
* Drop Conflicts/Replaces on x-dev and Pre-Depends on x11-common. This
was needed for upgrades from sarge.
+ * Bump Standards-Version to 3.8.3.
-- Julien Cristau <jcristau@debian.org> Wed, 10 Jun 2009 22:53:41 +0200
diff --git a/debian/control b/debian/control
index e5a645e..9f95226 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 5.0.0),
automake,
xutils-dev (>= 1:7.4+4)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-core
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-core.git
commit feb9b95c919328d0f17cb770fff61afe2a84d736
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Nov 20 16:34:02 2009 +0200
Drop Conflicts/Replaces on x-dev and Pre-Depends on x11-common. This was needed for upgrades from sarge.
diff --git a/debian/changelog b/debian/changelog
index 5dfcde8..08d5941 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ x11proto-core (7.0.16-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* New upstream release 7.0.16.
+ * Drop Conflicts/Replaces on x-dev and Pre-Depends on x11-common. This
+ was needed for upgrades from sarge.
-- Julien Cristau <jcristau@debian.org> Wed, 10 Jun 2009 22:53:41 +0200
diff --git a/debian/control b/debian/control
index 6a4e95a..e5a645e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-core.git
Package: x11proto-core-dev
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: x-dev (<< 6.8.99.7-1)
-Replaces: x-dev (<< 6.8.99.7-1)
-Pre-Depends: x11-common (>= 1:7.0.0)
Description: X11 core wire protocol and auxiliary headers
This package provides development headers describing the wire protocol
for the core X11 protocol, and also provides a number of utility headers,
commit 19f621b491f96c13c00e46bafc1c3671289c4cce
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Nov 20 15:00:05 2009 +0200
Update the changelog
diff --git a/debian/changelog b/debian/changelog
index f8234a2..5dfcde8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-x11proto-core (7.0.15-2) UNRELEASED; urgency=low
+x11proto-core (7.0.16-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Make build-dep on xutils-dev versioned (closes: #521230). Lenny's version
is too old. Thanks, Alexander Wuerstlein!
+ [ Timo Aaltonen ]
+ * New upstream release 7.0.16.
+
-- Julien Cristau <jcristau@debian.org> Wed, 10 Jun 2009 22:53:41 +0200
x11proto-core (7.0.15-1) unstable; urgency=low
commit 45135e80f1e1f8818159f7d80372a77df0537738
Author: Gaetan Nadon <memsize@videotron.ca>
Reply to: