x11proto-core: Changes to 'debian-unstable'
ChangeLog | 42 ++++++++++++++++++++++++++++++++++++++++
Xfuncproto.h.in | 3 ++
Xfuncs.h | 2 -
Xos.h | 2 -
Xpoll.h.in | 13 ++++++++++--
configure.ac | 2 -
debian/changelog | 10 +++++++++
debian/compat | 2 -
debian/control | 8 +++----
debian/rules | 1
debian/upstream/signing-key.asc | 41 +++++++++++++++++++++++++++++++++++++++
11 files changed, 116 insertions(+), 10 deletions(-)
New commits:
commit 838c4296d09698e2ae30184c6a1fc25d90d7d5a5
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 19:22:22 2015 +0000
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index 6bed56c..9692086 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-x11proto-core (7.0.28-1) UNRELEASED; urgency=medium
+x11proto-core (7.0.28-1) experimental; urgency=medium
+ * Team upload.
* New upstream release.
* Bump Standards-Version to 3.9.6, update Vcs-* control fields.
* Bump debhelper compat level to 9, keep libdir pointed at /usr/lib to avoid
arch-specific paths in our pkg-config file.
- -- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 19:16:32 +0000
+ -- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 19:22:11 +0000
x11proto-core (7.0.27-1) unstable; urgency=medium
commit 423bd4a73c061d0cefc432b2bd6cf23f6a5fabf0
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 19:22:05 2015 +0000
Bump debhelper compat level to 9
Keep libdir pointed at /usr/lib to avoid arch-specific paths in our pkg-config file.
diff --git a/debian/changelog b/debian/changelog
index 8248e45..6bed56c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ x11proto-core (7.0.28-1) UNRELEASED; urgency=medium
* New upstream release.
* Bump Standards-Version to 3.9.6, update Vcs-* control fields.
+ * Bump debhelper compat level to 9, keep libdir pointed at /usr/lib to avoid
+ arch-specific paths in our pkg-config file.
-- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 19:16:32 +0000
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index b887a5b..e2f985d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 9),
dh-autoreconf,
quilt,
xutils-dev (>= 1:7.6+2),
diff --git a/debian/rules b/debian/rules
index f8432b9..adfdf77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@ PACKAGE = x11proto-core-dev
override_dh_auto_configure:
dh_auto_configure -- \
--docdir=\$${prefix}/share/doc/$(PACKAGE) \
+ --libdir=\$${prefix}/lib \
--with-xmlto --with-fop
# Install in debian/tmp to retain control through dh_install:
commit 553458f93480c035aac95e14606365483273404a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 19:20:48 2015 +0000
Bump Standards-Version to 3.9.6, update Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index aa7bae3..8248e45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
x11proto-core (7.0.28-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Bump Standards-Version to 3.9.6, update Vcs-* control fields.
-- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 19:16:32 +0000
diff --git a/debian/control b/debian/control
index 952bad4..b887a5b 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,9 @@ Build-Depends:
w3m,
xsltproc,
fop,
-Standards-Version: 3.9.2
-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
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/git/pkg-xorg/proto/x11proto-core
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/proto/x11proto-core.git
Package: x11proto-core-dev
Architecture: all
commit c9e11bd1252450cff7ac6242fa8886e84db49d86
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 19:17:02 2015 +0000
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 191a529..74489a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+commit d5524e2b8d811aa03ed19c6e8fb2ee4162ca2b23
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Jul 1 11:35:13 2015 -0400
+
+ xproto 7.0.28
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 2c94cdb453bc641246cc8b9a876da9799bee1ce7
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Fri May 29 18:16:34 2015 +0200
+
+ Increase the number of file descriptors
+
+ To allow up to 512 clients, the number of file descriptors being
+ monitored need to be increased accordingly.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 2dc2c38fb530c717b1944c93a889e4deff61b7f9
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Mon May 25 04:30:29 2015 -0700
+
+ darwin: Include strings.h
+
+ https://trac.macports.org/ticket/47813
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 70cf8acf06705097b009a488994b526832b0ef66
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Sun Jan 11 00:39:14 2015 +0100
+
+ Use C99 compliant definition of nonnull attribute.
+
+ Fixes warning with clang.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
commit 303b137a55bb2d092b008439570a323c89a41d70
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Dec 30 21:15:09 2014 -0800
diff --git a/debian/changelog b/debian/changelog
index a448e4c..aa7bae3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-core (7.0.28-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 19:16:32 +0000
+
x11proto-core (7.0.27-1) unstable; urgency=medium
* Let uscan verify tarball signatures.
commit 55f1ffc6cd4a953a722ad3fb1f5724077972deab
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 19:14:35 2015 +0000
Add ajax's key to d/upstream/signing-key.asc
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 863981f..c1ef011 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -58,3 +58,44 @@ n4u1yrMJfpnSblPMu5wJi3kjoA+Dd5ZFqx9nTi4wBjfVYGCPsleq59K8kQCYx1Cn
lZcq630ITy9dB/aHCQry2gCbBwZ2Rsf9kr05S8uLhlwW3vRSvRs=
=tc6G
-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQGiBEDLnMIRBACNlsJkPRfH7RMOn7nirvYN5StKVvwdJa2MFUM3sjoaA11nW+Zw
+Yxion4GkbIOtz25R29TcwuAaK1UWhy1Rz6aIOOMOzBeUNGGCvRXF76rKHBHOdSJw
+AXEvNa/9rKOIaPL7PBN7Lb4CmrjEbA9gKYtZQD9qQSKcAwyyxszkW1e7TwCg7MbV
+Bq5MWlATjOAzXLoSpgyENwMD/jPz53KmwUobbqri2pFhozacl5N93cy7b3pwpTZY
+fM50cXVSSshYpqdCr5AoWG/DXNGRixv1DnBKOI2Cv6YAQLntcATHxR8ssemOZHRv
+7D0hvWwC3o6GSKdg0rSOtRHfDhEL4IFVmPLZaXIRDZ0/ancrCuQPdZ9mzCi/LQmV
+noTeA/kB73zJMYH7Z0TSKv490AMWQHbKVvos8+tXxATlq0Otib+s55LXQocSPjgp
+GR5qKzqTn9elg2dyo4GYeAYvGBmhQtBdeYo1rVq2pC6HCzMG79zozL9O25SnDLpj
+WoqJB6qHBAd9tlTHzkRxv1Fqr4jfIupNborXbhR25tiYOm72irQcQWRhbSBKYWNr
+c29uIDxhamF4QG53bmsubmV0PohhBBMRAgAhAhsDBgsJCAcDAgMVAgMDFgIBAh4B
+AheABQJEZNYGAhkBAAoJEFuKLVCg7NDTlj8AoL9RgTs++HaD5w5lYARcE+OB+0Jg
+AKDZBhJhVgOsEjeg7atMglFR7s36mrQeQWRhbSBKYWNrc29uIDxhamF4QHJlZGhh
+dC5jb20+iGAEExECACAFAkfENSICGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK
+CRBbii1QoOzQ0x6CAJ0fevUkaaBcTzKa0lTgfNFQ0E+JwgCfaWy44eNKttn4WWEZ
+CTGF+e+zraS0IEFkYW0gSmFja3NvbiA8YWpheEBlbmdyLnNnaS5jb20+iF4EExEC
+AB4FAkHB1gECGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQW4otUKDs0NNTOgCg
+lu1MOCbysvn68WReXz+v02+y2VkAoL12gktA0TFZnPBk3cweEAwCkUlXtCZBZGFt
+IEphY2tzb24gPGFqYXhAd2lsZG9wZW5zb3VyY2UuY29tPoheBBMRAgAeBQJBriSn
+AhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEFuKLVCg7NDTOe4AnRUJ6FqQLaoY
+XWCToQdl/Gry4UNZAJ97YYHMt1FIo1TLCWWozSiG+VtTq7QnQWRhbSBKYWNrc29u
+IDxhamF4QGJlbnplZHJpbmUubnduay5uZXQ+iF4EExECAB4FAkRk1eACGwMGCwkI
+BwMCAxUCAwMWAgECHgECF4AACgkQW4otUKDs0NN+fwCg2cPLDbAb07gMWBETKTRm
+sj34FsAAn0SQ4kuqs9Ms0ZRKDqNQ1YTMwyEHuQINBEDLnNAQCACrbu13VZsigsM6
+8MzfdGQ4x/acO4Vd+Dg/aFj3EhPfXZHRauuJ7gQtWc9Mk2ghTjbqEXj0JILbif95
+IyShdC/fxEYiFybRODR6FHlXj6BFCxZFfqi4mOuaGQ4BeB57g/gW+FSoIPzYU4IY
+85KD62qeS37zQEBAAK+mCEboUGfPT0wHrkFtkTObjOg7UTjpBp5/HknUREYo8mLo
+WBv7CDlApicmXoqnKfAcFaNY2YLMjklwFHh2i2+6dPbkdWSEpuZhkxIQ/8JlYS6A
+2g5DMKcNdmqr4Z6xjk8Fj1SO7ILc9EtR+ACqkqkmlU3m4AUHjdR/4kk7tEJ5DytP
+c95JcuJnAAMFB/9KWUqJbdeHs47LJBksZ6tnHArcSG653e9uejtNt5xquJIz2wxb
+exMV9Bkzwu9v/A8Vo7px7Bkhh++sBrgpGD4z5Jr+PaWOsw5qrO9OVVgzXkUf2QoD
+gw4Hh8m9jpx1s6tNasPsy12OGMJ4a5a1GCGg8F7sPlWLBd491viavDyOWYkKozLH
+hXwKlGOec0sCRGeHTiqPinxs29PXaTE7Dl/f2dYgiNzTSWetSx7Sv1H9EX4qxPgc
+smdRuGV7k7dIw/J02rcI/Ol4OUORRMY2cgJnb5mNxIxTgTGJysm+MjfPrZnOeDVK
+TroAYtas/uirqiNzk7fdIdUdgbOhsAl9n3QZiEYEGBECAAYFAkDLnNAACgkQW4ot
+UKDs0NP3CACfS1DKwgN/rB7Ib+RJiuK0F/BQoEYAoOhr0VXCT5dP0Yr1kIad7njC
+GBF1
+=bYOv
+-----END PGP PUBLIC KEY BLOCK-----
commit d5524e2b8d811aa03ed19c6e8fb2ee4162ca2b23
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 1 11:35:13 2015 -0400
xproto 7.0.28
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/configure.ac b/configure.ac
index 1709862..562b5a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([Xproto], [7.0.27],
+AC_INIT([Xproto], [7.0.28],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 2c94cdb453bc641246cc8b9a876da9799bee1ce7
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri May 29 18:16:34 2015 +0200
Increase the number of file descriptors
To allow up to 512 clients, the number of file descriptors being
monitored need to be increased accordingly.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/Xpoll.h.in b/Xpoll.h.in
index 0a05424..01be164 100644
--- a/Xpoll.h.in
+++ b/Xpoll.h.in
@@ -67,7 +67,7 @@ typedef long fd_mask;
# endif
#endif
-#define XFD_SETSIZE 256
+#define XFD_SETSIZE 512
#ifndef FD_SETSIZE
#define FD_SETSIZE XFD_SETSIZE
@@ -127,7 +127,16 @@ typedef struct fd_set {
(howmany(FD_SETSIZE, NFDBITS) > 4 && (__XFDS_BITS(p, 4))) || \
(howmany(FD_SETSIZE, NFDBITS) > 5 && (__XFDS_BITS(p, 5))) || \
(howmany(FD_SETSIZE, NFDBITS) > 6 && (__XFDS_BITS(p, 6))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 7 && (__XFDS_BITS(p, 7))))
+ (howmany(FD_SETSIZE, NFDBITS) > 7 && (__XFDS_BITS(p, 7))) || \
+ (howmany(FD_SETSIZE, NFDBITS) > 8 && (__XFDS_BITS(p, 8))) || \
+ (howmany(FD_SETSIZE, NFDBITS) > 9 && (__XFDS_BITS(p, 9))) || \
+ (howmany(FD_SETSIZE, NFDBITS) > 10 && (__XFDS_BITS(p, 10))) || \
+ (howmany(FD_SETSIZE, NFDBITS) > 11 && (__XFDS_BITS(p, 11))) || \
+ (howmany(FD_SETSIZE, NFDBITS) > 12 && (__XFDS_BITS(p, 12))) || \
+ (howmany(FD_SETSIZE, NFDBITS) > 13 && (__XFDS_BITS(p, 13))) || \
+ (howmany(FD_SETSIZE, NFDBITS) > 14 && (__XFDS_BITS(p, 14))) || \
+ (howmany(FD_SETSIZE, NFDBITS) > 15 && (__XFDS_BITS(p, 15))))
+
#define XFD_COPYSET(src,dst) { \
int __i__; \
commit 2dc2c38fb530c717b1944c93a889e4deff61b7f9
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon May 25 04:30:29 2015 -0700
darwin: Include strings.h
https://trac.macports.org/ticket/47813
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
diff --git a/Xfuncs.h b/Xfuncs.h
index 469bb48..b7c4029 100644
--- a/Xfuncs.h
+++ b/Xfuncs.h
@@ -44,7 +44,7 @@ void bcopy();
# define bcmp(b1,b2,len) memcmp(b1, b2, len)
# else
# include <string.h>
-# if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__) || defined(__CYGWIN__) || defined(_AIX)
+# if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__) || defined(__CYGWIN__) || defined(_AIX) || defined(__APPLE__)
# include <strings.h>
# endif
# define _XFUNCS_H_INCLUDED_STRING_H
diff --git a/Xos.h b/Xos.h
index 7e53946..28dfc67 100644
--- a/Xos.h
+++ b/Xos.h
@@ -60,7 +60,7 @@ in this Software without prior written authorization from The Open Group.
*/
# include <string.h>
-# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) || defined(__CYGWIN__) || defined(_AIX)
+# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) || defined(__CYGWIN__) || defined(_AIX) || defined(__APPLE__)
# include <strings.h>
# else
# ifndef index
commit 70cf8acf06705097b009a488994b526832b0ef66
Author: Thomas Klausner <wiz@NetBSD.org>
Date: Sun Jan 11 00:39:14 2015 +0100
Use C99 compliant definition of nonnull attribute.
Fixes warning with clang.
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/Xfuncproto.h.in b/Xfuncproto.h.in
index e9e5e71..5daa83e 100644
--- a/Xfuncproto.h.in
+++ b/Xfuncproto.h.in
@@ -152,6 +152,9 @@ in this Software without prior written authorization from The Open Group.
argument macros, must be only used inside #ifdef _X_NONNULL guards, as
many legacy X clients are compiled in C89 mode still. */
#if __has_attribute(nonnull) \
+ && defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */
+#define _X_NONNULL(...) __attribute__((nonnull(__VA_ARGS__)))
+#elif __has_attribute(nonnull) \
|| defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
#define _X_NONNULL(args...) __attribute__((nonnull(args)))
#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */
Reply to: