ChangeLog | 33 +++++++++++++++++++++++++++++++++ configure.ac | 2 +- debian/changelog | 8 ++++++-- man/XIQueryVersion.txt | 6 +++++- src/XExtInt.c | 11 ++++++++++- 5 files changed, 55 insertions(+), 5 deletions(-)
New commits: commit fa882f8626b1bb55797e59752a86a0bfbd0711ab Author: Cyril Brulebois <k...@debian.org> Date: Sun May 20 17:00:05 2012 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index d85be2a..dc91ca6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxi (2:1.6.1-1) UNRELEASED; urgency=low +libxi (2:1.6.1-1) unstable; urgency=low [ Julien Cristau ] * Don't require (fake)root for debian/rules clean. @@ -6,7 +6,7 @@ libxi (2:1.6.1-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * New upstream release. - -- Cyril Brulebois <k...@debian.org> Sun, 20 May 2012 16:59:50 +0200 + -- Cyril Brulebois <k...@debian.org> Sun, 20 May 2012 17:00:03 +0200 libxi (2:1.6.0-1) unstable; urgency=low commit 0d7fd8e911faeb4118cbc80811f92639d735b1aa Author: Cyril Brulebois <k...@debian.org> Date: Sun May 20 17:00:01 2012 +0200 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index 9de2548..dcca8e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,36 @@ +commit ae163b6202d844a46541928d00049b29cbdf930f +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Thu May 3 16:01:35 2012 +1000 + + libXi 1.6.1 + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit fd5e000308925f703ecd15c288127ab33a456425 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Mon Apr 23 13:32:59 2012 +1000 + + man: update XIQueryVersion for current server behaviour + + XIQueryVersion(v1); + XIQueryVersion(v2); + + is now ok as long as v1 <= v2. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Jeremy Huddleston <jerem...@apple.com> + +commit f8f44f42eb543ecd944a84facba6c09bf48e7711 +Author: Chase Douglas <chase.doug...@canonical.com> +Date: Fri Apr 20 15:30:30 2012 -0700 + + Destroy extension record after last display is removed + + The extension record is currently leaked and never freed. + + Signed-off-by: Chase Douglas <chase.doug...@canonical.com> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + commit 2ac185d2fd2b884f4f59a7f7f61f414d139859aa Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Mon Mar 26 09:07:34 2012 +1000 diff --git a/debian/changelog b/debian/changelog index f37a210..d85be2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -libxi (2:1.6.0-2) UNRELEASED; urgency=low +libxi (2:1.6.1-1) UNRELEASED; urgency=low + [ Julien Cristau ] * Don't require (fake)root for debian/rules clean. - -- Julien Cristau <jcris...@debian.org> Thu, 19 Apr 2012 23:38:32 +0200 + [ Cyril Brulebois ] + * New upstream release. + + -- Cyril Brulebois <k...@debian.org> Sun, 20 May 2012 16:59:50 +0200 libxi (2:1.6.0-1) unstable; urgency=low commit ae163b6202d844a46541928d00049b29cbdf930f Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Thu May 3 16:01:35 2012 +1000 libXi 1.6.1 Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/configure.ac b/configure.ac index fc8c1f2..2d3a46a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXi], [1.6.0], +AC_INIT([libXi], [1.6.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([src/config.h]) commit fd5e000308925f703ecd15c288127ab33a456425 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Mon Apr 23 13:32:59 2012 +1000 man: update XIQueryVersion for current server behaviour XIQueryVersion(v1); XIQueryVersion(v2); is now ok as long as v1 <= v2. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Reviewed-by: Jeremy Huddleston <jerem...@apple.com> diff --git a/man/XIQueryVersion.txt b/man/XIQueryVersion.txt index 53118ed..839c18c 100644 --- a/man/XIQueryVersion.txt +++ b/man/XIQueryVersion.txt @@ -42,8 +42,12 @@ DESCRIPTION cases major_version_inout and minor_version_inout are set to the server's supported version. - XIQueryVersion can generate a BadValue error. + Consecutive calls to XIQueryVersion by the same client always return the + first returned major.minor version. If the client requests a version + lower than the first returned major.minor version in a subsequent call, a + BadValue error occurs. + XIQueryVersion can generate a BadValue error. EXAMPLES -------- commit f8f44f42eb543ecd944a84facba6c09bf48e7711 Author: Chase Douglas <chase.doug...@canonical.com> Date: Fri Apr 20 15:30:30 2012 -0700 Destroy extension record after last display is removed The extension record is currently leaked and never freed. Signed-off-by: Chase Douglas <chase.doug...@canonical.com> Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/src/XExtInt.c b/src/XExtInt.c index 43738a2..27638bd 100644 --- a/src/XExtInt.c +++ b/src/XExtInt.c @@ -434,7 +434,16 @@ XInputClose( XFree((char *)((XInputData *) info->data)->vers); XFree((char *)info->data); } - return XextRemoveDisplay(xinput_info, dpy); + + if (!XextRemoveDisplay(xinput_info, dpy)) + return 0; + + if (xinput_info->ndisplays == 0) { + XextDestroyExtension(xinput_info); + xinput_info = NULL; + } + + return 1; } static int -- 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/e1sw86h-0003cu...@vasks.debian.org