ChangeLog | 25 +++++++++
configure.ac | 10 ---
debian/changelog | 13 +++++
debian/control | 33 +-----------
debian/rules | 2
debian/upstream/signing-key.asc | 102 ++++++++++++++++++++++++++++++++++++++++
debian/watch | 1
src/Xfixesint.h | 14 -----
8 files changed, 148 insertions(+), 52 deletions(-)
New commits:
commit b6d0703355a8bf12410f321619c512f6f16b3306
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 26 21:10:40 2016 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index e430fd5..7f470c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-libxfixes (1:5.0.2-1) UNRELEASED; urgency=medium
+libxfixes (1:5.0.2-1) sid; urgency=medium
+ * Team upload.
* New upstream release.
* Let uscan verify tarball signatures.
* Bump libx11-dev build-dep to 2:1.6 per configure.ac.
@@ -8,7 +9,7 @@ libxfixes (1:5.0.2-1) UNRELEASED; urgency=medium
* Bump Standards-Version to 3.9.8.
* Migrate to automatic dbgsym package.
- -- Julien Cristau <jcris...@debian.org> Sun, 26 Jun 2016 20:59:51 +0200
+ -- Julien Cristau <jcris...@debian.org> Sun, 26 Jun 2016 21:10:20 +0200
libxfixes (1:5.0.1-2) sid; urgency=low
commit 65824300c7a024ccda10817b4096a8aae748e06d
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 26 21:08:16 2016 +0200
Migrate to automatic dbgsym package.
diff --git a/debian/changelog b/debian/changelog
index 3df6b55..e430fd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libxfixes (1:5.0.2-1) UNRELEASED; urgency=medium
* Remove Drew and Cyril from Uploaders.
* Use https for Vcs-* control fields.
* Bump Standards-Version to 3.9.8.
+ * Migrate to automatic dbgsym package.
-- Julien Cristau <jcris...@debian.org> Sun, 26 Jun 2016 20:59:51 +0200
diff --git a/debian/control b/debian/control
index bbd5a4d..5488e2f 100644
--- a/debian/control
+++ b/debian/control
@@ -44,30 +44,6 @@ Depends:
Description: X11 miscellaneous 'fixes' extension library
This is a udeb, or a microdeb, for the debian-installer.
-Package: libxfixes3-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
- libxfixes3 (= ${binary:Version}),
-Multi-Arch: same
-Description: X11 miscellaneous 'fixes' extension library (debug package)
- libXfixes provides an X Window System client interface to the 'XFIXES'
- extension to the X protocol.
- .
- It provides support for Region types, and some cursor functions.
- .
- This package contains the debug versions of the library found in libxfixes3.
- Non-developers likely have little use for this package.
- .
- More information about X.Org can be found at:
- <URL:http://www.X.org>
- .
- This module can be found at
- git://anongit.freedesktop.org/git/xorg/lib/libXfixes
-
Package: libxfixes-dev
Section: libdevel
Architecture: any
diff --git a/debian/rules b/debian/rules
index 722a362..77956d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ override_dh_install:
# Debug package:
override_dh_strip:
- dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
+ dh_strip -p$(PACKAGE) --dbgsym-migration='$(PACKAGE)-dbg (<< 1:5.0.2)'
dh_strip -N$(PACKAGE)
# Shlibs:
commit 08c397dd0d92690aeebe119d6b0e1899b80d849a
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 26 21:05:59 2016 +0200
Bump Standards-Version to 3.9.8.
diff --git a/debian/changelog b/debian/changelog
index 80e3135..3df6b55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxfixes (1:5.0.2-1) UNRELEASED; urgency=medium
* Bump libx11-dev build-dep to 2:1.6 per configure.ac.
* Remove Drew and Cyril from Uploaders.
* Use https for Vcs-* control fields.
+ * Bump Standards-Version to 3.9.8.
-- Julien Cristau <jcris...@debian.org> Sun, 26 Jun 2016 20:59:51 +0200
diff --git a/debian/control b/debian/control
index c9ad9b2..bbd5a4d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
pkg-config,
quilt,
xutils-dev (>= 1:7.5+4),
-Standards-Version: 3.9.2
+Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-xorglib/libxfixes.git
Vcs-Browser: https://anonscm.debian.org/git/lib/libxfixes.git
commit 983391cc68f8cc8ee2465bd510ed5c3ce6f561c5
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 26 21:02:03 2016 +0200
Use https for Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index 67ad745..80e3135 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxfixes (1:5.0.2-1) UNRELEASED; urgency=medium
* Let uscan verify tarball signatures.
* Bump libx11-dev build-dep to 2:1.6 per configure.ac.
* Remove Drew and Cyril from Uploaders.
+ * Use https for Vcs-* control fields.
-- Julien Cristau <jcris...@debian.org> Sun, 26 Jun 2016 20:59:51 +0200
diff --git a/debian/control b/debian/control
index b90df51..c9ad9b2 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Build-Depends:
quilt,
xutils-dev (>= 1:7.5+4),
Standards-Version: 3.9.2
-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxfixes
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxfixes.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-xorglib/libxfixes.git
+Vcs-Browser: https://anonscm.debian.org/git/lib/libxfixes.git
Package: libxfixes3
Section: libs
commit 14ec54cef2f66c901ce430596348b851b5d59ab8
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 26 21:01:17 2016 +0200
Remove Drew and Cyril from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index e2c39d1..67ad745 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxfixes (1:5.0.2-1) UNRELEASED; urgency=medium
* New upstream release.
* Let uscan verify tarball signatures.
* Bump libx11-dev build-dep to 2:1.6 per configure.ac.
+ * Remove Drew and Cyril from Uploaders.
-- Julien Cristau <jcris...@debian.org> Sun, 26 Jun 2016 20:59:51 +0200
diff --git a/debian/control b/debian/control
index a3a48b1..b90df51 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: libxfixes
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Drew Parsons <dpars...@debian.org>, Cyril Brulebois
<k...@debian.org>
Build-Depends:
debhelper (>= 9),
dh-autoreconf,
commit 5cc7436c7b4b5fea23f13cfee21a68c1530bda76
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 26 21:01:00 2016 +0200
Bump libx11-dev build-dep to 2:1.6 per configure.ac.
diff --git a/debian/changelog b/debian/changelog
index 6750732..e2c39d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxfixes (1:5.0.2-1) UNRELEASED; urgency=medium
* New upstream release.
* Let uscan verify tarball signatures.
+ * Bump libx11-dev build-dep to 2:1.6 per configure.ac.
-- Julien Cristau <jcris...@debian.org> Sun, 26 Jun 2016 20:59:51 +0200
diff --git a/debian/control b/debian/control
index 9988af7..a3a48b1 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Drew Parsons <dpars...@debian.org>, Cyril Brulebois
<k...@debian.org>
Build-Depends:
debhelper (>= 9),
dh-autoreconf,
- libx11-dev (>= 2:1.3.3-2),
+ libx11-dev (>= 2:1.6),
x11proto-fixes-dev (>= 1:5.0),
pkg-config,
quilt,
commit 006f9eba2492fd94106ca8146996392e3ba54686
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 26 21:00:35 2016 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index be6da06..cdffbb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+commit b2406ed9031991b7ddc5b76b308623afc8a590c5
+Author: Matt Turner <matts...@gmail.com>
+Date: Wed May 25 18:53:28 2016 -0700
+
+ libXfixes 5.0.2
+
+ Signed-off-by: Matt Turner <matts...@gmail.com>
+
+commit 1702cdfe45c9bdd7dacfc8f27a49f89fcd1d02c3
+Author: Michael Joost <m...@michael-joost.de>
+Date: Mon Nov 18 16:11:26 2013 +0100
+
+ Remove fallback for _XEatDataWords, require libX11 1.6 for it
+
+ _XEatDataWords was orignally introduced with the May 2013 security
+ patches, and in order to ease the process of delivering those,
+ fallback versions of _XEatDataWords were included in the X extension
+ library patches so they could be applied to older versions that didn't
+ have libX11 1.6 yet. Now that we're past that hurdle, we can drop
+ the fallbacks and just require libX11 1.6 for building new versions
+ of the extension libraries.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
commit 0cb446962381f750e05d97bfb974ca1e32481d5d
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Tue May 28 21:11:10 2013 -0700
diff --git a/debian/changelog b/debian/changelog
index 8486d76..6750732 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-libxfixes (1:5.0.1-3) UNRELEASED; urgency=medium
+libxfixes (1:5.0.2-1) UNRELEASED; urgency=medium
+ * New upstream release.
* Let uscan verify tarball signatures.
- -- Julien Cristau <jcris...@debian.org> Sun, 26 Jun 2016 20:58:53 +0200
+ -- Julien Cristau <jcris...@debian.org> Sun, 26 Jun 2016 20:59:51 +0200
libxfixes (1:5.0.1-2) sid; urgency=low
commit 8d707935c518bbeca14655debcc901a42a1d672b
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 26 20:59:13 2016 +0200
Let uscan verify tarball signatures.
diff --git a/debian/changelog b/debian/changelog
index 107a7d5..8486d76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxfixes (1:5.0.1-3) UNRELEASED; urgency=medium
+
+ * Let uscan verify tarball signatures.
+
+ -- Julien Cristau <jcris...@debian.org> Sun, 26 Jun 2016 20:58:53 +0200
+
libxfixes (1:5.0.1-2) sid; urgency=low
* Mark libxfixes-dev as Multi-arch: same (closes: #677657).
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..3904961
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,102 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+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
++v0snqqnIoZLjsQ=
+=7XLO
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index c7b33e8..c714ef7 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/lib/libXfixes
version=3
+opts=pgpsigurlmangle=s/$/.sig/ \
http://xorg.freedesktop.org/releases/individual/lib/ libXfixes-(.*)\.tar\.gz
commit b2406ed9031991b7ddc5b76b308623afc8a590c5
Author: Matt Turner <matts...@gmail.com>
Date: Wed May 25 18:53:28 2016 -0700
libXfixes 5.0.2
Signed-off-by: Matt Turner <matts...@gmail.com>
diff --git a/configure.ac b/configure.ac
index 2a59af8..a9052cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AC_PREREQ([2.60])
# that 'revision' number appears in Xfixes.h and has to be manually
# synchronized.
#
-AC_INIT(libXfixes, [5.0.1],
+AC_INIT(libXfixes, [5.0.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXfixes])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit 1702cdfe45c9bdd7dacfc8f27a49f89fcd1d02c3
Author: Michael Joost <m...@michael-joost.de>
Date: Mon Nov 18 16:11:26 2013 +0100
Remove fallback for _XEatDataWords, require libX11 1.6 for it
_XEatDataWords was orignally introduced with the May 2013 security
patches, and in order to ease the process of delivering those,
fallback versions of _XEatDataWords were included in the X extension
library patches so they could be applied to older versions that didn't
have libX11 1.6 yet. Now that we're past that hurdle, we can drop
the fallbacks and just require libX11 1.6 for building new versions
of the extension libraries.
Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/configure.ac b/configure.ac
index f85bd72..2a59af8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,13 +55,7 @@ FIXESEXT_VERSION=[`echo $VERSION | sed
's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
AC_SUBST(FIXESEXT_VERSION)
# Obtain compiler/linker options for depedencies
-PKG_CHECK_MODULES(FIXESEXT, xproto [fixesproto >= $FIXESEXT_VERSION] xextproto
x11)
-
-# Check for _XEatDataWords function that may be patched into older Xlib
releases
-SAVE_LIBS="$LIBS"
-LIBS="$FIXESEXT_LIBS"
-AC_CHECK_FUNCS([_XEatDataWords])
-LIBS="$SAVE_LIBS"
+PKG_CHECK_MODULES(FIXESEXT, xproto [fixesproto >= $FIXESEXT_VERSION] xextproto
[x11 >= 1.6])
AC_CONFIG_FILES([Makefile
diff --git a/src/Xfixesint.h b/src/Xfixesint.h
index 7bf5bfd..8a4d5fd 100644
--- a/src/Xfixesint.h
+++ b/src/Xfixesint.h
@@ -60,18 +60,4 @@ XFixesFindDisplay (Display *dpy);
#define XFixesSimpleCheckExtension(dpy,i) \
if (!XFixesHasExtension(i)) { return; }
-#ifndef HAVE__XEATDATAWORDS
-#include <X11/Xmd.h> /* for LONG64 on 64-bit platforms */
-#include <limits.h>
-
-static inline void _XEatDataWords(Display *dpy, unsigned long n)
-{
-# ifndef LONG64
- if (n >= (ULONG_MAX >> 2))
- _XIOError(dpy);
-# endif
- _XEatData (dpy, n << 2);
-}
-#endif
-
#endif /* _XFIXESINT_H_ */
