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

libxi: Changes to 'debian-experimental'



 .gitignore                    |   77 
 COPYING                       |   21 
 ChangeLog                     |  463 ++
 Makefile.am                   |   11 
 configure.ac                  |   48 
 debian/changelog              |   78 
 debian/control                |   30 
 debian/copyright              |   43 
 debian/libxi-dev.install      |    6 
 debian/libxi6-udeb.install    |    1 
 debian/rules                  |   21 
 debian/watch                  |    1 
 doc/.gitignore                |    6 
 doc/Makefile.am               |   66 
 doc/porting.xml               | 1209 +++++
 man/.gitignore                |    2 
 man/Makefile.am               |  246 -
 man/XAllowDeviceEvents.txt    |   56 
 man/XGetDeviceProperty.txt    |    5 
 man/XIQueryDevice.txt         |    6 
 man/XSelectExtensionEvent.txt |    8 
 specs/.gitignore              |    6 
 specs/Makefile.am             |   68 
 specs/encoding.xml            | 2312 +++++++++++
 specs/inputlib.xml            |   70 
 specs/library.xml             | 8559 ++++++++++++++++++++++++++++++++++++++++++
 src/Makefile.am               |    3 
 src/XExtInt.c                 |   77 
 src/XExtToWire.c              |    3 
 src/XGetDCtl.c                |   23 
 src/XGetFCtl.c                |   23 
 src/XGetVers.c                |   24 
 src/XIProperties.c            |    1 
 src/XIQueryVersion.c          |    1 
 src/XISelEv.c                 |   35 
 src/XIint.h                   |    3 
 src/XListDev.c                |    2 
 src/XQueryDv.c                |   24 
 src/XSetBMap.c                |    1 
 39 files changed, 13327 insertions(+), 312 deletions(-)

New commits:
commit add72b3a78f9b35e8782310a1de4e031dbbc3a8d
Author: Cyril Brulebois <kibi@debian.org>
Date:   Fri Jan 14 06:22:55 2011 +0100

    Upload to experimental, fixing version number.

diff --git a/debian/changelog b/debian/changelog
index 89de01a..ab6fb99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxi (2:1.4-1) UNRELEASED; urgency=low
+libxi (2:1.4.0-1) experimental; urgency=low
 
   * New upstream release.
   * Update debian/copyright from upstream COPYING.
@@ -10,7 +10,7 @@ libxi (2:1.4-1) UNRELEASED; urgency=low
   * Get rid of *.xml files before running dh_install.
   * Ship *.html, *.txt, *.css in libxi-dev.
 
- -- Cyril Brulebois <kibi@debian.org>  Fri, 14 Jan 2011 06:02:57 +0100
+ -- Cyril Brulebois <kibi@debian.org>  Fri, 14 Jan 2011 06:22:37 +0100
 
 libxi (2:1.3-6) unstable; urgency=medium
 

commit 83b98d6ae6da778bee95d63b912eddb517ec6651
Author: Cyril Brulebois <kibi@debian.org>
Date:   Fri Jan 14 06:21:37 2011 +0100

    Ship *.html, *.txt, *.css in libxi-dev.

diff --git a/debian/changelog b/debian/changelog
index b292b13..89de01a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libxi (2:1.4-1) UNRELEASED; urgency=low
   * Switch dh_install from --list-missing to --fail-missing for added
     safety.
   * Get rid of *.xml files before running dh_install.
+  * Ship *.html, *.txt, *.css in libxi-dev.
 
  -- Cyril Brulebois <kibi@debian.org>  Fri, 14 Jan 2011 06:02:57 +0100
 
diff --git a/debian/libxi-dev.install b/debian/libxi-dev.install
index 0d4d5b5..f59105c 100644
--- a/debian/libxi-dev.install
+++ b/debian/libxi-dev.install
@@ -2,3 +2,9 @@ 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/specs/*.css  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/doc/*.css  usr/share/doc/libxi-dev

commit 2376fbb994cce1e822c0b6a67ac74c67dc38b650
Author: Cyril Brulebois <kibi@debian.org>
Date:   Fri Jan 14 06:17:13 2011 +0100

    Get rid of *.xml files before running dh_install.

diff --git a/debian/changelog b/debian/changelog
index 26962cc..b292b13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libxi (2:1.4-1) UNRELEASED; urgency=low
   * Add xmlto, xorg-sgml-doctools, and w3m build-dep accordingly.
   * Switch dh_install from --list-missing to --fail-missing for added
     safety.
+  * Get rid of *.xml files before running dh_install.
 
  -- Cyril Brulebois <kibi@debian.org>  Fri, 14 Jan 2011 06:02:57 +0100
 
diff --git a/debian/rules b/debian/rules
index d758b6d..7956d93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,6 +82,7 @@ binary-arch: build install
 	dh_testroot
 
 	dh_installdocs
+	find debian/tmp -name '*.xml' -delete
 	dh_install --sourcedir=debian/tmp --fail-missing --exclude=libXi.la --exclude=usr/share/man/man3
 	dh_installman
 	dh_installchangelogs ChangeLog

commit 3975885fa7f23786f42e0fb2c4cb64c602dc3d95
Author: Cyril Brulebois <kibi@debian.org>
Date:   Fri Jan 14 06:11:59 2011 +0100

    Switch dh_install from --list-missing to --fail-missing for added safety.

diff --git a/debian/changelog b/debian/changelog
index 2c606f5..26962cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ libxi (2:1.4-1) UNRELEASED; urgency=low
   * Bump xutils-dev build-dep for new macros.
   * Pass --with-xmlto and --without-fop to configure.
   * Add xmlto, xorg-sgml-doctools, and w3m build-dep accordingly.
+  * Switch dh_install from --list-missing to --fail-missing for added
+    safety.
 
  -- Cyril Brulebois <kibi@debian.org>  Fri, 14 Jan 2011 06:02:57 +0100
 
diff --git a/debian/rules b/debian/rules
index 9e6d9a5..d758b6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,7 +82,7 @@ binary-arch: build install
 	dh_testroot
 
 	dh_installdocs
-	dh_install --sourcedir=debian/tmp --list-missing --exclude=libXi.la --exclude=usr/share/man/man3
+	dh_install --sourcedir=debian/tmp --fail-missing --exclude=libXi.la --exclude=usr/share/man/man3
 	dh_installman
 	dh_installchangelogs ChangeLog
 	dh_link

commit aaf5b2e9f5ae8fb85a55b780b1443e0f81b44988
Author: Cyril Brulebois <kibi@debian.org>
Date:   Fri Jan 14 06:11:35 2011 +0100

    Add xmlto, xorg-sgml-doctools, and w3m build-dep accordingly.

diff --git a/debian/changelog b/debian/changelog
index ae39dd1..2c606f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxi (2:1.4-1) UNRELEASED; urgency=low
   * Update debian/copyright from upstream COPYING.
   * Bump xutils-dev build-dep for new macros.
   * Pass --with-xmlto and --without-fop to configure.
+  * Add xmlto, xorg-sgml-doctools, and w3m build-dep accordingly.
 
  -- Cyril Brulebois <kibi@debian.org>  Fri, 14 Jan 2011 06:02:57 +0100
 
diff --git a/debian/control b/debian/control
index b3b1e57..494e359 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,11 @@ Build-Depends:
  quilt,
  xutils-dev (>= 1:7.5+4),
  automake,
- libtool
+ libtool,
+# specs
+ xmlto,
+ xorg-sgml-doctools (>= 1:1.5),
+ w3m,
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxi
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxi.git

commit 99052eca48841a252a8ed6150480bc4c6f249c90
Author: Cyril Brulebois <kibi@debian.org>
Date:   Fri Jan 14 06:10:55 2011 +0100

    Pass --with-xmlto and --without-fop to configure.

diff --git a/debian/changelog b/debian/changelog
index 52315ef..ae39dd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxi (2:1.4-1) UNRELEASED; urgency=low
   * New upstream release.
   * Update debian/copyright from upstream COPYING.
   * Bump xutils-dev build-dep for new macros.
+  * Pass --with-xmlto and --without-fop to configure.
 
  -- Cyril Brulebois <kibi@debian.org>  Fri, 14 Jan 2011 06:02:57 +0100
 
diff --git a/debian/rules b/debian/rules
index b6673c7..9e6d9a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,6 +40,8 @@ build/config.status: configure
 	cd build && \
 	../configure --prefix=/usr --mandir=\$${prefix}/share/man \
 	             --infodir=\$${prefix}/share/info $(confflags) \
+	             --with-xmlto \
+	             --without-fop \
 	             CFLAGS="$(CFLAGS)" 
 
 

commit b81b2cda7310eeede99d1c8541731d3e71b09a37
Author: Cyril Brulebois <kibi@debian.org>
Date:   Fri Jan 14 06:05:22 2011 +0100

    Bump xutils-dev build-dep for new macros.

diff --git a/debian/changelog b/debian/changelog
index 5ed0b1a..52315ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxi (2:1.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Update debian/copyright from upstream COPYING.
+  * Bump xutils-dev build-dep for new macros.
 
  -- Cyril Brulebois <kibi@debian.org>  Fri, 14 Jan 2011 06:02:57 +0100
 
diff --git a/debian/control b/debian/control
index 64183c7..b3b1e57 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  asciidoc (>= 8.4.5),
  pkg-config,
  quilt,
- xutils-dev (>= 1:7.4+4),
+ xutils-dev (>= 1:7.5+4),
  automake,
  libtool
 Standards-Version: 3.8.4

commit fd5447814061d92db18fe1961c1225cb0951acb6
Author: Cyril Brulebois <kibi@debian.org>
Date:   Fri Jan 14 06:04:34 2011 +0100

    Update debian/copyright from upstream COPYING.

diff --git a/debian/changelog b/debian/changelog
index 3501767..5ed0b1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libxi (2:1.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Update debian/copyright from upstream COPYING.
 
  -- Cyril Brulebois <kibi@debian.org>  Fri, 14 Jan 2011 06:02:57 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 9b57e3e..561c972 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -42,3 +42,46 @@ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
 USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
+
+Copyright 2008 Peter Hutterer
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the author shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the author.
+
+Copyright © 2009 Red Hat, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

commit 400f2962680b92d5a19149958377a850dfabf3fe
Author: Cyril Brulebois <kibi@debian.org>
Date:   Fri Jan 14 06:03:08 2011 +0100

    Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 7b189a2..c3c12a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,466 @@
+commit ea7e12eaf84ada28f4933e85ecf51a47c9db0b93
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Nov 2 14:26:34 2010 +1000
+
+    libXi 1.4
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 556246beaffb42e1f58d816542d91e360ea02080
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Nov 2 11:22:01 2010 +1000
+
+    man: XGetDeviceProperty(3) has no parameter 'pending'.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Julien Cristau <jcristau@debian.org>
+
+commit ccbebb111fb2084716fce67cb44b5bd8b86adbbc
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date:   Tue Sep 28 13:30:03 2010 -0700
+
+    Purge cvs tags.
+    
+    Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f237427f897d1dc527494653735d4bb93d740546
+Author: Carlos Garnacho <carlosg@gnome.org>
+Date:   Wed Oct 6 11:04:21 2010 +0200
+
+    Fix typo when converting raw events from the wire.
+    
+    The raw values were being miscalculated, containing only the integral part
+    of the FP3232, meanwhile normal valuators were mistakenly added the fractional
+    part of its corresponding raw value.
+    
+    Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
+    Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit abc26c71b6032683b89085a7ebcd40ca81cdf3f2
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun Oct 3 17:04:57 2010 +0200
+
+    man: fix typo in XIQueryDevice doc
+    
+    Don't pretend this is XIQueryPointer.
+    
+    Debian bug#598964
+    Reported-by: Joachim Breitner <nomeata@debian.org>
+    Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit a00926cd16a0b6ddb9f7b074dce88e3fb840831c
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Wed Aug 25 22:21:55 2010 +0200
+
+    Fix build with gcc 2.95
+    
+    Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+    Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+    Reviewed-by: Matt Turner <mattst88@gmail.com>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 3f2814a0f9193cb33b44ef53059a4b349cf4cabc
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Aug 2 15:40:32 2010 +1000
+
+    man: improve readability of XAllowDeviceEvents.
+    
+    Parse the options to event-mode as a list. This requires un-indenting the
+    rest, otherwise the asciidoc/xmlto conversion will indent the trailing
+    paragraphs more than the list
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit d3eb99478ca96fdfc4ceb2a9809f19f803bba6c7
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Aug 15 18:05:13 2010 -0400
+
+    man: add $(AM_V_GEN) for silent rules where missing
+    
+    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit dbcca7e1296ae671964c55be13bfbb9113a600a0
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Aug 15 17:46:52 2010 -0400
+
+    man: whitespace management
+    
+    This style should make it easier to read filenames
+    in a large list.
+    
+    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit bc9f68de51ec7d3d88330ff843eccd6cbf9a93ad
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Aug 15 12:53:04 2010 -0400
+
+    man: Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+    
+    The value of MAN_SUBST is the same for all X.Org packages.
+    Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+    
+    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 20b843c820dd147a0f8f7e6d06da7a0c18d40f1c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Aug 15 09:33:17 2010 -0400
+
+    man: add/change comments regarding the 3 step conversion from text source
+    
+    In the hope of making it easier to learn.
+    This makefile may serve as a reference.
+    
+    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e7b4e33a3ea1a3cce074da2d91bda7258e01652a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Aug 15 07:54:39 2010 -0400
+
+    man: rename libman_pre to libman_PRE
+    
+    To be consistent with all other man pages makefiles.
+    
+    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit d854293a63be4a983e3e8fe8a1110a5ea1ffba2a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Aug 15 07:32:10 2010 -0400
+
+    man: use "shadows" terminology in variable names.
+    
+    For man pages that are just links to a main man page.
+    This is how they are referred to in all other librairies.
+    
+    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 9fe6bfec833a66a3a8ca70b8769eada91a320bf7
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sat Aug 14 21:41:51 2010 -0400
+
+    man: remove used LIB_MAN_DIR_SUFFIX (part of an unrequired broken fix)
+    
+    Local fix in CVS for bug 5628 is not required
+    as the problem has been fixed in
+    util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba
+    
+    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 8daf961d0fe6a1433c8248d984618a7e22ff88b8
+Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+Date:   Fri Jun 18 11:32:36 2010 +0300
+
+    Always unlock display correctly
+    
+    XISelectEvents and XIGetSelectedEvents were not unlocking display in all
+    return paths.
+    
+    Reported-by: Julien Cristau <jcristau@debian.org>
+    Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+
+commit 3a6839b4a229aa59188025c9b285023110a20aad
+Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+Date:   Mon Jun 14 10:37:56 2010 +0300
+
+    Use single error path in XGetDeviceControl
+    
+    This reduces code duplication and fixes possible leak of d. d would leak if
+    allocation of Device fails.
+    
+    Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+    Reviewed-by: Julien Cristau <jcristau@debian.org>
+
+commit 850288fee663c07fbd491859629543f78bbadd3c
+Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+Date:   Mon Jun 14 10:37:56 2010 +0300
+
+    Use single error path in XGetFeedbackControl
+    
+    This reduces code duplication and fixes possible leak of f. f would leak if
+    allocation of Feedback fails.
+    
+    Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+    Reviewed-by: Julien Cristau <jcristau@debian.org>
+
+commit 9ca839742b49d49e98a17baa40c9662ee76c397f
+Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+Date:   Mon Jun 14 10:16:22 2010 +0300
+
+    Use single error path in XQueryDeviceState
+    
+    This reduces code duplication and fixes possible leak of data. data would
+    leak if allocation of state fails.
+    
+    Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+    Reviewed-by: Julien Cristau <jcristau@debian.org>
+
+commit b953bf7b9775e5970776a21ae3f7919592289c92
+Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+Date:   Mon Jun 14 10:05:36 2010 +0300
+
+    Fix memory leak in XIGetSelectedEvents
+    
+    mask_in was leaking for every successfull XIGetSelectedEvents.
+    
+    Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+    Reviewed-by: Julien Cristau <jcristau@debian.org>
+
+commit 6199f89992e2b6ba5f96833f4f4087b61ca61ac5
+Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+Date:   Fri Jun 11 17:30:44 2010 +0300
+
+    Fix usage of uninitialized value
+    
+    In error case length of extra data could be uninitialized. This would
+    result randomly sized request later in function.
+    
+    Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+    Reviewed-by: Julien Cristau <jcristau@debian.org>
+
+commit d364aaaa47a69789b7acfd54b625caa299780480
+Author: Matt Dew <matt@osource.org>
+Date:   Sat Jul 10 09:48:13 2010 -0400
+
+    specs: convert input .ms specs from xorg-docs module to DocBook XML
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 30b076ea0b761c4a94c275be273accf311dc81c2
+Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
+Date:   Thu Jul 1 06:58:28 2010 -0300
+
+    Purge macros NEED_EVENTS and NEED_REPLIES
+    
+    Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
+    Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 54fbe5759aa961dccc618b35573845f847675570
+Author: Jamey Sharp <jamey@minilop.net>
+Date:   Fri Apr 9 17:31:00 2010 -0700
+
+    Don't unlock the Display twice.
+    
+    _xiQueryVersion's caller must wrap it in a LockDisplay/UnlockDisplay
+    pair, so it shouldn't call UnlockDisplay itself.
+    
+    Signed-off-by: Jamey Sharp <jamey@minilop.net>
+
+commit f7c3b023f04e06dfe380dce488f80943a10be57e
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Mon Mar 29 16:50:34 2010 -0400
+
+    config: update AC_PREREQ statement to 2.60
+    
+    Unrelated to the previous patches, the new value simply reflects
+    the reality that the minimum level for autoconf to configure
+    all x.org modules is 2.60 dated June 2006.
+    
+    ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e48a8569f854237f2fead7c7a75e90b6c5fe8693
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Mon Mar 29 14:53:48 2010 -0400
+
+    config: remove the pkgconfig pc.in file from EXTRA_DIST
+    
+    Automake always includes it in the tarball.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 93aca1583dcdd21d79c7ab75d81a49359523a0e2
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Mar 11 10:16:51 2010 -0500
+
+    doc: specify minimum version for xmlto and ascidoc
+    
+    Specify 0.0.20 as the minimum version for xmlto.
+    Older versions do not have fop backend.
+    
+    Specify 8.4.5 as the minimum version for ascidooc.
+    Older versions stop with errors.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 299de21b2ab3cfa2078823215f84da67e7b3d1a3
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Dec 9 13:59:57 2009 +1000
+
+    Initialize extension with the right number of events.
+    
+    If the server supports a lower XI version than the client, the Xlib-internal
+    event vector may be smashed. See libXext for more details.
+    http://cgit.freedesktop.org/xorg/lib/libXext/commit/?id=83fdb27df4ddc2fb088ddf2ec65f0db6b7c57287
+    
+    This patch queries the server for the supported XI extension before
+    registering the extension with Xlib. The number of events registered depends
+    on the server version.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Julien Cristau <jcristau@debian.org>
+
+commit 4debc545611edd35f8fd35a52f4adf4263e49200
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Tue Feb 16 10:37:21 2010 -0500
+
+    config: move CWARNFLAGS from configure.ac to Makefile.am
+    
+    Compiler warning flags should be explicitly set in the makefile
+    rather than being merged with other packages compiler flags.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit d7e421f97db74332783ae885f6835f84133c92b5
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Feb 18 16:52:12 2010 +1000
+
+    man: fix types for XGetSelectedExtensionEvents.
+    
+    The return values are of type XEventClass** and int*, respectively.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit b75b8fa4bda0fb18872fa82a04fe7f609a147f8b
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date:   Tue Jan 26 09:17:12 2010 -0800
+
+    Need both xmlto and asciidoc to install man pages from a checkout
+    
+    The check for whether to build the pages looked for both xmlto and
+    asciidoc, but the check to install didn't. Refactor a bit so that the
+    check is done only once.
+    
+    Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+    Tested-by: Gaetan Nadon <memsize@videotron.ca>
+    Tested-by: Christian Hartmann <cornogle@googlemail.com>
+
+commit f10f6f2fd420786cddac875d1b6de2004ba8c9d4
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sat Jan 23 14:46:59 2010 -0500
+
+    man: remove redundant nodist prefix to libman_DATA
+    
+    The final, macro substituded, man pages (with file extension .3
+    on my platform), are installed, but not distributed. There is no
+    need to override the correct default behaviour.
+    
+    Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit c183e15263787af913bf8eb7be707e0f2e974824
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sat Jan 23 10:04:38 2010 -0500
+
+    man: allow installing prebuilt man pages from tarball
+    
+    The man pages source may be supplied in the tarball or built
+    from git. The makefile needs to take that into consideration
+    and adjust the targets accordingly.
+    
+    Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit c94494c144c634b7fa3187c55458cafa0e06a69c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Tue Jan 19 13:44:49 2010 -0500
+
+    config: replace custom code with reusable macro XORG_WITH_XMLTO
+    
+    XORG_WITH_XMLTO provides additional functions like a configure
+    option which allow platform builders to control the usage of
+    the xmlto program.
+    
+    This is a requirement from platforms that do not have such doc tool.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit bb07265cfbd919de4903dadbfe42d1779c20225c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Jan 14 09:22:08 2010 -0500
+
+    COPYING: add missing copyright notice
+    
+    Refer to: XiAllowEvents.c
+    Copyright © 2009 Red Hat, Inc.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 20f1b09cfdeeb2e4536e82a09b32693de65f3566
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Jan 14 21:39:47 2010 -0800
+
+    Update Sun license notices to current X.Org standard form
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit d42cdd631728eae399287b666f0f445e7af47ad3
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Fri Jan 1 13:43:03 2010 -0500
+
+    man: ignore generated .man from .txt files in this directory
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 9620cfa989d214a4d97c74767c218d06ed2ac792
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Fri Nov 27 20:56:04 2009 -0500
+
+    Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+    
+    Now that the INSTALL file is generated.
+    Allows running make maintainer-clean.
+
+commit d157e3b4ac31710fb1d4d62f1cc4fa743ec61522
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Wed Oct 28 14:09:10 2009 -0400
+
+    INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+    
+    Add missing INSTALL file. Use standard GNU file on building tarball
+    README may have been updated
+    Remove AUTHORS file as it is empty and no content available yet.
+    Remove NEWS file as it is empty and no content available yet.
+
+commit 847b72d9de8dd839c391321b50312368e63e7305
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Tue Oct 27 15:07:25 2009 -0400
+
+    Deploy the new XORG_DEFAULT_OPTIONS #24242
+    
+    This macro aggregate a number of existing macros that sets commmon
+    X.Org components configuration options. It shields the configuration file from
+    future changes.
+
+commit f1c7f651838c7f2f33c0c9f9306d8d6df36206c7
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Mon Oct 26 22:08:43 2009 -0400
+
+    Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+    
+    ChangeLog filename is known to Automake and requires no further
+    coding in the makefile.
+
+commit a9a766f9dd0e8cf32e576c040d1604422193ab07
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Oct 22 12:34:19 2009 -0400
+
+    .gitignore: use common defaults with custom section # 24239
+    
+    Using common defaults will reduce errors and maintenance.
+    Only the very small or inexistent custom section need periodic maintenance
+    when the structure of the component changes. Do not edit defaults.
+
 commit 63621888d6e36a2f9e41e81c14728d70beeff5ee
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Fri Oct 2 12:09:17 2009 +1000
diff --git a/debian/changelog b/debian/changelog
index 3ecdd89..3501767 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxi (2:1.4-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org>  Fri, 14 Jan 2011 06:02:57 +0100
+
 libxi (2:1.3-6) unstable; urgency=medium
 
   * WireToEvent: Set display member of all events as well (cherry-pick from

commit 2f07f69e6e27b1fbc9156b3a2d722b84a4246659
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Dec 17 17:00:54 2010 +0100

    Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index a075fee..3ecdd89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxi (2:1.3-6) unstable; urgency=medium
+
+  * WireToEvent: Set display member of all events as well (cherry-pick from
+    upstream).
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 17 Dec 2010 17:00:44 +0100
+
 libxi (2:1.3-5) unstable; urgency=low
 
   * Cherry-picked fixes from upstream:

commit e603bcd743930313e679b7dcc6fd3a3dddf6303e
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Mon Dec 13 19:49:58 2010 +0000

    WireToEvent: Set display member of all events as well
    
    All events were getting random uninitialised garbage for display; fix
    that.
    
    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
    (cherry picked from commit 9419fe9f0b21232d342885a693fbf9222b5844e4)

diff --git a/src/XExtInt.c b/src/XExtInt.c
index db7aa78..4b7154b 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -1349,6 +1349,7 @@ wireToDeviceEvent(xXIDeviceEvent *in, XGenericEventCookie* cookie)
     cookie->data = ptr_lib = malloc(len);
 
     out = next_block(&ptr_lib, sizeof(XIDeviceEvent));
+    out->display = cookie->display;
     out->type = in->type;
     out->extension = in->extension;
     out->evtype = in->evtype;
@@ -1548,6 +1549,7 @@ wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XGenericEventCookie *cookie)
     cookie->data = out = malloc(sizeof(XIDeviceChangedEvent) + len);
 
     out->type = in->type;
+    out->display = cookie->display;
     out->extension = in->extension;
     out->evtype = in->evtype;
     out->send_event = ((in->type & 0x80) != 0);
@@ -1577,6 +1579,7 @@ wireToHierarchyChangedEvent(xXIHierarchyEvent *in, XGenericEventCookie *cookie)
     cookie->data = out = malloc(sizeof(XIHierarchyEvent) + in->num_info * sizeof(XIHierarchyInfo));;
 
     out->info           = (XIHierarchyInfo*)&out[1];
+    out->display        = cookie->display;
     out->type           = in->type;
     out->extension      = in->extension;
     out->evtype         = in->evtype;
@@ -1619,6 +1622,7 @@ wireToRawEvent(xXIRawEvent *in, XGenericEventCookie *cookie)
 
     out = next_block(&ptr, sizeof(XIRawEvent));
     out->type           = in->type;
+    out->display        = cookie->display;
     out->extension      = in->extension;
     out->evtype         = in->evtype;
     out->send_event = ((in->type & 0x80) != 0);
@@ -1662,6 +1666,7 @@ wireToEnterLeave(xXIEnterEvent *in, XGenericEventCookie *cookie)
     out->buttons.mask = (unsigned char*)&out[1];
 
     out->type           = in->type;
+    out->display        = cookie->display;
     out->extension      = in->extension;
     out->evtype         = in->evtype;
     out->send_event = ((in->type & 0x80) != 0);

commit 620a6f18ff7de3e2bed301ec3a1166e4e82668ed
Author: Julien Cristau <jcristau@debian.org>
Date:   Thu Nov 18 17:31:20 2010 +0100

    Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 968e34b..a075fee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxi (2:1.3-5) UNRELEASED; urgency=low
+libxi (2:1.3-5) unstable; urgency=low
 
   * Cherry-picked fixes from upstream:
     - man: fix types for XGetSelectedExtensionEvents
@@ -13,7 +13,7 @@ libxi (2:1.3-5) UNRELEASED; urgency=low
     - Fix typo when converting raw events from the wire
     - man: XGetDeviceProperty(3) has no parameter 'pending'
 
- -- Julien Cristau <jcristau@debian.org>  Thu, 18 Nov 2010 17:14:40 +0100
+ -- Julien Cristau <jcristau@debian.org>  Thu, 18 Nov 2010 17:31:04 +0100
 
 libxi (2:1.3-4) unstable; urgency=low
 

commit aeeb6237d48edf98d6361c4d1963ff5521cc3aab
Author: Julien Cristau <jcristau@debian.org>
Date:   Thu Nov 18 17:17:08 2010 +0100

    Add changelog entry and drop obsolete patch

diff --git a/debian/changelog b/debian/changelog
index 7d7fcd9..968e34b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+libxi (2:1.3-5) UNRELEASED; urgency=low
+
+  * Cherry-picked fixes from upstream:
+    - man: fix types for XGetSelectedExtensionEvents
+    - Initialize extension with the right number of events (obsoletes our
+      quilt patch)
+    - Don't unlock the Display twice
+    - Fix usage of uninitialized value
+    - Fix memory leak in XIGetSelectedEvents
+    - Always unlock display correctly
+    - man: improve readability of XAllowDeviceEvents
+    - man: fix typo in XIQueryDevice doc (closes: #598964)
+    - Fix typo when converting raw events from the wire
+    - man: XGetDeviceProperty(3) has no parameter 'pending'
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 18 Nov 2010 17:14:40 +0100
+
 libxi (2:1.3-4) unstable; urgency=low
 
   * Add udeb needed for the graphical installer: libxi6-udeb.
diff --git a/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch b/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch
deleted file mode 100644
index 6261652..0000000
--- a/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 5e87ce95525d6634066384b8dc829bb7c90ec008 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed, 9 Dec 2009 14:06:36 +1000
-Subject: [PATCH] Initialize extension with the right number of events.
-
-If the server supports a lower XI version than the client, the Xlib-internal
-event vector may be smashed. See libXext for more details.
-http://cgit.freedesktop.org/xorg/lib/libXext/commit/?id=83fdb27df4ddc2fb088ddf2ec65f0db6b7c57287
-
-This patch queries the server for the supported XI extension before
-registering the extension with Xlib. The number of events registered depends
-on the server version.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- src/XExtInt.c  |   61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
- src/XGetVers.c |   24 ++++++++++++++-------
- src/XIint.h    |    1 +
- 3 files changed, 77 insertions(+), 9 deletions(-)
-
-Index: libxi/src/XExtInt.c
-===================================================================
---- libxi.orig/src/XExtInt.c
-+++ libxi/src/XExtInt.c
-@@ -173,6 +173,64 @@
-     "BadClass, invalid event class",	/* BadClass */
- };
- 
-+/* Get the version supported by the server to know which number of
-+* events are support. Otherwise, a wrong number of events may smash
-+* the Xlib-internal event processing vector.


Reply to: