ChangeLog | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
README | 25 +++++++++++++++++++++++++
configure.ac | 2 +-
debian/changelog | 6 ++++++
src/XGetDCtl.c | 7 ++++---
src/XListDProp.c | 12 +++++-------
6 files changed, 87 insertions(+), 13 deletions(-)
New commits:
commit b115e074f632655741e046514c646dc08fc3e015
Author: Julien Cristau <jcris...@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 <jcris...@debian.org> Thu, 12 Mar 2009 15:44:27 +0100
+ -- Julien Cristau <jcris...@debian.org> Thu, 12 Mar 2009 16:00:29 +0100
libxi (2:1.2.0-2) unstable; urgency=low
commit b087dd09975518ad3ed93ca215e46fd106f6a1e1
Author: Julien Cristau <jcris...@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.hutte...@who-t.net>
+Date: Thu Feb 26 09:20:44 2009 +1000
+
+ libXi 1.2.1
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit f63ea39a328ce0e5e6c980243e2ebea15634dc7d
+Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net>
+ (cherry picked from commit cbdc33d903ec6f90a42ec3c31905eeaef9ecf0a2)
+
+commit 6e65cf0776019b2eec6be4a06fef7838562e94a8
+Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net>
+ (cherry picked from commit 78f64722c57ff5ec5d0ae35da0c8f151598e6d6b)
+
+commit 17df06d5aeceb4798caf487a1d57efe58fa7e3fa
+Author: Alan Coopersmith <alan.coopersm...@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.coopersm...@sun.com>
+ (cherry picked from commit 6e1159a9059d762d6b5d24455237a088e839fe2c)
+
+commit f2f92b1df861c1f571edc89eddbb8d72a228e2a8
+Author: Paulo Cesar Pereira de Andrade <p...@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.hutte...@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 <dan...@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 <dan...@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 <jcris...@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.hutte...@who-t.net>
Date: Thu Feb 26 09:20:44 2009 +1000
libXi 1.2.1
Signed-off-by: Peter Hutterer <peter.hutte...@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.hutte...@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.hutte...@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.hutte...@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.hutte...@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.coopersm...@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.coopersm...@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 <p...@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();
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
