ChangeLog | 52 ++++++++++++++++++++++++++++++++++++++++++ configure.ac | 6 ++-- debian/changelog | 27 +++++++++++++++++++++ debian/control | 4 +-- debian/libxi6.symbols | 4 ++- debian/rules | 2 - man/XSelectExtensionEvent.txt | 2 - src/XIAllowEvents.c | 23 +++++++++++------- src/XListDev.c | 27 +++++++++++++++------ 9 files changed, 121 insertions(+), 26 deletions(-)
New commits: commit 784b1fb88145278b0f97549f9e4f75fda46b0be3 Author: Chase Douglas <chase.doug...@canonical.com> Date: Fri Feb 10 23:19:39 2012 +0100 releasing version 2:1.5.99.3-0ubuntu1 diff --git a/debian/changelog b/debian/changelog index ee18a9e..77ef652 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libxi (2:1.5.99.3-0ubuntu1) UNRELEASED; urgency=low +libxi (2:1.5.99.3-0ubuntu1) precise; urgency=low * New upstream release candidate * Bump deps on x11proto-input-dev to 2.1.99.6 * Fix libxi6.symbols (delete errant XIUngrabTouchBegin from ubuntu version) - -- Chase Douglas <chase.doug...@ubuntu.com> Fri, 10 Feb 2012 23:18:23 +0100 + -- Chase Douglas <chase.doug...@ubuntu.com> Fri, 10 Feb 2012 23:19:36 +0100 libxi (2:1.5.99.2-1) experimental; urgency=low commit e6f0d0e9ba9ddee34914671579fe05731663e26c Author: Chase Douglas <chase.doug...@canonical.com> Date: Fri Feb 10 23:19:34 2012 +0100 Fix libxi6.symbols (delete errant XIUngrabTouchBegin from ubuntu version) diff --git a/debian/changelog b/debian/changelog index b02174b..ee18a9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ libxi (2:1.5.99.3-0ubuntu1) UNRELEASED; urgency=low * New upstream release candidate * Bump deps on x11proto-input-dev to 2.1.99.6 + * Fix libxi6.symbols (delete errant XIUngrabTouchBegin from ubuntu version) - -- Chase Douglas <chase.doug...@ubuntu.com> Fri, 10 Feb 2012 23:12:08 +0100 + -- Chase Douglas <chase.doug...@ubuntu.com> Fri, 10 Feb 2012 23:18:23 +0100 libxi (2:1.5.99.2-1) experimental; urgency=low diff --git a/debian/libxi6.symbols b/debian/libxi6.symbols index 0643a1d..535ce2f 100644 --- a/debian/libxi6.symbols +++ b/debian/libxi6.symbols @@ -77,7 +77,6 @@ libXi.so.6 libxi6 #MINVER# XUngrabDevice@Base 0 XUngrabDeviceButton@Base 0 XUngrabDeviceKey@Base 0 - XIUngrabTouchBegin@Base 2:1.4.1-1ubuntu1 _XiGetDevicePresenceNotifyEvent@Base 2:1.1.2 _xibadclass@Base 0 _xibaddevice@Base 0 commit 9e9f93216b12b98b7371bcd2676a96248ffdca59 Author: Chase Douglas <chase.doug...@canonical.com> Date: Fri Feb 10 23:12:29 2012 +0100 Bump deps on x11proto-input-dev to 2.1.99.6 diff --git a/debian/changelog b/debian/changelog index 31baf3d..b02174b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ libxi (2:1.5.99.3-0ubuntu1) UNRELEASED; urgency=low * New upstream release candidate + * Bump deps on x11proto-input-dev to 2.1.99.6 - -- Chase Douglas <chase.doug...@ubuntu.com> Fri, 10 Feb 2012 23:11:05 +0100 + -- Chase Douglas <chase.doug...@ubuntu.com> Fri, 10 Feb 2012 23:12:08 +0100 libxi (2:1.5.99.2-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 5226e40..92b65b7 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 8.1.3), x11proto-core-dev (>= 7.0.13), x11proto-xext-dev (>= 7.0.3), - x11proto-input-dev (>= 2.1.99.5), + x11proto-input-dev (>= 2.1.99.6), libx11-dev (>= 2:1.4.99.1), libxext-dev (>= 2:1.1.1-3), xmlto, @@ -87,7 +87,7 @@ Depends: libxi6 (= ${binary:Version}), libx11-dev, libxext-dev, - x11proto-input-dev (>= 2.1.99.4), + x11proto-input-dev (>= 2.1.99.6), xorg-sgml-doctools (>= 1:1.5), Replaces: x11proto-input-dev (<< 1.9.99) commit 54209d37873661d2aaf92deab9ddca702e201dc3 Author: Chase Douglas <chase.doug...@canonical.com> Date: Fri Feb 10 23:11:35 2012 +0100 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index 08ddaec..d05afbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,55 @@ +commit 34964b05c16161de65709d60799b9ad97ce56296 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Fri Jan 27 15:35:44 2012 +1000 + + libXi 1.5.99.3 + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit b355b7300235395717de06809ee6631ce55d3189 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Fri Jan 27 13:28:52 2012 +1000 + + Handle new XIAllowEvent request size + + inputproto 2.1.99.6 restored the previous request for ABI compatibility + reasons, and it introduced a new XI 2.2 specific define. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Keith Packard <kei...@keithp.com> + +commit 07ced7b48219e3bc0c98806f3d7106f86d1b2ca0 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Tue Jan 17 21:26:14 2012 +0100 + + Force class alignment to a multiple of sizeof(XID). + + Calculate length field to a multiples of sizeof(XID). XIDs are typedefs + to ulong and thus may be 8 bytes on some platforms. This can trigger a + SIGBUS if a class ends up not being 8-aligned (e.g. after XAxisInfo). + + Reported-by: Nicolai Stange <nicolai.sta...@zmaw.de> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Signed-off-by: Matthieu Herrb <matthieu.he...@laas.fr> + +commit 15feb92b30e13e7439a3434bea9f454645b97444 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Thu Jan 5 13:55:41 2012 +1000 + + man: fix typo Mappiing → Mapping + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 8576ae6b9ee974829e2fb8a834087652a6e9e1a2 +Author: Cyril Brulebois <k...@debian.org> +Date: Thu Dec 22 15:50:47 2011 +0100 + + configure.ac: Fix a typo in comments. + + Signed-off-by: Cyril Brulebois <k...@debian.org> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + commit ae0187c8708d2378373889827117911086581fdd Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Thu Dec 22 09:42:43 2011 +1000 diff --git a/debian/changelog b/debian/changelog index 3efd80f..31baf3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxi (2:1.5.99.3-0ubuntu1) UNRELEASED; urgency=low + + * New upstream release candidate + + -- Chase Douglas <chase.doug...@ubuntu.com> Fri, 10 Feb 2012 23:11:05 +0100 + libxi (2:1.5.99.2-1) experimental; urgency=low * New upstream release candidate: commit 34964b05c16161de65709d60799b9ad97ce56296 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Fri Jan 27 15:35:44 2012 +1000 libXi 1.5.99.3 Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/configure.ac b/configure.ac index 46f2fb8..77341da 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXi], [1.5.99.2], +AC_INIT([libXi], [1.5.99.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([src/config.h]) commit b355b7300235395717de06809ee6631ce55d3189 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Fri Jan 27 13:28:52 2012 +1000 Handle new XIAllowEvent request size inputproto 2.1.99.6 restored the previous request for ABI compatibility reasons, and it introduced a new XI 2.2 specific define. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Reviewed-by: Keith Packard <kei...@keithp.com> diff --git a/configure.ac b/configure.ac index 481cf44..46f2fb8 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ XORG_WITH_ASCIIDOC(8.4.5) XORG_CHECK_MALLOC_ZERO # Obtain compiler/linker options for dependencies -PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.4.99.1] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 2.1.99.3]) +PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.4.99.1] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 2.1.99.6]) # Check for xmlto and asciidoc for man page conversion # (only needed by people building tarballs) diff --git a/src/XIAllowEvents.c b/src/XIAllowEvents.c index d987549..c8d997a 100644 --- a/src/XIAllowEvents.c +++ b/src/XIAllowEvents.c @@ -33,13 +33,16 @@ #include <X11/extensions/extutil.h> #include "XIint.h" +/* for GetRequest() to work */ +#define X_XI2_2AllowEvents X_XIAllowEvents + static Status _XIAllowEvents(Display *dpy, int deviceid, int event_mode, Time time, unsigned int touchid, Window grab_window) { Bool have_XI22 = True; - int req_len = sz_xXIAllowEventsReq; /* in bytes */ xXIAllowEventsReq *req; + xXI2_2AllowEventsReq *req_XI22; XExtDisplayInfo *extinfo = XInput_find_display(dpy); @@ -47,13 +50,15 @@ _XIAllowEvents(Display *dpy, int deviceid, int event_mode, Time time, if (_XiCheckExtInit(dpy, XInput_2_0, extinfo) == -1) return (NoSuchExtension); - /* 2.2's XIAllowEvents is 8 bytes longer than 2.0 */ - if (_XiCheckExtInit(dpy, XInput_2_2, extinfo) == -1) { - req_len -= 8; - have_XI22 = False; - } + if (_XiCheckExtInit(dpy, XInput_2_2, extinfo) == 0) + have_XI22 = True; - GetReqSized(XIAllowEvents, req_len, req); + if (have_XI22) + { + GetReq(XI2_2AllowEvents, req_XI22); + req = (xXIAllowEventsReq*)req_XI22; + } else + GetReq(XIAllowEvents, req); req->reqType = extinfo->codes->major_opcode; req->ReqType = X_XIAllowEvents; @@ -62,8 +67,8 @@ _XIAllowEvents(Display *dpy, int deviceid, int event_mode, Time time, req->time = time; if (have_XI22) { - req->touchid = touchid; - req->grab_window = grab_window; + req_XI22->touchid = touchid; + req_XI22->grab_window = grab_window; } UnlockDisplay(dpy); commit 07ced7b48219e3bc0c98806f3d7106f86d1b2ca0 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Tue Jan 17 21:26:14 2012 +0100 Force class alignment to a multiple of sizeof(XID). Calculate length field to a multiples of sizeof(XID). XIDs are typedefs to ulong and thus may be 8 bytes on some platforms. This can trigger a SIGBUS if a class ends up not being 8-aligned (e.g. after XAxisInfo). Reported-by: Nicolai Stange <nicolai.sta...@zmaw.de> Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Signed-off-by: Matthieu Herrb <matthieu.he...@laas.fr> diff --git a/src/XListDev.c b/src/XListDev.c index 6a16da4..6b91238 100644 --- a/src/XListDev.c +++ b/src/XListDev.c @@ -61,6 +61,17 @@ SOFTWARE. #include <X11/extensions/extutil.h> #include "XIint.h" +/* Calculate length field to a multiples of sizeof(XID). XIDs are typedefs + * to ulong and thus may be 8 bytes on some platforms. This can trigger a + * SIGBUS if a class ends up not being 8-aligned (e.g. after XAxisInfo). + */ +static int pad_to_xid(int base_size) +{ + int padsize = sizeof(XID); + + return ((base_size + padsize - 1)/padsize) * padsize; +} + static int SizeClassInfo(xAnyClassPtr *any, int num_classes) { @@ -69,18 +80,18 @@ SizeClassInfo(xAnyClassPtr *any, int num_classes) for (j = 0; j < num_classes; j++) { switch ((*any)->class) { case KeyClass: - size += sizeof(XKeyInfo); + size += pad_to_xid(sizeof(XKeyInfo)); break; case ButtonClass: - size += sizeof(XButtonInfo); + size += pad_to_xid(sizeof(XButtonInfo)); break; case ValuatorClass: { xValuatorInfoPtr v; v = (xValuatorInfoPtr) *any; - size += sizeof(XValuatorInfo) + - (v->num_axes * sizeof(XAxisInfo)); + size += pad_to_xid(sizeof(XValuatorInfo) + + (v->num_axes * sizeof(XAxisInfo))); break; } default: @@ -105,7 +116,7 @@ ParseClassInfo(xAnyClassPtr *any, XAnyClassPtr *Any, int num_classes) xKeyInfoPtr k = (xKeyInfoPtr) *any; K->class = KeyClass; - K->length = sizeof(XKeyInfo); + K->length = pad_to_xid(sizeof(XKeyInfo)); K->min_keycode = k->min_keycode; K->max_keycode = k->max_keycode; K->num_keys = k->num_keys; @@ -117,7 +128,7 @@ ParseClassInfo(xAnyClassPtr *any, XAnyClassPtr *Any, int num_classes) xButtonInfoPtr b = (xButtonInfoPtr) *any; B->class = ButtonClass; - B->length = sizeof(XButtonInfo); + B->length = pad_to_xid(sizeof(XButtonInfo)); B->num_buttons = b->num_buttons; break; } @@ -129,8 +140,8 @@ ParseClassInfo(xAnyClassPtr *any, XAnyClassPtr *Any, int num_classes) xAxisInfoPtr a; V->class = ValuatorClass; - V->length = sizeof(XValuatorInfo) + - (v->num_axes * sizeof(XAxisInfo)); + V->length = pad_to_xid(sizeof(XValuatorInfo) + + (v->num_axes * sizeof(XAxisInfo))); V->num_axes = v->num_axes; V->motion_buffer = v->motion_buffer_size; V->mode = v->mode; commit 15feb92b30e13e7439a3434bea9f454645b97444 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Thu Jan 5 13:55:41 2012 +1000 man: fix typo Mappiing → Mapping Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/man/XSelectExtensionEvent.txt b/man/XSelectExtensionEvent.txt index cbcfffe..95e0ac7 100644 --- a/man/XSelectExtensionEvent.txt +++ b/man/XSelectExtensionEvent.txt @@ -86,7 +86,7 @@ DESCRIPTION defined macros include DeviceKeyPress, DeviceKeyRelease, DeviceButtonPress, DeviceButtonRelese, DeviceMotionNotify, DeviceFocusIn, DeviceFocusOut, ProximityIn, ProximityOut, - DeviceStateNotify, DeviceMappiingNotify, ChangeDeviceNotify, + DeviceStateNotify, DeviceMappingNotify, ChangeDeviceNotify, DevicePointerMotionHint, DeviceButton1Motion, DeviceButton2Motion, DeviceButton3Motion, DeviceButton4Motion, DeviceButton5Motion, DeviceButtonMotion, DeviceOwnerGrabButton, commit 8576ae6b9ee974829e2fb8a834087652a6e9e1a2 Author: Cyril Brulebois <k...@debian.org> Date: Thu Dec 22 15:50:47 2011 +0100 configure.ac: Fix a typo in comments. Signed-off-by: Cyril Brulebois <k...@debian.org> Reviewed-by: Chase Douglas <chase.doug...@canonical.com> Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/configure.ac b/configure.ac index 79ba97e..481cf44 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ XORG_CHECK_SGML_DOCTOOLS(1.8) XORG_WITH_ASCIIDOC(8.4.5) XORG_CHECK_MALLOC_ZERO -# Obtain compiler/linker options for depedencies +# Obtain compiler/linker options for dependencies PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.4.99.1] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 2.1.99.3]) # Check for xmlto and asciidoc for man page conversion commit ab08834f00a92e3de536435374f9945a13ec9b95 Author: Cyril Brulebois <k...@debian.org> Date: Thu Dec 22 14:19:37 2011 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index e493ae5..a96f186 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxi (2:1.5.99.2-1) UNRELEASED; urgency=low +libxi (2:1.5.99.2-1) experimental; urgency=low * New upstream release candidate: - With XI 2.2 support, needed for multitouch. @@ -7,7 +7,7 @@ libxi (2:1.5.99.2-1) UNRELEASED; urgency=low * Bump x11proto-input-dev and libx11-dev build-deps. * Update libxi6.symbols with new symbols and bump shlibs. - -- Cyril Brulebois <k...@debian.org> Thu, 22 Dec 2011 12:53:34 +0100 + -- Cyril Brulebois <k...@debian.org> Thu, 22 Dec 2011 14:19:35 +0100 libxi (2:1.5.0-1) experimental; urgency=low commit 58d650a07e0f3966892a516605cf10e9324669d2 Author: Cyril Brulebois <k...@debian.org> Date: Thu Dec 22 14:18:45 2011 +0100 Update libxi6.symbols with new symbols and bump shlibs. diff --git a/debian/changelog b/debian/changelog index 4a16064..e493ae5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ libxi (2:1.5.99.2-1) UNRELEASED; urgency=low * Fix changelog entry for 2:1.4.99.1-1: - With XI 2.1 support, no multitouch yet. * Bump x11proto-input-dev and libx11-dev build-deps. + * Update libxi6.symbols with new symbols and bump shlibs. -- Cyril Brulebois <k...@debian.org> Thu, 22 Dec 2011 12:53:34 +0100 diff --git a/debian/libxi6.symbols b/debian/libxi6.symbols index 975a92b..0857960 100644 --- a/debian/libxi6.symbols +++ b/debian/libxi6.symbols @@ -28,6 +28,7 @@ libXi.so.6 libxi6 #MINVER# XGetSelectedExtensionEvents@Base 0 XGrabDevice@Base 0 XIAllowEvents@Base 2:1.2.99.4 + XIAllowTouchEvents@Base 2:1.5.99.2 XIChangeHierarchy@Base 2:1.2.99.4 XIChangeProperty@Base 2:1.2.99.4 XIDefineCursor@Base 2:1.2.99.4 @@ -42,6 +43,7 @@ libXi.so.6 libxi6 #MINVER# XIGrabEnter@Base 2:1.2.99.4 XIGrabFocusIn@Base 2:1.2.99.4 XIGrabKeycode@Base 2:1.2.99.4 + XIGrabTouchBegin@Base 2:1.5.99.2 XIListProperties@Base 2:1.2.99.4 XIQueryDevice@Base 2:1.2.99.4 XIQueryPointer@Base 2:1.2.99.4 @@ -55,6 +57,7 @@ libXi.so.6 libxi6 #MINVER# XIUngrabEnter@Base 2:1.2.99.4 XIUngrabFocusIn@Base 2:1.2.99.4 XIUngrabKeycode@Base 2:1.2.99.4 + XIUngrabTouchBegin@Base 2:1.5.99.2 XIWarpPointer@Base 2:1.2.99.4 XGrabDeviceButton@Base 0 XGrabDeviceKey@Base 0 diff --git a/debian/rules b/debian/rules index 2959206..5d18886 100755 --- a/debian/rules +++ b/debian/rules @@ -98,7 +98,7 @@ binary-arch: build install dh_strip -N$(PACKAGE) dh_compress dh_fixperms - dh_makeshlibs -V'libxi6 (>= 2:1.2.99.4)' --add-udeb=$(PACKAGE)-udeb -- -c4 + dh_makeshlibs -V'libxi6 (>= 2:1.5.99.2)' --add-udeb=$(PACKAGE)-udeb -- -c4 dh_shlibdeps dh_installdeb dh_gencontrol commit 546404ba78e1731f55730300e2b82c976cee97e8 Author: Cyril Brulebois <k...@debian.org> Date: Thu Dec 22 14:12:09 2011 +0100 Fix changelog. diff --git a/debian/changelog b/debian/changelog index 76ac027..4a16064 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ libxi (2:1.5.99.2-1) UNRELEASED; urgency=low * New upstream release candidate: - With XI 2.2 support, needed for multitouch. + * Fix changelog entry for 2:1.4.99.1-1: + - With XI 2.1 support, no multitouch yet. * Bump x11proto-input-dev and libx11-dev build-deps. -- Cyril Brulebois <k...@debian.org> Thu, 22 Dec 2011 12:53:34 +0100 @@ -15,7 +17,7 @@ libxi (2:1.5.0-1) experimental; urgency=low libxi (2:1.4.99.1-1) experimental; urgency=low * New upstream release candidate: - - With multitouch support. + - With XI 2.1 support. * Update build dependencies accordingly: - Bump xutils-dev, x11proto-input-dev, xorg-sgml-doctools. - Add xsltproc. commit f5876ba2162207396f3108095fff0b709d70b546 Author: Cyril Brulebois <k...@debian.org> Date: Thu Dec 22 14:10:38 2011 +0100 Bump x11proto-input-dev and libx11-dev build-deps. diff --git a/debian/changelog b/debian/changelog index 6699d76..76ac027 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libxi (2:1.5.99.2-1) UNRELEASED; urgency=low * New upstream release candidate: - With XI 2.2 support, needed for multitouch. + * Bump x11proto-input-dev and libx11-dev build-deps. -- Cyril Brulebois <k...@debian.org> Thu, 22 Dec 2011 12:53:34 +0100 diff --git a/debian/control b/debian/control index 6eef8fa..0af18dc 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Build-Depends: debhelper (>= 8.1.3), x11proto-core-dev (>= 7.0.13), x11proto-xext-dev (>= 7.0.3), - x11proto-input-dev (>= 2.0.99.1), - libx11-dev (>= 2:1.3.3-2), + x11proto-input-dev (>= 2.1.99.3), + libx11-dev (>= 2:1.4.99.1), libxext-dev (>= 2:1.1.1-3), xmlto, asciidoc (>= 8.4.5), commit be5dd966ce20f5b22d01b5994ec93385e9efdfed Author: Cyril Brulebois <k...@debian.org> Date: Thu Dec 22 12:55:12 2011 +0100 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index 17b4b09..08ddaec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +commit ae0187c8708d2378373889827117911086581fdd +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Thu Dec 22 09:42:43 2011 +1000 + + libXi 1.5.99.2 + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 47f3d887a7731f4ab68a69ed31dbe7acf6d13270 +Merge: 82a6312 e73e2fe +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed Dec 21 15:40:37 2011 +1000 + + Merge branch 'multitouch' + + Conflicts: + configure.ac + commit 82a631263ef4e6f46c1f33748089db8bf603b095 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Wed Dec 21 15:33:17 2011 +1000 @@ -6,6 +24,42 @@ Date: Wed Dec 21 15:33:17 2011 +1000 Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> +commit e73e2fe95dab3e0048b24d16327adbe54326ff3f +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed Sep 14 22:33:57 2011 -0700 + + Implement support for XI 2.2 + + Adds support for the new TouchClass for multitouch-capable servers/devices. + + New events: + XITouchOwnershipEvent + + New event types handled: + XITouchBegin, XITouchUpdate, XITouchEnd + XIRawTouchBegin, XIRawTouchUpdate, XIRawTouchEnd + + New functions: + XIGrabTouchBegin ... passive grabs on touches + XIUngrabTouchBegin + XIAllowTouchEvents ... Allow/reject touch event sequences + + New XIQueryDevice classes: + XITouchClassInfo + + Requires libX11 1.5 for GetReqSized + + Co-authored by: Chase Douglas <chase.doug...@canonical.com> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 7888d14a499062a1c3b333f31f1330cecf1e97c1 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Tue Oct 25 13:30:47 2011 +1000 + + Bump to 1.5.99.1 + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + commit fa6505f0a86b296e8f12f0fb8f472ef17b501fdb Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Mon Dec 19 09:36:34 2011 +1000 diff --git a/debian/changelog b/debian/changelog index 56f73b3..6699d76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libxi (2:1.5.99.2-1) UNRELEASED; urgency=low + + * New upstream release candidate: + - With XI 2.2 support, needed for multitouch. + + -- Cyril Brulebois <k...@debian.org> Thu, 22 Dec 2011 12:53:34 +0100 + libxi (2:1.5.0-1) experimental; urgency=low * New upstream release. commit 75ad2ed11bcc5783bf84624196d2e7d95ad6766c Author: Cyril Brulebois <k...@debian.org> Date: Wed Dec 21 10:12:12 2011 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index a7733e6..56f73b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libxi (2:1.5.0-1) UNRELEASED; urgency=low +libxi (2:1.5.0-1) experimental; urgency=low * New upstream release. - -- Cyril Brulebois <k...@debian.org> Wed, 21 Dec 2011 10:11:55 +0100 + -- Cyril Brulebois <k...@debian.org> Wed, 21 Dec 2011 10:12:07 +0100 libxi (2:1.4.99.1-1) experimental; urgency=low commit 5b46944114289fa9c1e97fe3decb34f68de06b91 Author: Cyril Brulebois <k...@debian.org> Date: Wed Dec 21 10:12:03 2011 +0100 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index 47c40db..17b4b09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,80 @@ +commit 82a631263ef4e6f46c1f33748089db8bf603b095 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed Dec 21 15:33:17 2011 +1000 + + libXi 1.5.0 + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit fa6505f0a86b296e8f12f0fb8f472ef17b501fdb +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Mon Dec 19 09:36:34 2011 +1000 + + man: minor formatting fix in XIGrabButton + +commit 49408e39e4b084fe362e9ee197bfa0aa1c55384d +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Fri Nov 11 15:32:21 2011 +1000 + + Include config.h from source files + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Gaetan Nadon <mems...@videotron.ca> + Reviewed-by: Jeremy Huddleston <jerem...@apple.com> + +commit ba83a1e58592e41f207524f106ba26dd71fe4171 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed Oct 26 08:55:35 2011 +1000 + + Stop unnecessary calls to size_classes + + Xmalloc is a macro evaluating its argument twice. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Jeremy Huddleston <jerem...@apple.com> + +commit 6d6ae8fc8b9620bf864ac7dff8d818573eee3e4f +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed Oct 26 08:54:53 2011 +1000 + + Fix duplicate sizeof in copy_classes + + sizeof(bla * sizeof()) is'nt right. + + Plus add some () to the next_block call too to emphasise that *nclasses is + the multiplicator. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Jeremy Huddleston <jerem...@apple.com> + +commit 323730f7fa70190d2ea00e62c6964fee524ca430 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Thu Oct 27 10:27:49 2011 +1000 + + man: passive grabs return the number of failed modifier combinations + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 5189df57e18c79327848fb117a8ede59868c8fdb +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Fri Oct 21 08:49:31 2011 +1000 + + man: XIGrabButton returns error codes, not status codes + + Reword slightly that the returned value is the error code for this + particular grab. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 05aaf65b3b6b7dc7268137ce4ee516f08eefb62f +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Fri Oct 21 08:07:45 2011 +1000 + + man: fix #include for XIGrabButton + + Reported-by: Matthias Clasen <mcla...@redhat.com> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + commit c25debae73be50b9a77454ed4d72ffeaab726846 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Mon Oct 10 10:24:38 2011 +1000 diff --git a/debian/changelog b/debian/changelog index 3652da8..a7733e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxi (2:1.5.0-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Cyril Brulebois <k...@debian.org> Wed, 21 Dec 2011 10:11:55 +0100 + libxi (2:1.4.99.1-1) experimental; urgency=low * New upstream release candidate: -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rw0qu-00034r...@vasks.debian.org