.gitignore | 13 COPYING | 24 ChangeLog | 1795 +++++++++ Makefile.am | 8 configure.ac | 27 debian/changelog | 32 debian/control | 21 debian/libxi-dev.install | 1 debian/libxi6.symbols | 29 debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch | 170 debian/patches/series | 1 debian/rules | 6 include/X11/extensions/XInput.h | 1277 ++++++ include/X11/extensions/XInput2.h | 548 ++ man/.gitignore | 3 man/Makefile.am | 314 - man/XAllowDeviceEvents.man | 146 man/XAllowDeviceEvents.txt | 133 man/XChangeDeviceDontPropagateList.man | 93 man/XChangeDeviceDontPropagateList.txt | 92 man/XChangeKeyboardDevice.man | 70 man/XChangeKeyboardDevice.txt | 68 man/XChangePointerDevice.man | 76 man/XChangePointerDevice.txt | 79 man/XDeviceBell.man | 77 man/XDeviceBell.txt | 78 man/XGetDeviceControl.man | 139 man/XGetDeviceControl.txt | 126 man/XGetDeviceKeyMapping.man | 180 man/XGetDeviceKeyMapping.txt | 146 man/XGetDeviceModifierMapping.man | 145 man/XGetDeviceModifierMapping.txt | 118 man/XGetDeviceMotionEvents.man | 117 man/XGetDeviceMotionEvents.txt | 109 man/XGetDeviceProperty.man | 191 - man/XGetDeviceProperty.txt | 165 man/XGetExtensionVersion.man | 54 man/XGetExtensionVersion.txt | 50 man/XGetFeedbackControl.man | 319 - man/XGetFeedbackControl.txt | 272 + man/XGrabDevice.man | 203 - man/XGrabDevice.txt | 159 man/XGrabDeviceButton.man | 211 - man/XGrabDeviceButton.txt | 170 man/XGrabDeviceKey.man | 205 - man/XGrabDeviceKey.txt | 177 man/XIChangeHierarchy.txt | 119 man/XIChangeProperty.txt | 227 + man/XIDefineCursor.txt | 79 man/XIGrabButton.txt | 201 + man/XIGrabDevice.txt | 147 man/XIGrabEnter.txt | 176 man/XIListProperties.txt | 54 man/XIQueryDevice.txt | 208 + man/XIQueryPointer.txt | 99 man/XIQueryVersion.txt | 68 man/XISelectEvents.txt | 98 man/XISetClientPointer.txt | 69 man/XISetFocus.txt | 86 man/XIWarpPointer.txt | 89 man/XListDeviceProperties.man | 95 man/XListDeviceProperties.txt | 53 man/XListInputDevices.man | 234 - man/XListInputDevices.txt | 224 + man/XOpenDevice.man | 126 man/XOpenDevice.txt | 113 man/XQueryDeviceState.man | 99 man/XQueryDeviceState.txt | 84 man/XSelectExtensionEvent.man | 151 man/XSelectExtensionEvent.txt | 123 man/XSendExtensionEvent.man | 142 man/XSendExtensionEvent.txt | 114 man/XSetDeviceButtonMapping.man | 102 man/XSetDeviceButtonMapping.txt | 97 man/XSetDeviceFocus.man | 219 - man/XSetDeviceFocus.txt | 154 man/XSetDeviceMode.man | 72 man/XSetDeviceMode.txt | 57 man/XSetDeviceValuators.man | 82 man/XSetDeviceValuators.txt | 74 src/.gitignore | 10 src/Makefile.am | 38 src/XAllowDv.c | 13 src/XChgDCtl.c | 13 src/XChgFCtl.c | 13 src/XChgKMap.c | 17 src/XChgKbd.c | 9 src/XChgPnt.c | 13 src/XChgProp.c | 15 src/XCloseDev.c | 9 src/XDevBell.c | 14 src/XExtInt.c | 1836 +++++++--- src/XExtToWire.c | 811 ++-- src/XFreeLst.c | 6 src/XGMotion.c | 30 src/XGetBMap.c | 13 src/XGetCPtr.c | 67 src/XGetDCtl.c | 14 src/XGetFCtl.c | 14 src/XGetKMap.c | 3 src/XGetMMap.c | 9 src/XGetProp.c | 12 src/XGetVers.c | 10 src/XGrDvBut.c | 29 src/XGrDvKey.c | 29 src/XGrabDev.c | 24 src/XGtFocus.c | 15 src/XGtSelect.c | 18 src/XIAllowEvents.c | 53 src/XIDefineCursor.c | 65 src/XIGetDevFocus.c | 62 src/XIGrabDevice.c | 104 src/XIHierarchy.c | 156 src/XIPassiveGrab.c | 210 + src/XIProperties.c | 241 + src/XIQueryDevice.c | 116 src/XIQueryPointer.c | 101 src/XIQueryVersion.c | 86 src/XISelEv.c | 174 src/XISetDevFocus.c | 55 src/XIWarpPointer.c | 77 src/XIint.h | 52 src/XListDev.c | 185 - src/XOpenDev.c | 9 src/XQueryDv.c | 15 src/XSelect.c | 13 src/XSetBMap.c | 13 src/XSetCPtr.c | 62 src/XSetDVal.c | 15 src/XSetMMap.c | 11 src/XSetMode.c | 11 src/XSndExEv.c | 23 src/XStFocus.c | 15 src/XUngrDev.c | 11 src/XUngrDvB.c | 17 src/XUngrDvK.c | 17 src/config.h.in | 7 137 files changed, 12605 insertions(+), 5047 deletions(-)
New commits: commit d39a687c345046f75c9d9f4f72b640162b0faa58 Author: Julien Cristau <[email protected]> Date: Wed Jan 6 13:04:02 2010 +0000 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 298126a..f702684 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ -libxi (2:1.3-2) UNRELEASED; urgency=low +libxi (2:1.3-2) unstable; urgency=low * Initialize extension with the right number of events. This should fix issues when libXi announces more events than the X server will actually send for that extension, and thus smashes Xlib's event vector (closes: #515734, #515946). Patch by Peter Hutterer, analysis by Nathan Kidd. + * Upload to unstable. - -- Julien Cristau <[email protected]> Tue, 05 Jan 2010 00:13:16 +0000 + -- Julien Cristau <[email protected]> Wed, 06 Jan 2010 13:02:46 +0000 libxi (2:1.3-1) experimental; urgency=low commit c406e9abae29b7cdfc91efa2e97b86dd1106012e Author: Julien Cristau <[email protected]> Date: Wed Jan 6 12:55:27 2010 +0000 Initialize extension with the right number of events. This should fix issues when libXi announces more events than the X server will actually send for that extension, and thus smashes Xlib's event vector (closes: #515734, #515946). Patch by Peter Hutterer, analysis by Nathan Kidd. diff --git a/debian/changelog b/debian/changelog index 225fcb8..298126a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libxi (2:1.3-2) UNRELEASED; urgency=low + + * Initialize extension with the right number of events. This should fix + issues when libXi announces more events than the X server will actually + send for that extension, and thus smashes Xlib's event vector (closes: + #515734, #515946). Patch by Peter Hutterer, analysis by Nathan Kidd. + + -- Julien Cristau <[email protected]> Tue, 05 Jan 2010 00:13:16 +0000 + libxi (2:1.3-1) experimental; urgency=low * Bump Standards-Version to 3.8.3. diff --git a/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch b/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch new file mode 100644 index 0000000..34b4544 --- /dev/null +++ b/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch @@ -0,0 +1,170 @@ +From 5e87ce95525d6634066384b8dc829bb7c90ec008 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <[email protected]> +Date: Wed, 9 Dec 2009 14:06:36 +1000 +Subject: [PATCH] Initialize extension with the right number of events. + +If the server supports a lower XI version than the client, the Xlib-internal +event vector may be smashed. See libXext for more details. +http://cgit.freedesktop.org/xorg/lib/libXext/commit/?id=83fdb27df4ddc2fb088ddf2ec65f0db6b7c57287 + +This patch queries the server for the supported XI extension before +registering the extension with Xlib. The number of events registered depends +on the server version. + +Signed-off-by: Peter Hutterer <[email protected]> +--- + src/XExtInt.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- + src/XGetVers.c | 24 ++++++++++++++------- + src/XIint.h | 1 + + 3 files changed, 77 insertions(+), 9 deletions(-) + +diff --git a/src/XExtInt.c b/src/XExtInt.c +index e87ead8..125a72e 100644 +--- a/src/XExtInt.c ++++ b/src/XExtInt.c +@@ -173,6 +173,63 @@ static char *XInputErrorList[] = { + "BadClass, invalid event class", /* BadClass */ + }; + ++/* Get the version supported by the server to know which number of ++* events are support. Otherwise, a wrong number of events may smash ++* the Xlib-internal event processing vector. ++* ++* Since the extension hasn't been initialized yet, we need to ++* manually get the opcode, then the version. ++*/ ++static int ++_XiFindEventsSupported(Display *dpy) ++{ ++ XExtCodes codes; ++ XExtensionVersion *extversion = NULL; ++ int nevents = 0; ++ ++ if (!XQueryExtension(dpy, INAME, &codes.major_opcode, ++ &codes.first_event, &codes.first_error)) ++ goto out; ++ ++ LockDisplay(dpy); ++ extversion = _XiGetExtensionVersionRequest(dpy, INAME, ++ codes.major_opcode); ++ if (!extversion || !extversion->present) ++ goto out; ++ UnlockDisplay(dpy); ++ SyncHandle(); ++ ++ if (extversion->major_version >= 2) ++ nevents = IEVENTS; /* number is fixed, XI2 adds GenericEvents only */ ++ else if (extversion->major_version <= 0) ++ { ++ printf("XInput_find_display: invalid extension version %d.%d\n", ++ extversion->major_version, extversion->minor_version); ++ goto out; ++ } ++ else ++ { ++ switch(extversion->minor_version) ++ { ++ case XI_Add_DeviceProperties_Minor: ++ nevents = XI_DevicePropertyNotify - 1; ++ break; ++ case XI_Add_DevicePresenceNotify_Minor: ++ nevents = XI_DevicePresenceNotify - 1; ++ break; ++ default: ++ nevents = XI_DeviceButtonstateNotify - 1; ++ break; ++ } ++ } ++ ++out: ++ if (extversion) ++ XFree(extversion); ++ return nevents; ++} ++ ++ + _X_HIDDEN + XExtDisplayInfo *XInput_find_display (Display *dpy) + { +@@ -180,10 +237,12 @@ XExtDisplayInfo *XInput_find_display (Display *dpy) + if (!xinput_info) { if (!(xinput_info = XextCreateExtension())) return NULL; } + if (!(dpyinfo = XextFindDisplay (xinput_info, dpy))) + { ++ int nevents = _XiFindEventsSupported(dpy); ++ + dpyinfo = XextAddDisplay (xinput_info, dpy, + xinput_extension_name, + &xinput_extension_hooks, +- IEVENTS, NULL); ++ nevents, NULL); + XESetWireToEventCookie(dpy, dpyinfo->codes->major_opcode, XInputWireToCookie); + XESetCopyEventCookie(dpy, dpyinfo->codes->major_opcode, XInputCopyCookie); + } +diff --git a/src/XGetVers.c b/src/XGetVers.c +index 3b500ae..4718617 100644 +--- a/src/XGetVers.c ++++ b/src/XGetVers.c +@@ -72,19 +72,15 @@ XGetExtensionVersion(register Display * dpy, _Xconst char *name) + return (ext); + } + +-_X_HIDDEN XExtensionVersion * +-_XiGetExtensionVersion(register Display * dpy, _Xconst char *name, +- XExtDisplayInfo *info) ++_X_HIDDEN XExtensionVersion* ++_XiGetExtensionVersionRequest(Display *dpy, _Xconst char *name, int xi_opcode) + { + xGetExtensionVersionReq *req; + xGetExtensionVersionReply rep; + XExtensionVersion *ext; + +- if (_XiCheckExtInit(dpy, Dont_Check, info) == -1) +- return ((XExtensionVersion *) NoSuchExtension); +- + GetReq(GetExtensionVersion, req); +- req->reqType = info->codes->major_opcode; ++ req->reqType = xi_opcode; + req->ReqType = X_GetExtensionVersion; + req->nbytes = strlen(name); + req->length += (unsigned)(req->nbytes + 3) >> 2; +@@ -93,6 +89,7 @@ _XiGetExtensionVersion(register Display * dpy, _Xconst char *name, + if (!_XReply(dpy, (xReply *) & rep, 0, xTrue)) { + return (XExtensionVersion *) NULL; + } ++ + ext = (XExtensionVersion *) Xmalloc(sizeof(XExtensionVersion)); + if (ext) { + ext->present = rep.present; +@@ -101,5 +98,16 @@ _XiGetExtensionVersion(register Display * dpy, _Xconst char *name, + ext->minor_version = rep.minor_version; + } + } +- return (ext); ++ ++ return ext; ++} ++ ++_X_HIDDEN XExtensionVersion * ++_XiGetExtensionVersion(register Display * dpy, _Xconst char *name, ++ XExtDisplayInfo *info) ++{ ++ if (_XiCheckExtInit(dpy, Dont_Check, info) == -1) ++ return ((XExtensionVersion *) NoSuchExtension); ++ ++ return _XiGetExtensionVersionRequest(dpy, name, info->codes->major_opcode); + } +diff --git a/src/XIint.h b/src/XIint.h +index 400c920..00e84d3 100644 +--- a/src/XIint.h ++++ b/src/XIint.h +@@ -14,6 +14,7 @@ extern XExtDisplayInfo *XInput_find_display(Display *); + extern int _XiCheckExtInit(Display *, int, XExtDisplayInfo *); + + extern XExtensionVersion *_XiGetExtensionVersion(Display *, _Xconst char *, XExtDisplayInfo *); ++extern XExtensionVersion* _XiGetExtensionVersionRequest(Display *dpy, _Xconst char *name, int xi_opcode); + extern Status _xiQueryVersion(Display *dpy, int*, int*, XExtDisplayInfo *); + + extern Status _XiEventToWire( +-- +1.6.6 + diff --git a/debian/patches/series b/debian/patches/series index e69de29..89c1e5c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Initialize-extension-with-the-right-number-of-events.patch commit bd058c807bf6641ea4a7f27380977e3fc3328ae3 Author: Julien Cristau <[email protected]> Date: Sat Nov 21 18:39:44 2009 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index f257d5d..225fcb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libxi (2:1.3-1) UNRELEASED; urgency=low +libxi (2:1.3-1) experimental; urgency=low * Bump Standards-Version to 3.8.3. * Add build-deps on xmlto and asciidoc to build the manpages. * New upstream release. - -- Julien Cristau <[email protected]> Sat, 21 Nov 2009 18:20:20 +0100 + -- Julien Cristau <[email protected]> Sat, 21 Nov 2009 18:39:28 +0100 libxi (2:1.2.99.4-1) experimental; urgency=low commit 4dbdff969139792de3270f5391254997b61edf2b Author: Julien Cristau <[email protected]> Date: Sat Nov 21 18:20:40 2009 +0100 Bump changelogs diff --git a/ChangeLog b/ChangeLog index 5f1a987..7b189a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,94 @@ +commit 63621888d6e36a2f9e41e81c14728d70beeff5ee +Author: Peter Hutterer <[email protected]> +Date: Fri Oct 2 12:09:17 2009 +1000 + + libXi 1.3 + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 9dc825a3dede81d2425770662daefe7e19644d6d +Author: Peter Hutterer <[email protected]> +Date: Fri Oct 2 12:08:30 2009 +1000 + + Require macros 1.3 for XORG_DEFAULT_OPTIONS + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 3530845c70b0d7f9f853b29337c9397a3a599e52 +Author: Julien Cristau <[email protected]> +Date: Tue Sep 29 14:15:06 2009 +0200 + + Don't export sizeDeviceClassType, size_classes and copy_classes + + Signed-off-by: Julien Cristau <[email protected]> + +commit 801d77d035a10250dab728c046a6e9b2775e6dfb +Author: Peter Hutterer <[email protected]> +Date: Thu Sep 24 14:14:48 2009 +1000 + + XQueryDeviceState: correct length of XValuatorState + + The length is suppposed to be the complete class size, not just the struct + size. Since XValuatorState is followed by multiple valuator values the + size of the class is variable and dependent on the number of valuators. + + The server assembles the valuator state last. This bug is unlikely to affect + clients as they should never go past the last class anyway. + + Tested-by: Thomas Jaeger + Signed-off-by: Peter Hutterer <[email protected]> + +commit bff36ef5797d7da11972ee22ea224e207af77455 +Author: Peter Hutterer <[email protected]> +Date: Thu Sep 24 13:10:26 2009 +1000 + + man: correct XQueryDeviceState return value. + + And one indentation fix in the same man page. + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 9c5ba6ff3fcff30507f285f2e67afbdb296a2318 +Author: Peter Hutterer <[email protected]> +Date: Mon Sep 14 16:34:18 2009 +1000 + + Declare _xibad* functions before the Bad* macros. + + Reported-by: Christian Beier + Signed-off-by: Peter Hutterer <[email protected]> + +commit 369600cf37cd884793c4802a56c8355bc1812dc6 +Author: Peter Hutterer <[email protected]> +Date: Mon Sep 7 12:22:06 2009 +1000 + + mask_len in XIGrabDevice is in 4-byte units (#23708) + + X.Org Bug 23708 <http://bugs.freedesktop.org/show_bug.cgi?id=23708> + + Signed-off-by: Peter Hutterer <[email protected]> + +commit fa09375a69a02cd789c70d60970a669700eaeb20 +Author: Arkadiusz Miśkiewicz <[email protected]> +Date: Sat Sep 5 20:39:47 2009 +0200 + + libXi: Man page files end with LIB_MAN_SUFFIX not LIB_MAN_DIR_SUFFIX. + + Using LIB_MAN_DIR_SUFFIX as man page files suffix is invalid since + there can be files ending with eg. 5x while being in man5 dir + (share/man/man5/man.5x) as required by FHS 2.3. + + Man page files and with LI + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 693d9a43f16d4ffd085099b532a10467aa095c17 +Author: Peter Hutterer <[email protected]> +Date: Tue Sep 1 16:42:38 2009 +1000 + + Initialize send_event for cookie events. (#23609) + + X.Org Bug 23609 <http://bugs.freedesktop.org/show_bug.cgi?id=23609> + commit eb9a2d63487641faa97d88cef3fa1c892a8f342f Author: Peter Hutterer <[email protected]> Date: Tue Aug 25 11:03:04 2009 +1000 diff --git a/debian/changelog b/debian/changelog index 78711f5..f257d5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -libxi (2:1.2.99.4-2) UNRELEASED; urgency=low +libxi (2:1.3-1) UNRELEASED; urgency=low * Bump Standards-Version to 3.8.3. * Add build-deps on xmlto and asciidoc to build the manpages. + * New upstream release. - -- Julien Cristau <[email protected]> Tue, 29 Sep 2009 14:27:52 +0200 + -- Julien Cristau <[email protected]> Sat, 21 Nov 2009 18:20:20 +0100 libxi (2:1.2.99.4-1) experimental; urgency=low commit 63621888d6e36a2f9e41e81c14728d70beeff5ee Author: Peter Hutterer <[email protected]> Date: Fri Oct 2 12:09:17 2009 +1000 libXi 1.3 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index f1d8818..377dfe0 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(libXi, 1.2.99.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi) +AC_INIT(libXi, 1.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE commit 9dc825a3dede81d2425770662daefe7e19644d6d Author: Peter Hutterer <[email protected]> Date: Fri Oct 2 12:08:30 2009 +1000 Require macros 1.3 for XORG_DEFAULT_OPTIONS Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 2470d34..f1d8818 100644 --- a/configure.ac +++ b/configure.ac @@ -7,15 +7,15 @@ AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE # Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) AM_CONFIG_HEADER(src/config.h) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL AC_PROG_SED -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.2.99.1] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 1.9.99.902]) @@ -35,9 +35,6 @@ if test "x$XMLTO" = "x" || test "x$ASCIIDOC" = "x"; then fi XORG_CHECK_MALLOC_ZERO -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile commit 103c579d1e50a1c669c908613eeaaa1111f83d26 Author: Julien Cristau <[email protected]> Date: Tue Sep 29 14:51:09 2009 +0200 Add build-deps on xmlto and asciidoc to build the manpages. diff --git a/debian/changelog b/debian/changelog index c91ea23..78711f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libxi (2:1.2.99.4-2) UNRELEASED; urgency=low * Bump Standards-Version to 3.8.3. + * Add build-deps on xmlto and asciidoc to build the manpages. -- Julien Cristau <[email protected]> Tue, 29 Sep 2009 14:27:52 +0200 diff --git a/debian/control b/debian/control index 78f78a7..2c5b124 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,8 @@ Build-Depends: x11proto-input-dev (>= 1.9.99.902), libx11-dev (>= 2:1.2.99.1), libxext-dev (>= 2:1.0.99.1), + xmlto, + asciidoc (>= 8.4.5), pkg-config, quilt, xutils-dev (>= 1:7.4+4), commit 23a353d8771aa3538f01183d848769e72c0304db Author: Julien Cristau <[email protected]> Date: Tue Sep 29 14:28:00 2009 +0200 Bump Standards-Version to 3.8.3. diff --git a/debian/changelog b/debian/changelog index 2c57adc..c91ea23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxi (2:1.2.99.4-2) UNRELEASED; urgency=low + + * Bump Standards-Version to 3.8.3. + + -- Julien Cristau <[email protected]> Tue, 29 Sep 2009 14:27:52 +0200 + libxi (2:1.2.99.4-1) experimental; urgency=low [ Timo Aaltonen ] diff --git a/debian/control b/debian/control index 85e8958..78f78a7 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: xutils-dev (>= 1:7.4+4), automake, libtool -Standards-Version: 3.8.1 +Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxi Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxi.git commit 0676670ccf53d345fdf03dac32057e0d1db7ff6e Author: Julien Cristau <[email protected]> Date: Tue Sep 29 14:26:37 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 0147314..2c57adc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxi (2:1.2.99.4-1) UNRELEASED; urgency=low +libxi (2:1.2.99.4-1) experimental; urgency=low [ Timo Aaltonen ] * Add README.source from xsfbs. Bump Standards-Version to 3.8.1. @@ -12,7 +12,7 @@ libxi (2:1.2.99.4-1) UNRELEASED; urgency=low * Also remove config.h.in in clean. * Bump shlibs and update symbols. - -- Timo Aaltonen <[email protected]> Fri, 31 Jul 2009 14:25:21 +0300 + -- Julien Cristau <[email protected]> Tue, 29 Sep 2009 14:24:21 +0200 libxi (2:1.2.1-2) unstable; urgency=low commit 3530845c70b0d7f9f853b29337c9397a3a599e52 Author: Julien Cristau <[email protected]> Date: Tue Sep 29 14:15:06 2009 +0200 Don't export sizeDeviceClassType, size_classes and copy_classes Signed-off-by: Julien Cristau <[email protected]> diff --git a/src/XExtInt.c b/src/XExtInt.c index 7f7e9cc..e87ead8 100644 --- a/src/XExtInt.c +++ b/src/XExtInt.c @@ -102,8 +102,6 @@ extern int _XiGetDevicePresenceNotifyEvent( int copy_classes(XIDeviceInfo *to, xXIAnyInfo* from, int nclasses); int size_classes(xXIAnyInfo* from, int nclasses); -int sizeDeviceClassType(int type, int num_elements); - static XExtensionInfo *xinput_info; static /* const */ char *xinput_extension_name = INAME; @@ -961,7 +959,7 @@ sizeDeviceEvent(int buttons_len, int valuators_len, * * Also used from copy_classes in XIQueryDevice.c */ -int +static int sizeDeviceClassType(int type, int num_elements) { int l = 0; @@ -1342,7 +1340,7 @@ wireToDeviceEvent(xXIDeviceEvent *in, XGenericEventCookie* cookie) return 1; } -int +_X_HIDDEN int size_classes(xXIAnyInfo* from, int nclasses) { int len, i; @@ -1383,7 +1381,7 @@ size_classes(xXIAnyInfo* from, int nclasses) * |________|___________^ * |______________________^ */ -int +_X_HIDDEN int copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses) { XIAnyClassInfo *any_lib; commit 71bd1455054b73f7a79b9c161579e961741f63dd Author: Julien Cristau <[email protected]> Date: Tue Sep 29 14:07:21 2009 +0200 Bump shlibs and update symbols. diff --git a/debian/changelog b/debian/changelog index 26a0381..0147314 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ libxi (2:1.2.99.4-1) UNRELEASED; urgency=low * New upstream release candidate. * XInput.h moved here from x11proto-input-dev; add Replaces. * Also remove config.h.in in clean. + * Bump shlibs and update symbols. -- Timo Aaltonen <[email protected]> Fri, 31 Jul 2009 14:25:21 +0300 diff --git a/debian/libxi6.symbols b/debian/libxi6.symbols index 8243f12..975a92b 100644 --- a/debian/libxi6.symbols +++ b/debian/libxi6.symbols @@ -27,6 +27,35 @@ libXi.so.6 libxi6 #MINVER# xgetfeedbackcont...@base 0 xgetselectedextensioneve...@base 0 xgrabdev...@base 0 + xialloweve...@base 2:1.2.99.4 + xichangehierar...@base 2:1.2.99.4 + xichangeprope...@base 2:1.2.99.4 + xidefinecur...@base 2:1.2.99.4 + xideleteprope...@base 2:1.2.99.4 + xifreedevicei...@base 2:1.2.99.4 + xigetclientpoin...@base 2:1.2.99.4 + xigetfo...@base 2:1.2.99.4 + xigetprope...@base 2:1.2.99.4 + xigetselectedeve...@base 2:1.2.99.4 + xigrabbut...@base 2:1.2.99.4 + xigrabdev...@base 2:1.2.99.4 + xigraben...@base 2:1.2.99.4 + xigrabfocu...@base 2:1.2.99.4 + xigrabkeyc...@base 2:1.2.99.4 + xilistpropert...@base 2:1.2.99.4 + xiquerydev...@base 2:1.2.99.4 + xiquerypoin...@base 2:1.2.99.4 + xiqueryvers...@base 2:1.2.99.4 + xiselecteve...@base 2:1.2.99.4 + xisetclientpoin...@base 2:1.2.99.4 + xisetfo...@base 2:1.2.99.4 + xiundefinecur...@base 2:1.2.99.4 + xiungrabbut...@base 2:1.2.99.4 + xiungrabdev...@base 2:1.2.99.4 + xiungraben...@base 2:1.2.99.4 + xiungrabfocu...@base 2:1.2.99.4 + xiungrabkeyc...@base 2:1.2.99.4 + xiwarppoin...@base 2:1.2.99.4 xgrabdevicebut...@base 0 xgrabdevice...@base 0 xlistdevicepropert...@base 2:1.2.0 diff --git a/debian/rules b/debian/rules index d70c8b7..ce0a0f6 100755 --- a/debian/rules +++ b/debian/rules @@ -87,7 +87,7 @@ binary-arch: build install dh_strip --dbg-package=$(PACKAGE)-dbg dh_compress dh_fixperms - dh_makeshlibs -V'libxi6 (>= 2:1.2.0)' + dh_makeshlibs -V'libxi6 (>= 2:1.2.99.4)' dh_shlibdeps dh_installdeb dh_gencontrol commit 1cdde6192c7c535e4cd9914a22809e7c808f601e Author: Julien Cristau <[email protected]> Date: Tue Sep 29 14:05:30 2009 +0200 Also remove config.h.in in clean. diff --git a/debian/changelog b/debian/changelog index d184d28..26a0381 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ libxi (2:1.2.99.4-1) UNRELEASED; urgency=low sarge. * New upstream release candidate. * XInput.h moved here from x11proto-input-dev; add Replaces. + * Also remove config.h.in in clean. -- Timo Aaltonen <[email protected]> Fri, 31 Jul 2009 14:25:21 +0300 diff --git a/debian/rules b/debian/rules index a90ba9b..d70c8b7 100755 --- a/debian/rules +++ b/debian/rules @@ -61,8 +61,8 @@ clean: xsfclean rm -rf autom4te.cache */autom4te.cache rm -rf obj-* rm -f $$(find -name Makefile.in) - rm -f compile config.guess config.sub configure depcomp install-sh - rm -f ltmain.sh missing INSTALL aclocal.m4 mkinstalldirs + rm -f INSTALL compile config.guess config.sub configure config.h.in + rm -f depcomp install-sh ltmain.sh missing aclocal.m4 mkinstalldirs dh_clean diff --git a/src/config.h.in b/src/config.h.in index d9e9ca4..1b81ba9 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -30,6 +30,10 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of package */ #undef PACKAGE @@ -45,6 +49,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION commit e6df5c3a5d28dcc3406db7078a53ef03bdea678b Author: Julien Cristau <[email protected]> Date: Tue Sep 29 14:01:23 2009 +0200 XInput.h moved here from x11proto-input-dev; add Replaces. diff --git a/debian/changelog b/debian/changelog index 7ead81b..d184d28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ libxi (2:1.2.99.4-1) UNRELEASED; urgency=low * Drop libxi-dev pre-dependency on x11-common, only needed for upgrades from sarge. * New upstream release candidate. + * XInput.h moved here from x11proto-input-dev; add Replaces. -- Timo Aaltonen <[email protected]> Fri, 31 Jul 2009 14:25:21 +0300 diff --git a/debian/control b/debian/control index b78c06a..85e8958 100644 --- a/debian/control +++ b/debian/control @@ -67,6 +67,8 @@ Package: libxi-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libxi6 (= ${binary:Version}), libx11-dev, libxext-dev, x11proto-input-dev (>= 1.9.99.902) +Replaces: + x11proto-input-dev (<< 1.9.99) Description: X11 Input extension library (development headers) libXi provides an X Window System client interface to the XINPUT extension to the X protocol. diff --git a/debian/libxi-dev.install b/debian/libxi-dev.install index a62f3cb..0d4d5b5 100644 --- a/debian/libxi-dev.install +++ b/debian/libxi-dev.install @@ -1,3 +1,4 @@ usr/lib/libXi.a usr/lib/libXi.so usr/lib/pkgconfig/xi.pc +usr/include/X11/extensions/ commit 9aba942d86498daebf078cec557a4dbd0eaca426 Author: Julien Cristau <[email protected]> Date: Tue Sep 29 13:09:04 2009 +0200 Bump {build-,}dependencies for new upstream diff --git a/debian/control b/debian/control index d410d0d..b78c06a 100644 --- a/debian/control +++ b/debian/control @@ -5,12 +5,14 @@ Maintainer: Debian X Strike Force <[email protected]> Uploaders: David Nusinow <[email protected]>, Drew Parsons <[email protected]>, Jamey Sharp <[email protected]>, Josh Triplett <[email protected]>, Julien Cristau <[email protected]> Build-Depends: debhelper (>= 5.0.0), - libx11-dev (>= 1:0.99.2), - libxext-dev (>= 1:0.99.1), - x11proto-input-dev (>= 1.5), + x11proto-core-dev (>= 7.0.13), + x11proto-xext-dev (>= 7.0.3), + x11proto-input-dev (>= 1.9.99.902), + libx11-dev (>= 2:1.2.99.1), + libxext-dev (>= 2:1.0.99.1), pkg-config, quilt, - xutils-dev, + xutils-dev (>= 1:7.4+4), automake, libtool Standards-Version: 3.8.1 @@ -64,7 +66,7 @@ Description: X11 Input extension library (debug package) Package: libxi-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libxi6 (= ${binary:Version}), libx11-dev, libxext-dev, x11proto-input-dev (>= 1.5) +Depends: ${shlibs:Depends}, ${misc:Depends}, libxi6 (= ${binary:Version}), libx11-dev, libxext-dev, x11proto-input-dev (>= 1.9.99.902) Description: X11 Input extension library (development headers) libXi provides an X Window System client interface to the XINPUT extension to the X protocol. commit e315b4eb865876c2881472ece1e513dda52f4c62 Author: Julien Cristau <[email protected]> Date: Tue Sep 29 12:32:44 2009 +0200 Bump changelogs diff --git a/ChangeLog b/ChangeLog index d2973fa..5f1a987 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,1074 @@ -commit 69422ae36ede8fd5d7975c1e2b74c32906ad8535 +commit eb9a2d63487641faa97d88cef3fa1c892a8f342f Author: Peter Hutterer <[email protected]> -Date: Thu Feb 26 09:20:44 2009 +1000 +Date: Tue Aug 25 11:03:04 2009 +1000 - libXi 1.2.1 + Bump to 1.2.99.4 + +commit 2ce629c30745fc4027d2a95745bf21e8d8c7b893 +Author: Peter Hutterer <[email protected]> +Date: Tue Aug 25 09:55:23 2009 +1000 + + Remove the asciidoc warning from configure. + + This warning was put in when the released version of asciidoc required an + additional patch to build libXi. + The release of asciidoc 8.4.5 included this patch thus we don't need this + explicit warning anymore. + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 17bbc8c30fb34c7130b71e5cc0b0e17093271266 +Author: Peter Hutterer <[email protected]> +Date: Mon Aug 24 15:54:09 2009 +1000 + + man: fix XIQueryPointer parameter ordering. + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 207a7f3d5bd559ffb67de2910795d7cd6508ce09 +Author: Peter Hutterer <[email protected]> +Date: Mon Aug 24 15:31:55 2009 +1000 + + Update XIWarpPointer to take doubles (inputproto >= 1.9.99.902) + + Signed-off-by: Peter Hutterer <[email protected]> + +commit a8a8b40fa447c85eb5d1d61ef416d3cf198c72c1 +Author: Peter Hutterer <[email protected]> +Date: Tue Aug 18 15:21:56 2009 +1000 + + man: XIDefineCursor can generate BadDevice errors. + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 326a0c01ef6e3c1f0577e185c23eec80ecf59192 +Author: Peter Hutterer <[email protected]> +Date: Tue Aug 18 15:08:50 2009 +1000 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
