libxi: Changes to 'ubuntu'
ChangeLog | 48 +++++++++
README | 25 ++++
configure.ac | 2
debian/changelog | 45 ++++++++
debian/libxi6.symbols | 51 ++++++++++
debian/patches/101_fix_devicepresence_declaration_cplusplus.diff | 24 ++++
debian/patches/series | 1
debian/rules | 2
src/XGetDCtl.c | 7 -
src/XListDProp.c | 12 --
10 files changed, 203 insertions(+), 14 deletions(-)
New commits:
commit 1d5a0804f337a8731ea9a834357863d371873bab
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri May 15 11:23:47 2009 +0300
Release 1.2.1-2ubuntu1
update the changelog.
diff --git a/debian/changelog b/debian/changelog
index 9017833..c0ebcb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+libxi (2:1.2.1-2ubuntu1) karmic; urgency=low
+
+ * Merge with Debian experimental, remaining changes:
+ - debian/control: libxi-dev Replaces x11proto-input-dev (<= 1.4.3-2)
+ - copy XInput.h from inputproto 1.5.0, libxi-dev includes it.
+ Upstream decided not to move it for 1.2.0, but we already had it so
+ continue shipping it in libxi-dev.
+ - 100_install_xinput.h.diff: Modify the Makefile.am to install
+ XInput.h.
+ - 101_fix_devicepresence_declaration_cplusplus.diff:
+ Use extern "C" in the declaration for DevicePresence (in
+ XInput.h) so that it can be accessed from C++.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 15 May 2009 11:22:00 +0300
+
libxi (2:1.2.1-2) unstable; urgency=low
* Fix typo in debian/rules, which made us build with make -j if
commit 5e64cc1f789a23bb9c75d56efc361183c9cf99db
Author: Alberto Milone <alberto.milone@canonical.com>
Date: Fri May 15 11:16:26 2009 +0300
101_fix_devicepresence_declaration_cplusplus.diff:
- Use extern "C" in the declaration for DevicePresence (in
XInput.h) so that it can be accessed from C++ (LP: #373711).
diff --git a/debian/changelog b/debian/changelog
index 8bcaefa..029eb17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libxi (2:1.2.0-1ubuntu2) karmic; urgency=low
+
+ [ Alberto Milone ]
+ * debian/patches/101_fix_devicepresence_declaration_cplusplus.diff:
+ - Use extern "C" in the declaration for DevicePresence (in
+ XInput.h) so that it can be accessed from C++ (LP: #373711).
+
+ -- Alberto Milone <alberto.milone@canonical.com> Fri, 08 May 2009 17:05:49 +0200
+
libxi (2:1.2.0-1ubuntu1) jaunty; urgency=low
* Merge with Debian experimental, remaining changes:
diff --git a/debian/patches/101_fix_devicepresence_declaration_cplusplus.diff b/debian/patches/101_fix_devicepresence_declaration_cplusplus.diff
new file mode 100644
index 0000000..3758b01
--- /dev/null
+++ b/debian/patches/101_fix_devicepresence_declaration_cplusplus.diff
@@ -0,0 +1,24 @@
+Index: libxi/include/X11/extensions/XInput.h
+===================================================================
+--- libxi-1.2.0.orig/include/X11/extensions/XInput.h 2009-05-08 15:25:01.000000000 +0200
++++ libxi-1.2.0/include/X11/extensions/XInput.h 2009-05-08 15:40:12.000000000 +0200
+@@ -156,9 +156,18 @@
+ #define NoExtensionEvent(d,type,_class) \
+ { _class = ((XDevice *) d)->device_id << 8 | _noExtensionEvent;}
+
++
++/* We need the declaration for DevicePresence. */
++#if defined(__cplusplus) || defined(c_plusplus)
++extern "C" {
++#endif
++ extern int _XiGetDevicePresenceNotifyEvent(Display *);
++#if defined(__cplusplus) || defined(c_plusplus)
++}
++#endif
++
+ #define DevicePresence(dpy, type, _class) \
+ { \
+- extern int _XiGetDevicePresenceNotifyEvent(Display *); \
+ type = _XiGetDevicePresenceNotifyEvent(dpy); \
+ _class = (0x10000 | _devicePresence); \
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 01a17de..1c54206 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
100_install_xinput.h.diff
+101_fix_devicepresence_declaration_cplusplus.diff
commit 78b6f5770ea5df55763e06131c6e9ecc5ddd9b7d
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 16 15:27:59 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 58039b3..e615ac7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libxi (2:1.2.1-2) UNRELEASED; urgency=low
+libxi (2:1.2.1-2) unstable; urgency=low
* Fix typo in debian/rules, which made us build with make -j if
DEB_BUILD_OPTIONS didn't ask for it. Thanks to Samuel Thibault for
reporting the problem!
- -- Julien Cristau <jcristau@debian.org> Mon, 16 Mar 2009 15:24:30 +0100
+ -- Julien Cristau <jcristau@debian.org> Mon, 16 Mar 2009 15:27:45 +0100
libxi (2:1.2.1-1) unstable; urgency=low
commit 5ff220c4c83fffc11ccb52f779909c6a452720f9
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 16 15:27:28 2009 +0100
debian/rules: fix logic error
Fix typo in debian/rules, which made us build with make -j if
DEB_BUILD_OPTIONS didn't ask for it. Thanks to Samuel Thibault
for reporting the problem!
diff --git a/debian/changelog b/debian/changelog
index c113eb7..58039b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libxi (2:1.2.1-2) UNRELEASED; urgency=low
+
+ * Fix typo in debian/rules, which made us build with make -j if
+ DEB_BUILD_OPTIONS didn't ask for it. Thanks to Samuel Thibault for
+ reporting the problem!
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 16 Mar 2009 15:24:30 +0100
+
libxi (2:1.2.1-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/rules b/debian/rules
index 493e832..a90ba9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
else
CFLAGS += -O2
endif
-ifeq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif
commit b115e074f632655741e046514c646dc08fc3e015
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Mar 12 16:06:05 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index eb530b8..c113eb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libxi (2:1.2.1-1) UNRELEASED; urgency=low
+libxi (2:1.2.1-1) unstable; urgency=low
* New upstream release.
- -- Julien Cristau <jcristau@debian.org> Thu, 12 Mar 2009 15:44:27 +0100
+ -- Julien Cristau <jcristau@debian.org> Thu, 12 Mar 2009 16:00:29 +0100
libxi (2:1.2.0-2) unstable; urgency=low
commit b087dd09975518ad3ed93ca215e46fd106f6a1e1
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Mar 12 15:44:49 2009 +0100
update changelogs
diff --git a/ChangeLog b/ChangeLog
index 90418e0..d2973fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+commit 69422ae36ede8fd5d7975c1e2b74c32906ad8535
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Feb 26 09:20:44 2009 +1000
+
+ libXi 1.2.1
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit f63ea39a328ce0e5e6c980243e2ebea15634dc7d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Feb 25 17:00:16 2009 +1000
+
+ XGetDeviceControl: size the libXi structs, not the wire structs (#20293)
+
+ X.Org Bug 20293 <http://bugs.freedesktop.org/show_bug.cgi?id=20293>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit cbdc33d903ec6f90a42ec3c31905eeaef9ecf0a2)
+
+commit 6e65cf0776019b2eec6be4a06fef7838562e94a8
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Feb 25 16:59:04 2009 +1000
+
+ XGetDeviceControl: Add a missing break leading to wrong length calculation.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 78f64722c57ff5ec5d0ae35da0c8f151598e6d6b)
+
+commit 17df06d5aeceb4798caf487a1d57efe58fa7e3fa
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Feb 2 20:34:34 2009 -0800
+
+ Add README with pointers to mailing list, bugzilla & git repos
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+ (cherry picked from commit 6e1159a9059d762d6b5d24455237a088e839fe2c)
+
+commit f2f92b1df861c1f571edc89eddbb8d72a228e2a8
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Thu Jan 29 19:30:30 2009 -0200
+
+ Return NULL on error, and match LockDisplay with UnlockDisplay.
+ (cherry picked from commit ba2546a51d5f9087ec54fba7cae46ea1f210198a)
+
commit 2d586065649304b2864afddee6f6225a4a61a0c9
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Dec 3 12:50:45 2008 +1000
@@ -233,14 +277,14 @@ Date: Sat Oct 14 23:56:20 2006 -0700
Add *.o to .gitignore.
commit 6e08a76fd8e356f98d2d6913f0c1b1401090768d
-Merge: ba84e84... 360ceac...
+Merge: ba84e84 360ceac
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Sep 24 20:02:24 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/lib/libXi
commit ba84e84575b4167b0c6298e86a860b0741e2d2a3
-Merge: 93d3c2c... 576c579...
+Merge: 93d3c2c 576c579
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Sep 24 19:58:56 2006 +0300
diff --git a/debian/changelog b/debian/changelog
index f0fc06c..eb530b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxi (2:1.2.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 12 Mar 2009 15:44:27 +0100
+
libxi (2:1.2.0-2) unstable; urgency=low
* Add symbols file.
commit 69422ae36ede8fd5d7975c1e2b74c32906ad8535
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 26 09:20:44 2009 +1000
libXi 1.2.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index aded614..6cef716 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(libXi, 1.2.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
+AC_INIT(libXi, 1.2.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit f63ea39a328ce0e5e6c980243e2ebea15634dc7d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 25 17:00:16 2009 +1000
XGetDeviceControl: size the libXi structs, not the wire structs (#20293)
X.Org Bug 20293 <http://bugs.freedesktop.org/show_bug.cgi?id=20293>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit cbdc33d903ec6f90a42ec3c31905eeaef9ecf0a2)
diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c
index bdddfd7..2012ee8 100644
--- a/src/XGetDCtl.c
+++ b/src/XGetDCtl.c
@@ -122,17 +122,17 @@ XGetDeviceControl(dpy, dev, control)
}
case DEVICE_ABS_CALIB:
{
- size += sizeof(xDeviceAbsCalibState);
+ size += sizeof(XDeviceAbsCalibState);
break;
}
case DEVICE_ABS_AREA:
{
- size += sizeof(xDeviceAbsAreaState);
+ size += sizeof(XDeviceAbsAreaState);
break;
}
case DEVICE_CORE:
{
- size += sizeof(xDeviceCoreState);
+ size += sizeof(XDeviceCoreState);
break;
}
default:
commit 6e65cf0776019b2eec6be4a06fef7838562e94a8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 25 16:59:04 2009 +1000
XGetDeviceControl: Add a missing break leading to wrong length calculation.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 78f64722c57ff5ec5d0ae35da0c8f151598e6d6b)
diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c
index 7689059..bdddfd7 100644
--- a/src/XGetDCtl.c
+++ b/src/XGetDCtl.c
@@ -133,6 +133,7 @@ XGetDeviceControl(dpy, dev, control)
case DEVICE_CORE:
{
size += sizeof(xDeviceCoreState);
+ break;
}
default:
size += d->length;
commit 17df06d5aeceb4798caf487a1d57efe58fa7e3fa
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 2 20:34:34 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
(cherry picked from commit 6e1159a9059d762d6b5d24455237a088e839fe2c)
diff --git a/README b/README
index e69de29..44c705e 100644
--- a/README
+++ b/README
@@ -0,0 +1,25 @@
+libXi - library for the X Input Extension
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/lib/libXi
+
+ http://cgit.freedesktop.org/xorg/lib/libXi
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
commit f2f92b1df861c1f571edc89eddbb8d72a228e2a8
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Jan 29 19:30:30 2009 -0200
Return NULL on error, and match LockDisplay with UnlockDisplay.
(cherry picked from commit ba2546a51d5f9087ec54fba7cae46ea1f210198a)
diff --git a/src/XListDProp.c b/src/XListDProp.c
index aee2737..66b9eca 100644
--- a/src/XListDProp.c
+++ b/src/XListDProp.c
@@ -49,33 +49,31 @@ XListDeviceProperties(Display* dpy, XDevice* dev, int *nprops_return)
Atom *props = NULL;
LockDisplay(dpy);
+ *nprops_return = 0;
if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
+ goto cleanup;
GetReq(ListDeviceProperties, req);
req->reqType = info->codes->major_opcode;
req->ReqType = X_ListDeviceProperties;
req->deviceid = dev->device_id;
- if (!_XReply(dpy, (xReply*)&rep, 0, xFalse)) {
- *nprops_return = 0;
+ if (!_XReply(dpy, (xReply*)&rep, 0, xFalse))
goto cleanup;
- }
-
- *nprops_return = rep.nAtoms;
if (rep.nAtoms) {
props = (Atom*)Xmalloc(rep.nAtoms * sizeof(Atom));
if (!props)
{
_XEatData(dpy, rep.nAtoms << 2);
- *nprops_return = 0;
goto cleanup;
}
_XRead32(dpy, props, rep.nAtoms << 2);
}
+ *nprops_return = rep.nAtoms;
+
cleanup:
UnlockDisplay(dpy);
SyncHandle();
commit 5e2f288fe4e3a137f0bd5b1281ee049c93659324
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Feb 16 19:54:18 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index e7fa55e..f0fc06c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-libxi (2:1.2.0-2) UNRELEASED; urgency=low
+libxi (2:1.2.0-2) unstable; urgency=low
* Add symbols file.
+ * Upload to unstable.
- -- Julien Cristau <jcristau@debian.org> Fri, 19 Dec 2008 16:26:53 +0100
+ -- Julien Cristau <jcristau@debian.org> Mon, 16 Feb 2009 19:53:01 +0100
libxi (2:1.2.0-1) experimental; urgency=low
commit c56ad36872334ea09fb046ea8882031b528c22c1
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Dec 21 16:33:57 2008 +0100
Remove private functions from the symbols file
diff --git a/debian/libxi6.symbols b/debian/libxi6.symbols
index e9c7917..8243f12 100644
--- a/debian/libxi6.symbols
+++ b/debian/libxi6.symbols
@@ -29,7 +29,6 @@ libXi.so.6 libxi6 #MINVER#
XGrabDevice@Base 0
XGrabDeviceButton@Base 0
XGrabDeviceKey@Base 0
- XInput_find_display@Base 0
XListDeviceProperties@Base 2:1.2.0
XListInputDevices@Base 0
XOpenDevice@Base 0
@@ -44,10 +43,7 @@ libXi.so.6 libxi6 #MINVER#
XUngrabDevice@Base 0
XUngrabDeviceButton@Base 0
XUngrabDeviceKey@Base 0
- _XiCheckExtInit@Base 0
- _XiEventToWire@Base 0
_XiGetDevicePresenceNotifyEvent@Base 2:1.1.2
- _XiGetExtensionVersion@Base 0
_xibadclass@Base 0
_xibaddevice@Base 0
_xibadevent@Base 0
commit e0c3b107aac7b9b6222890ca36f0f2090302c5a1
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Dec 19 16:30:28 2008 +0100
Add symbols file.
diff --git a/debian/changelog b/debian/changelog
index 5a911fd..e7fa55e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxi (2:1.2.0-2) UNRELEASED; urgency=low
+
+ * Add symbols file.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 19 Dec 2008 16:26:53 +0100
+
libxi (2:1.2.0-1) experimental; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/libxi6.symbols b/debian/libxi6.symbols
new file mode 100644
index 0000000..e9c7917
--- /dev/null
+++ b/debian/libxi6.symbols
@@ -0,0 +1,55 @@
+libXi.so.6 libxi6 #MINVER#
+ XAllowDeviceEvents@Base 0
+ XChangeDeviceControl@Base 0
+ XChangeDeviceDontPropagateList@Base 0
+ XChangeDeviceKeyMapping@Base 0
+ XChangeDeviceProperty@Base 2:1.2.0
+ XChangeFeedbackControl@Base 0
+ XChangeKeyboardDevice@Base 0
+ XChangePointerDevice@Base 0
+ XCloseDevice@Base 0
+ XDeleteDeviceProperty@Base 2:1.2.0
+ XDeviceBell@Base 0
+ XFreeDeviceControl@Base 0
+ XFreeDeviceList@Base 0
+ XFreeDeviceMotionEvents@Base 0
+ XFreeDeviceState@Base 0
+ XFreeFeedbackList@Base 0
+ XGetDeviceButtonMapping@Base 0
+ XGetDeviceControl@Base 0
+ XGetDeviceDontPropagateList@Base 0
+ XGetDeviceFocus@Base 0
+ XGetDeviceKeyMapping@Base 0
+ XGetDeviceModifierMapping@Base 0
+ XGetDeviceMotionEvents@Base 0
+ XGetDeviceProperty@Base 2:1.2.0
+ XGetExtensionVersion@Base 0
+ XGetFeedbackControl@Base 0
+ XGetSelectedExtensionEvents@Base 0
+ XGrabDevice@Base 0
+ XGrabDeviceButton@Base 0
+ XGrabDeviceKey@Base 0
+ XInput_find_display@Base 0
+ XListDeviceProperties@Base 2:1.2.0
+ XListInputDevices@Base 0
+ XOpenDevice@Base 0
+ XQueryDeviceState@Base 0
+ XSelectExtensionEvent@Base 0
+ XSendExtensionEvent@Base 0
+ XSetDeviceButtonMapping@Base 0
+ XSetDeviceFocus@Base 0
+ XSetDeviceMode@Base 0
+ XSetDeviceModifierMapping@Base 0
+ XSetDeviceValuators@Base 0
+ XUngrabDevice@Base 0
+ XUngrabDeviceButton@Base 0
+ XUngrabDeviceKey@Base 0
+ _XiCheckExtInit@Base 0
+ _XiEventToWire@Base 0
+ _XiGetDevicePresenceNotifyEvent@Base 2:1.1.2
+ _XiGetExtensionVersion@Base 0
+ _xibadclass@Base 0
+ _xibaddevice@Base 0
+ _xibadevent@Base 0
+ _xibadmode@Base 0
+ _xidevicebusy@Base 0
Reply to: