Update to libXi 1.7.4

3 files changed, 55 insertions, 14 deletions

diff --git a/lib/libXi/man/Makefile.in b/lib/libXi/man/Makefile.in
index de3e73924..271363740 100644
--- a/lib/libXi/man/Makefile.in
+++ b/lib/libXi/man/Makefile.in
@@ -190,6 +190,7 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -402,7 +403,7 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .man .$(LIB_MAN_SUFFIX) .txt .xml
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -427,9 +428,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
diff --git a/lib/libXi/man/XIQueryVersion.man b/lib/libXi/man/XIQueryVersion.man
index 775b94aa2..b949a5e5d 100644
--- a/lib/libXi/man/XIQueryVersion.man
+++ b/lib/libXi/man/XIQueryVersion.man
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: xiqueryversion
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 03/09/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 08/08/2013
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "XIQUERYVERSION" "libmansuffix" "03/09/2013" "\ \&" "\ \&"
+.TH "XIQUERYVERSION" "libmansuffix" "08/08/2013" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -92,10 +92,38 @@ server\*(Aqs supported version\&.
 .RS 4
 .\}
 .nf
-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\&.
+If the client has previously called XIQueryVersion, then the result
+depends on the previously requested version and the currently
+requested version\&.
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+If either the previous or current requested versions is less than
+2\&.2, or if the requested major version numbers do not match, then
+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\&.
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+If all of the requested versions are 2\&.2 or greater, then
+consecutive calls to XIQueryVersion by the same client with the
+same major version will return the requested version, but the server
+will operate according to the highest requested version number or
+the highest supported version, whichever is lower\&.
 .fi
 .if n \{\
 .RE
diff --git a/lib/libXi/man/XIQueryVersion.txt b/lib/libXi/man/XIQueryVersion.txt
index 839c18ca1..bb2cbb398 100644
--- a/lib/libXi/man/XIQueryVersion.txt
+++ b/lib/libXi/man/XIQueryVersion.txt
@@ -42,10 +42,22 @@ DESCRIPTION
    cases major_version_inout and minor_version_inout are set to the 
    server's supported version.
 
-   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.
+   If the client has previously called XIQueryVersion, then the result
+   depends on the previously requested version and the currently
+   requested version.
+
+   If either the previous or current requested versions is less than
+   2.2, or if the requested major version numbers do not match, then
+   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.
+
+   If all of the requested versions are 2.2 or greater, then
+   consecutive calls to XIQueryVersion by the same client with the
+   same major version will return the requested version, but the server
+   will operate according to the highest requested version number or
+   the highest supported version, whichever is lower.
 
    XIQueryVersion can generate a BadValue error.