[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

libxi: Changes to 'debian-experimental'



 ChangeLog                        |  851 +++++++++++++++++++++++++++
 Makefile.am                      |    2 
 configure.ac                     |   49 -
 debian/changelog                 |   60 +
 debian/control                   |   25 
 debian/libxi-dev.install         |   14 
 debian/libxi6-udeb.install       |    2 
 debian/libxi6.install            |    2 
 debian/patches/series            |    1 
 debian/rules                     |   16 
 doc/.gitignore                   |    6 
 doc/Makefile.am                  |   66 --
 doc/porting.xml                  | 1209 ---------------------------------------
 docbook.am                       |  105 +++
 include/X11/extensions/XInput2.h |   13 
 man/Makefile.am                  |   15 
 man/XGetExtensionVersion.txt     |   11 
 man/XGetFeedbackControl.txt      |   55 -
 man/XIChangeHierarchy.txt        |    3 
 man/XIChangeProperty.txt         |   16 
 man/XIGrabButton.txt             |   21 
 man/XIGrabDevice.txt             |   15 
 man/XIGrabEnter.txt              |   21 
 man/XIQueryDevice.txt            |   41 +
 man/XIQueryPointer.txt           |    3 
 specs/.gitignore                 |    3 
 specs/Makefile.am                |   68 --
 specs/encoding.xml               |    2 
 specs/inputlib.xml               |   47 -
 specs/library.xml                |  446 +++++++-------
 src/Makefile.am                  |   11 
 src/XExtInt.c                    |   98 ++-
 src/XIAllowEvents.c              |    2 
 src/XIDefineCursor.c             |    2 
 src/XIGetDevFocus.c              |    2 
 src/XIGrabDevice.c               |   10 
 src/XIHierarchy.c                |    5 
 src/XIPassiveGrab.c              |   10 
 src/XIProperties.c               |    8 
 src/XIQueryDevice.c              |   14 
 src/XIQueryPointer.c             |    5 
 src/XISelEv.c                    |    6 
 src/XISetCPtr.c                  |   62 ++
 src/XISetDevFocus.c              |    2 
 src/XIWarpPointer.c              |    2 
 src/XIint.h                      |   15 
 src/XListDProp.c                 |    2 
 src/XSetCPtr.c                   |   62 --
 src/XSndExEv.c                   |   11 
 49 files changed, 1706 insertions(+), 1811 deletions(-)

New commits:
commit 797f55bf0a2d489f858f44adf751abf661910ae9
Author: Cyril Brulebois <kibi@debian.org>
Date:   Thu Dec 15 15:03:42 2011 +0100

    Add -c4 to dh_makeshlibs.

diff --git a/debian/changelog b/debian/changelog
index 1fc2b61..0c13a92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libxi (2:1.4.99.1-1) UNRELEASED; urgency=low
     - Add xsltproc.
   * Update libxi-dev.install: specs/ and docs/ have been merged.
   * Don't install *.db yet.
+  * Add -c4 to dh_makeshlibs.
 
  -- Cyril Brulebois <kibi@debian.org>  Thu, 15 Dec 2011 14:44:42 +0100
 
diff --git a/debian/rules b/debian/rules
index 8ab6c16..2959206 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,7 +98,7 @@ binary-arch: build install
 	dh_strip -N$(PACKAGE)
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs -V'libxi6 (>= 2:1.2.99.4)' --add-udeb=$(PACKAGE)-udeb
+	dh_makeshlibs -V'libxi6 (>= 2:1.2.99.4)' --add-udeb=$(PACKAGE)-udeb -- -c4
 	dh_shlibdeps
 	dh_installdeb
 	dh_gencontrol

commit 1ecc1b4b7de4dc5b07b1723d2543ef9b707e5861
Author: Cyril Brulebois <kibi@debian.org>
Date:   Thu Dec 15 14:54:58 2011 +0100

    Don't install *.db yet.

diff --git a/debian/changelog b/debian/changelog
index 8162a46..1fc2b61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libxi (2:1.4.99.1-1) UNRELEASED; urgency=low
     - Bump xutils-dev, x11proto-input-dev, xorg-sgml-doctools.
     - Add xsltproc.
   * Update libxi-dev.install: specs/ and docs/ have been merged.
+  * Don't install *.db yet.
 
  -- Cyril Brulebois <kibi@debian.org>  Thu, 15 Dec 2011 14:44:42 +0100
 
diff --git a/debian/rules b/debian/rules
index d68052a..8ab6c16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,6 +89,7 @@ binary-arch: build install
 
 	dh_installdocs
 	find debian/tmp -name '*.xml' -delete
+	find debian/tmp -name '*.db' -delete
 	dh_install --sourcedir=debian/tmp --fail-missing --exclude=libXi.la --exclude=usr/share/man/man3
 	dh_installman
 	dh_installchangelogs ChangeLog

commit ae8cef890b237c94950a806789284960f31cebc2
Author: Cyril Brulebois <kibi@debian.org>
Date:   Thu Dec 15 14:52:21 2011 +0100

    Update libxi-dev.install: specs/ and docs/ have been merged.

diff --git a/debian/changelog b/debian/changelog
index 8c5e8b3..8162a46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxi (2:1.4.99.1-1) UNRELEASED; urgency=low
   * Update build dependencies accordingly:
     - Bump xutils-dev, x11proto-input-dev, xorg-sgml-doctools.
     - Add xsltproc.
+  * Update libxi-dev.install: specs/ and docs/ have been merged.
 
  -- Cyril Brulebois <kibi@debian.org>  Thu, 15 Dec 2011 14:44:42 +0100
 
diff --git a/debian/libxi-dev.install b/debian/libxi-dev.install
index dd8b3e3..5f68330 100644
--- a/debian/libxi-dev.install
+++ b/debian/libxi-dev.install
@@ -2,7 +2,5 @@ usr/lib/*/libXi.a
 usr/lib/*/libXi.so
 usr/lib/*/pkgconfig/xi.pc
 usr/include/X11/extensions/
-usr/share/doc/libXi/specs/*.html usr/share/doc/libxi-dev
-usr/share/doc/libXi/specs/*.txt  usr/share/doc/libxi-dev
-usr/share/doc/libXi/doc/*.html usr/share/doc/libxi-dev
-usr/share/doc/libXi/doc/*.txt  usr/share/doc/libxi-dev
+usr/share/doc/libXi/*.html usr/share/doc/libxi-dev
+usr/share/doc/libXi/*.txt  usr/share/doc/libxi-dev

commit 171979cbc178deb91d6be6c9f6f96c768f93809e
Author: Cyril Brulebois <kibi@debian.org>
Date:   Thu Dec 15 14:49:03 2011 +0100

    Update build dependencies accordingly.

diff --git a/debian/changelog b/debian/changelog
index 2bddb40..8c5e8b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ libxi (2:1.4.99.1-1) UNRELEASED; urgency=low
 
   * New upstream release candidate:
     - With multitouch support.
+  * Update build dependencies accordingly:
+    - Bump xutils-dev, x11proto-input-dev, xorg-sgml-doctools.
+    - Add xsltproc.
 
  -- Cyril Brulebois <kibi@debian.org>  Thu, 15 Dec 2011 14:44:42 +0100
 
diff --git a/debian/control b/debian/control
index 7c4656c..6eef8fa 100644
--- a/debian/control
+++ b/debian/control
@@ -7,19 +7,20 @@ Build-Depends:
  debhelper (>= 8.1.3),
  x11proto-core-dev (>= 7.0.13),
  x11proto-xext-dev (>= 7.0.3),
- x11proto-input-dev (>= 1.9.99.902),
+ x11proto-input-dev (>= 2.0.99.1),
  libx11-dev (>= 2:1.3.3-2),
  libxext-dev (>= 2:1.1.1-3),
  xmlto,
  asciidoc (>= 8.4.5),
  pkg-config,
  quilt,
- xutils-dev (>= 1:7.5+4),
+ xutils-dev (>= 1:7.6+2),
  automake,
  libtool,
 # specs
  xmlto,
- xorg-sgml-doctools (>= 1:1.5),
+ xorg-sgml-doctools (>= 1:1.8),
+ xsltproc,
  w3m,
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxi

commit 7c8cfaf361a45295d8228a45f4a5865e31d4c1f1
Author: Cyril Brulebois <kibi@debian.org>
Date:   Thu Dec 15 14:45:02 2011 +0100

    Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 29c6227..47c40db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,30 +1,432 @@
-commit 9fd7b9a9652ecebb8eb533c2a30b9fa7bb186b90
+commit c25debae73be50b9a77454ed4d72ffeaab726846
 Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Tue Jun 7 13:32:11 2011 +1000
+Date:   Mon Oct 10 10:24:38 2011 +1000
 
-    libXi 1.4.3
+    Bump to 1.4.99.1
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 
-commit 7bdaa3635b7eb4bd993c317922d35cad7ed0cab9
+commit 7ca05f3094958c04e8f78a786061124c58f8e1f3
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Sep 28 11:16:42 2011 +1000
+
+    Remove superfluous assignment of lib->classes in XIQueryDevices.
+    
+    A few lines south from here we malloc lib->classes, this assignment is a
+    leftover from 225071e2e67fb65a0258397212f9826c9b25e078.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
+
+commit e97c3dd00369b47af067e30e910335b199a2f147
+Author: Matt Dew <marcoz@osource.org>
+Date:   Mon Oct 3 22:05:51 2011 -0600
+
+        1 - fix the capitalization of the ID attriutes to match either the
+            <title> or <funcdef> string it goes with.
+        2 - fix any <linkend>'s that were affected by 1.
+        3 - any <function> in the docs that has an actual funcdef,
+            will become an olink.
+    
+        Signed-off-by: Matt Dew <marcoz@osource.org>
+
+commit 5f9df47340e192d095127e3c7da180b0fb3dc286
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Sep 23 09:04:21 2011 +1000
+
+    Use a separate nclasses variable in XIQueryDevice
+    
+    No functional changes, just clarifying the code. If we skip over unknown
+    classes, lib->num_classes != wire->num_classe. Use a separate variable to
+    make that change more explicit and align the code closer with
+    wireToDeviceChangedEvent.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 2eb34db82dbd8429594c7ce1d361cabf3571edf1
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Fri Sep 16 21:00:19 2011 -0700
+
+    Make shadow man pages generated by asciidoc work with Solaris man
+    
+    Solaris man requires .so entries in man pages include the man section
+    directory, not just the man page filename, even when it's in the same
+    directory, so use sed to add it in.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    
+    This may be a temporary fix only. See
+    http://lists.freedesktop.org/archives/xorg-devel/2011-September/025219.html
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit a43c0a5d2a6cf80df314c96e0b58804dd87868be
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Tue Sep 20 15:11:13 2011 -0400
+
+    specs: refactor and complete copyright legal text
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 552f60789263ad2a1d983cf5b479af63d90f7591
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Sun Sep 18 00:53:56 2011 -0700
+
+    Use AM_CPPFLAGS to use in tree headers before installed headers
+    
+    This addresses a build failure found by the tinderbox.
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+    Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 69f2580fd47cfe24105892e9ffb79cd046954b7d
+Merge: fc5d478 3ed1b46
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Sat Sep 17 06:41:30 2011 +1000
+
+    Merge branch 'smooth-scrolling'
+    
+    Conflicts:
+    	src/XExtInt.c
+
+commit 3ed1b463205295a5ebba7d570a4cb8dfade51a38
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Aug 17 14:50:39 2011 +1000
+
+    Support XI 2.1 XIScrollClass
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 00382417331d0b38373796fd31757be9fd3e9971
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jun 2 13:23:32 2011 +1000
+
+    Support XI 2.1 internally
+    
+    Add the required constants to pretend to support XI 2.1.
+    Having named constants for 2.1 seems a bit pointless, so let's just use the
+    numbers directly.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit fc5d47895c1361763aa7f088b6d8cb3859e3fda8
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Sat Sep 17 06:40:01 2011 +1000
+
+    Require inputproto 2.0.99.1 or later
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 4dcbad7e10289317edc22113c1f451d79df221e1
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Jun 3 15:46:47 2011 +1000
+
+    man: update property and grab man pages for new constants
+    
+    Suggest the use of the new XIGrabModeAsync, etc. defines instead of the core
+    defines. Add a BUGS section to each man page explaining
+    backwards-compatibility.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 14f674296bc23b3cd50f6d302c3064250132c2c1
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Aug 22 13:55:56 2011 +1000
+
+    man: fix typo in XIQueryDevice man page
+    
+    struct name is XIValuatorClassInfo.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 91f928a70246c26cbee00bf59a8e318e9317142e
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Aug 17 15:20:48 2011 +1000
+
+    Handle unknown device classes.
+    
+    If the server sends an unknown device class in response to an XIQueryDevice
+    call, no memory is allocated for these classes but we still write type
+    and sourceid as well as setting to->classes[i]. The latter causes multiple
+    classes to point to the same memory field.
+    
+    Move the common code of assigning these three into the respective class type
+    handlers so to automatically skip any unknown classes.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit f5b4ff2b4bbac5477af337ed63d019b1f1bc21c9
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Sep 15 11:58:31 2011 -0400
+
+    inputlib: restore original title "X Input Device Extension Library"
+    
+    Somehow the title got changed during troff to docbook conversion.
+    Latest troff version:
+    ftp://www.x.org/pub/X11R7.0/doc/PDF/XiLib.pdf
+    
+    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 5174411eb67ff672abb3301268bd4fe06851ce3e
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Sep 15 11:57:12 2011 -0400
+
+    inputlib: prefix 1.0 with the word Version
+    
+    To be consistent with all other docs
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b695f07ac85e76c7502a743343aacb2c93318ac5
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Sep 15 11:56:33 2011 -0400
+
+    inputlib: fix copyright statements
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit d8aea9731674ecb4e313051f866966113473e395
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Mon Sep 12 16:54:45 2011 -0400
+
+    docs: use the &fullrelvers; entity to set X11 release information
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b4690e1d9d0a27e04c7204614c0e88edef210ba7
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Sep 11 19:49:54 2011 -0400
+
+    docs: remove <productnumber> which is not used by default
+    
+    This element is not rendered by default on the title. A template
+    customization is required to display it.
+    X Window System does not have a product number.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 83a3f9d1b06391d5c25602c0b6a3dba63e7abc81
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Sep 8 20:00:00 2011 -0400
+
+    docbook.am: embed css styles inside the HTML HEAD element
+    
+    Rather than referring to the external xorg.css stylesheet, embed the content
+    of the file in the html output produced. This is accomplished by using
+    version 1.10 of xorg-xhtml.xsl.
+    
+    This makes the whole html docs tree much more relocatable.
+    In addition, it eliminates xorg.css as a runtime file which makes
+    xorg-sgml-doctools a build time only package.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit bd4c9c82e889d737f3488c234659216a218d8eb2
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Wed Sep 7 10:31:04 2011 -0400
+
+    docbook.am: global maintenance update - entities, images and olinking
+    
+    Adding support in libX11 for html chunking caused a reorg of docbook.am
+    as well as the xorg-sgml-doctools masterdb for olinking.
+    The parameter img.src.path is added for pdf images.
+    A searchpath to the root builddir is added for local entities, if present.
+    
+    The docbook.am makefile hides all the details and is identical for
+    all 22 modules having DocBook documentation. It is included by a thin
+    Makefile.am which requires no docbook knowledge.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 942dd55eb370e0acea3184de78619766a09f7670
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Jun 3 15:46:47 2011 +1000
+
+    man: update property and grab man pages for new constants
+    
+    Suggest the use of the new XIGrabModeAsync, etc. defines instead of the core
+    defines. Add a BUGS section to each man page explaining
+    backwards-compatibility.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+commit eb5039859810a0fc4e4e594a4a1ccd99c5fecf85
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Aug 22 13:55:56 2011 +1000
+
+    man: fix typo in XIQueryDevice man page
+    
+    struct name is XIValuatorClassInfo.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 635c2c029b1e73311c3f650bcaf7eeb9e782134b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Aug 17 15:20:48 2011 +1000
+
+    Handle unknown device classes.
+    
+    If the server sends an unknown device class in response to an XIQueryDevice
+    call, no memory is allocated for these classes but we still write type
+    and sourceid as well as setting to->classes[i]. The latter causes multiple
+    classes to point to the same memory field.
+    
+    Move the common code of assigning these three into the respective class type
+    handlers so to automatically skip any unknown classes.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit ca73cd3b7630e7eb7d26c61c4af10d35dbce5465
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Aug 12 14:24:26 2011 +1000
+
+    Don't use the protocol defines for 2.0 versioning.
+    
+    Otherwise we run into the old problem again: recompiling libXi against
+    newer inputproto headers will appear to change the version support,
+    potentially causing errors or other misbehaviours.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 5a299d1731d3db16ccdd3a66246c81ca522f1702
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Mon Aug 1 16:47:38 2011 -0700
+
+    Fix the FIXME output in man page .TH macros generated by asciidoc
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit e8531dd6a981c6cf19a1d256c29e886e34e8f51a
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Sep 7 15:21:31 2010 +1000
+
+    Add XI2 library-internal array offsets to XIint.h
+    
+    These defines are currently defined in XI.h and XI2.h. Their only use is as
+    offset into a library-internal array. Add them to XIint.h to have them where
+    they belong.
+    
+    These defines do not have any effect on the protocol. They are simply
+    offsets into an array for libXi-specific version checking. The defines are
+    added to this header for readability, given that we cannot remove them from
+    the protocol without potentially breaking clients (who should never use
+    these anyway, but...) means they will never get hit.
+    
+    Future defines for these offsets will only be added to libXi, not the
+    protocol.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 653b45b7cc275a560c1ea213216a908c125e443d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Jun 24 10:09:10 2011 +1000
+
+    man: Fix formatting in XGetFeedbackControl
+    
+    Indent structs to make them more readable, make "Structures" header an
+    actual header.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 809c9e936b9f5234de03148376d389fdcfa6d40a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Jun 12 18:39:46 2011 -0400
+
+    Install xml versions of specs even if HAVE_XMLTO is false
+    
+    DocBook/XML input source is also a usefull output format that can be viewed
+    with an XML viewer or editor and by some O/S help system.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 94f585af88a6486148ad6514f1f74eb83ce547ef
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Jun 5 16:27:37 2011 -0400
+
+    Install target dbs alongside generated documents
+    
+    This matches a change in xorg-sgml-docs whereby the masterdb will look for
+    the target dbs into the same location as the generated documents.
+    
+    The target dbs are now installed alongside the generated documents.
+    Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which
+    has the potential of installing outside the package prefix and cause
+    distcheck to fail when user does not have write permission in this package.
+    
+    Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11
+
+commit 2d2581479c64b8b44ab91e90ecb04acd5d106ea2
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Jun 9 15:59:23 2011 -0400
+
+    make: use AM_V_at rather than AM_V_GEN to prefix the mv command
+    
+    This will prevent outputting a "GEN" prefix. Moving and removing files
+    is not "generating" anything.
+    
+    Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit f4bdafebaf123c584e1b5e4ff1bc48f7cf4c5b26
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Jun 9 15:49:23 2011 -0400
+
+    make: remove unneeded AM_V_GEN silent rule directive.
+    
+    It happens to be in the middle of the script statement and cause this
+    incorrect output:
+    
+     rm XCloseDevice.man && make
+      GEN    XOpenDevice.3
+    /bin/bash: line 1: @echo: command not found
+    /bin/bash: line 2: @echo: command not found
+    [...]
+    
+    Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit f4930482c24a22c8cdf9da3c96516936ddd1f7b9
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Jun 7 14:12:08 2011 +1000
+
+    Bump to 1.4.99
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 938ef832b892fdefe0d5c2bb4510c91bbbccca9f
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Fri Jun 3 15:10:27 2011 +1000
 
     man: Fix typo in XIChangeProperty
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit 938ef832b892fdefe0d5c2bb4510c91bbbccca9f)
 
-commit 63027b24113b349720f1612a4426933c1364ea28
+commit 597a6a51721d30c4354d1133bb6da6bd2e12446e
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Fri Jun 3 15:02:35 2011 +1000
 
     man: Fix wrong event names in XIGrabButton.
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit 597a6a51721d30c4354d1133bb6da6bd2e12446e)
 
-commit 9affea8cfd3f583647e9c6ea2b5debb97e6904c5
+commit 7736957fa2598800c14a88cae1dd7809b184d743
+Author: Matt Dew <marcoz@osource.org>
+Date:   Tue May 31 20:03:23 2011 -0600
+
+    Add id attributes to funcsynopsis to allow other docs to olink to them.
+    
+    Signed-off-by: Matt Dew <marcoz@osource.org>
+    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 9faab2bc0bdd4d98a04e572a7a5201bfcd3bdc70
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Thu Jun 2 16:21:59 2011 +1000
 
@@ -36,16 +438,45 @@ Date:   Thu Jun 2 16:21:59 2011 +1000
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
     Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-    (cherry picked from commit 9faab2bc0bdd4d98a04e572a7a5201bfcd3bdc70)
 
-commit 641d1e9943208a8b2c2aef843bd17cb22f833b06
+commit 67441d30df756eb715a262d3439865dedd4055e8
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Thu Jun 2 14:17:44 2011 +1000
 
     man: fix missing comma in XIGrabEnter man page
-    (cherry picked from commit 67441d30df756eb715a262d3439865dedd4055e8)
 
-commit f37dee93cb288f11d286c7bc4222b2f571ccfd65
+commit 4a694b3f4f5c92d62526ea1c5461c59df86c13db
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu May 5 09:30:21 2011 +1000
+
+    Silence compiler warning due to differnent event conversion procs
+    
+    XExtInt.c:161:5: warning: initialization from incompatible pointer type
+    
+    XSndExEv.c: In function 'XSendExtensionEvent':
+    XSndExEv.c:84:8: warning: assignment from incompatible pointer type
+    
+    Xlib and libXi differ in the conversion functions. libXi takes an xEvent**
+    and a num_events parameter since it may split an event into multiple
+    xEvents.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit fd680f025b1db22b1069aed2f142f670181574e5
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu May 5 09:20:23 2011 +1000
+
+    Silence compiler warning in XListDProp.c
+    
+    XListDProp.c: In function 'XListDeviceProperties':
+    XListDProp.c:72:9: warning: pointer targets in passing argument 2 of
+    '_XRead32' differ in signedness
+    /usr/include/X11/Xlibint.h:652:13: note: expected 'long int *' but argument
+    is of type 'Atom *'
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit aa2432240ad02c54280f2d11c007969c3eb9b79f
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Thu May 5 09:43:32 2011 +1000
 
@@ -56,9 +487,29 @@ Date:   Thu May 5 09:43:32 2011 +1000
     paragraph are just realignment due to the linebreak.
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit aa2432240ad02c54280f2d11c007969c3eb9b79f)
 
-commit 89c7eff322c60d78c814693ecb28fa6c65159d3e
+commit f148a6279f07f029fc6a5b0a6556ff6622e6686a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Wed Feb 2 17:01:52 2011 -0800
+
+    Move Xinput server API documentation from libXi to xserver
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 4cc2b17a3d069b296837edbd6e81af5bbf9821b4
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue May 3 14:51:12 2011 +1000
+
+    Remove a few unused assignments.
+    
+    Found by static analyzer.
+    
+    Reported-by: Jeremy Huddleston <jeremyhu@apple.com>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit cc6feecae23b321952921cf927bc965386844c8c
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Tue May 3 14:34:22 2011 +1000
 
@@ -71,9 +522,8 @@ Date:   Tue May 3 14:34:22 2011 +1000
     Reported-by: Jeremy Huddleston <jeremyhu@apple.com>
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
     Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-    (cherry picked from commit cc6feecae23b321952921cf927bc965386844c8c)
 
-commit 7c6003718458ede0542233a213e05d67731d3e28
+commit af65475b1f6b7209750220a74aaad9968d54aaf7
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Tue May 3 13:21:02 2011 +1000
 
@@ -110,9 +560,8 @@ Date:   Tue May 3 13:21:02 2011 +1000
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
     Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
     Reviewed-by: Daniel Stone <daniel@fooishbar.org>
-    (cherry picked from commit af65475b1f6b7209750220a74aaad9968d54aaf7)
 
-commit 8abdde71b83ff37b8500282e4856c323be508f67
+commit 18177afd4fb3934d0a9083c599fb96701eec2ad9
 Author: Matthieu Herrb <matthieu.herrb@laas.fr>
 Date:   Fri Apr 1 22:49:09 2011 +0200
 
@@ -123,7 +572,36 @@ Date:   Fri Apr 1 22:49:09 2011 +0200
     architectures.
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit 18177afd4fb3934d0a9083c599fb96701eec2ad9)
+
+commit 75dc4029316c321d8f09fae584024f36c5c85c7f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Feb 27 15:06:18 2011 -0500
+
+    Documentation: add Docbook external references support
+    
+    When writing technical documentation, it is often necessary to cross
+    reference to other information. When that other information is not in the
+    current document, additional support is needed, namely <olink>.
+    
+    A new feature with version 1.7 of xorg-sgml-doctools adds references to
+    other documents within or outside this package.
+    
+    This patch adds technical support for this feature but does not change
+    the content of the documentation as seen by the end user.
+    
+    Each book or article must generate a database containing the href
+    of sections that can be referred to from another document. This database
+    is installed in DATAROOTDIR/sgml/X11/dbs. There is a requirement that
+    the value of DATAROOTDIR for xorg-sgml-doctools and for the package
+    documentation is the same. This forms a virtual document tree.
+    
+    This database is consulted by other documents while they are being generated
+    in order to fulfill the missing information for linking.
+    Refer to the xorg-sgml-doctools for further technical information.
+    
+    Co-authored-by: Matt Dew <marcoz@osource.org>
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
 
 commit 32236a7779f721d252d633d06ade306f246421a3
 Author: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/debian/changelog b/debian/changelog
index 0474e91..2bddb40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxi (2:1.4.99.1-1) UNRELEASED; urgency=low
+
+  * New upstream release candidate:
+    - With multitouch support.
+
+ -- Cyril Brulebois <kibi@debian.org>  Thu, 15 Dec 2011 14:44:42 +0100
+
 libxi (2:1.4.3-3) unstable; urgency=low
 
   * Team upload.

commit c25debae73be50b9a77454ed4d72ffeaab726846
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Mon Oct 10 10:24:38 2011 +1000

    Bump to 1.4.99.1
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/configure.ac b/configure.ac
index 245e0f6..10d2e5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libXi], [1.4.99],
+AC_INIT([libXi], [1.4.99.1],
 	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([src/config.h])

commit 7ca05f3094958c04e8f78a786061124c58f8e1f3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Wed Sep 28 11:16:42 2011 +1000

    Remove superfluous assignment of lib->classes in XIQueryDevices.
    
    A few lines south from here we malloc lib->classes, this assignment is a
    leftover from 225071e2e67fb65a0258397212f9826c9b25e078.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Chase Douglas <chase.douglas@canonical.com>

diff --git a/src/XIQueryDevice.c b/src/XIQueryDevice.c
index 464ab4d..af2f27a 100644
--- a/src/XIQueryDevice.c
+++ b/src/XIQueryDevice.c
@@ -78,7 +78,6 @@ XIQueryDevice(Display *dpy, int deviceid, int *ndevices_return)
         lib->use         = wire->use;
         lib->attachment  = wire->attachment;
         lib->enabled     = wire->enabled;
-        lib->classes     = (XIAnyClassInfo**)&lib[1];
         nclasses         = wire->num_classes;
 
         ptr += sizeof(xXIDeviceInfo);

commit e97c3dd00369b47af067e30e910335b199a2f147
Author: Matt Dew <marcoz@osource.org>
Date:   Mon Oct 3 22:05:51 2011 -0600

        1 - fix the capitalization of the ID attriutes to match either the
            <title> or <funcdef> string it goes with.
        2 - fix any <linkend>'s that were affected by 1.
        3 - any <function> in the docs that has an actual funcdef,
            will become an olink.
    
        Signed-off-by: Matt Dew <marcoz@osource.org>

diff --git a/specs/encoding.xml b/specs/encoding.xml
index 7b4bceb..33318d1 100644
--- a/specs/encoding.xml
+++ b/specs/encoding.xml
@@ -1,4 +1,4 @@
-<appendix id="input_extension_protocol_encoding">
+<appendix id="Input_Extension_Protocol_Encoding">
 <title>Input Extension Protocol Encoding</title>
 <para>
 <function>Syntactic Conventions</function>
diff --git a/specs/library.xml b/specs/library.xml
index 4a51e09..b65b234 100644
--- a/specs/library.xml
+++ b/specs/library.xml
@@ -1,5 +1,5 @@
 <chapter><title>Input Extension</title>
-<sect1 id="Input_Extension_Overview">
+<sect1 id='Overview'>
 <title>Overview</title>
 <!-- .XS -->
 <!-- (SN Input Extension Overview -->
@@ -211,7 +211,7 @@ The device supports feedbacks.
 <!-- .LP -->
 Additional classes may be added in the future.
 Functions that support multiple input classes, such as the 
-<function>XListInputDevices</function>
+<xref linkend='XListInputDevices' xrefstyle='select: title'/>
 function that lists all available input devices,
 organize the data they return by input class.  Client programs that
 use these functions should not access data unless it matches a 
@@ -235,24 +235,24 @@ that a client would make is as follows:
 <itemizedlist>
   <listitem>
     <para>
-<function>XListInputDevices</function>
+<xref linkend='XListInputDevices' xrefstyle='select: title'/>
 - lists all of the available input devices.  From the 
 information returned by this request, determine whether the desired input
 device is attached to the server.  For a description of the 
-<function>XListInputDevices</function>
+<xref linkend='XListInputDevices' xrefstyle='select: title'/>
 request, see the section entitled ``Listing Available Devices.''
     </para>
   </listitem>
   <listitem>
     <para>
-<function>XOpenDevice</function>
+<xref linkend='XOpenDevice' xrefstyle='select: title'/>
 - requests that the server open the device for access by this client.
 This request returns an 
 <function>XDevice</function>
 structure that is used
 by most other input extension requests to identify the specified device.
 For a description of the 
-<function>XOpenDevice</function>
+<xref linkend='XOpenDevice' xrefstyle='select: title'/>
 request, see the section entitled ``Enabling and Disabling Extension Devices.''
     </para>
   </listitem>
@@ -269,7 +269,7 @@ see the section entitled ``Selecting Extension Device Events.''
   </listitem>
   <listitem>
     <para>
-<function>XSelectExtensionEvent</function>
+<xref linkend='XSelectExtensionEvent' xrefstyle='select: title'/>
 - selects the desired events from the server.
 For a description of the 
 <function>XSelextExtensionEvent</function>
@@ -278,9 +278,9 @@ request, see the section entitled ``Selecting Extension Device Events.''
   </listitem>
   <listitem>
     <para>
-<function>XNextEvent</function>
+<olink targetdoc='libX11' targetptr='XNextEvent'><function>XNextEvent</function></olink>
 - receives the next available event.  This is the core
-<function>XNextEvent</function>
+<olink targetdoc='libX11' targetptr='XNextEvent'><function>XNextEvent</function></olink>
 function provided by the standard X libarary.
     </para>
   </listitem>
@@ -457,7 +457,7 @@ is treated as a core device until it is in turn replaced by another
 request or until the server terminates.  The termination
 of the client that changed the device will not cause it to change back.
 Attempts to use the
-<function>XCloseDevice</function>
+<xref linkend='XCloseDevice' xrefstyle='select: title'/>
 request to close the new core device will fail with a
 <function>BadDevice</function>
 error.
@@ -466,7 +466,7 @@ error.
 <para>
 <!-- .LP -->
 To change which physical device is used as the X keyboard, use the 
-<function>XChangeKeyboardDevice</function>
+<xref linkend='XChangeKeyboardDevice' xrefstyle='select: title'/>
 function.
 The specified device must support input class 
 <function>Keys</function>
@@ -479,7 +479,7 @@ error.
 <para>
 <!-- .LP -->
 <!-- .sM -->
-<funcsynopsis id='xchangekeyboarddevice'>
+<funcsynopsis id='XChangeKeyboardDevice'>
 <funcprototype>
   <funcdef>int <function> XChangeKeyboardDevice</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -514,7 +514,7 @@ Specifies the desired device.
 <!-- .LP -->
 <!-- .eM -->
 If no error occurs, 
-<function>XChangeKeyboardDevice</function>
+<xref linkend='XChangeKeyboardDevice' xrefstyle='select: title'/>
 returns 
 <function>Success .</function>
 A 
@@ -534,7 +534,7 @@ the focus state of the old X keyboard.
 </para>
 <para>
 <!-- .LP -->
-<function>XChangeKeyboardDevice</function>
+<xref linkend='XChangeKeyboardDevice' xrefstyle='select: title'/>
 can generate
 <function>AlreadyGrabbed ,</function>
 <function>BadDevice ,</function>
@@ -548,12 +548,12 @@ errors.
 <!-- .LP -->
 To change which physical device is used as the X pointer,
 use the
-<function>XChangePointerDevice</function>
+<xref linkend='XChangePointerDevice' xrefstyle='select: title'/>
 function.
 The specified device must support input class 
 <function>Valuators</function>
 (as reported in the


Reply to: