libxi: Changes to 'ubuntu'

2013-05-23 Thread Timo Aaltonen 
 ChangeLog   |   71 
 autogen.sh  |4 
 configure.ac|5 -
 debian/changelog|  119 
 debian/control  |2 
 debian/patches/add-missing-xi_rawtouch.diff |   29 --
 debian/patches/series   |2 
 include/X11/extensions/XInput2.h|2 
 src/Makefile.am |1 
 src/XExtInt.c   |3 
 xi.pc.in|2 
 11 files changed, 103 insertions(+), 137 deletions(-)

New commits:
commit 6d61acf42b73e3ce8a5b8ea2de64e70bbe5320a1
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu May 23 14:27:03 2013 +0300

release to saucy

diff --git a/debian/changelog b/debian/changelog
index fc9730f..8b03783 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxi (2:1.7.1-0ubuntu1) saucy; urgency=low
+
+  * Sync from unreleased debian git.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 23 May 2013 13:18:49 +0300
+
 libxi (2:1.7.1-1) UNRELEASED; urgency=low
 
   * New upstream release.

commit 517ac1a9130fa5a83ccbdc0605bf9fd91ec04612
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu May 23 13:18:28 2013 +0300

drop upstreamed patch

diff --git a/debian/changelog b/debian/changelog
index 2a6ba02..2b028c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,6 @@ libxi (2:1.7.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * control: Bump policy to 3.9.4, no changes.
-  * add-missing-xi_rawtouch.diff: Upstream commit to add XI_RawTouch in
-XInputCopyCookie.
   * control: Bump x11proto-input-dev build-dep to 2.2.99.1.
   * libxi6.symbols: Added new symbols.
   * rules: Bump shlibs.
diff --git a/debian/patches/add-missing-xi_rawtouch.diff 
b/debian/patches/add-missing-xi_rawtouch.diff
deleted file mode 100644
index 4ee049e..000
--- a/debian/patches/add-missing-xi_rawtouch.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 236be512c81b76dad711bec481e2139584006c4c
-Author: Benjamin Tissoires benjamin.tissoi...@gmail.com
-Date:   Mon Jan 14 18:32:05 2013 +0100
-
-Add missing XI_RawTouch* in XInputCopyCookie
-
-Looks like XI_RawTouch* events are missing in the big switch in this 
function.
-When running XIT tests for multitouch devices, several following errors 
appears:
-XInputCopyCookie: Failed to copy evtype 22
-XInputCopyCookie: Failed to copy evtype 23
-XInputCopyCookie: Failed to copy evtype 24
-
-Signed-off-by: Benjamin Tissoires benjamin.tissoi...@gmail.com
-Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
-
-diff --git a/src/XExtInt.c b/src/XExtInt.c
-index 57d071d..507573b 100644
 a/src/XExtInt.c
-+++ b/src/XExtInt.c
-@@ -1484,6 +1484,9 @@ XInputCopyCookie(Display *dpy, XGenericEventCookie *in, 
XGenericEventCookie *out
- case XI_RawButtonPress:
- case XI_RawButtonRelease:
- case XI_RawMotion:
-+case XI_RawTouchBegin:
-+case XI_RawTouchUpdate:
-+case XI_RawTouchEnd:
- ret = copyRawEvent(in, out);
- break;
- case XI_BarrierHit:
diff --git a/debian/patches/series b/debian/patches/series
index 67f42a8..a82d1b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-add-missing-xi_rawtouch.diff
+#placeholder

commit a0e42ce397fc79d549f33cd95acea568112aff66
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu May 23 13:14:07 2013 +0300

fix the version

diff --git a/debian/changelog b/debian/changelog
index 52333eb..2a6ba02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxi (2:1.7.1.1-1) UNRELEASED; urgency=low
+libxi (2:1.7.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * control: Bump policy to 3.9.4, no changes.

commit b01118776c622f478bee760127e41c87be8eb8c1
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu May 23 13:10:36 2013 +0300

control: Add libfixes-dev to build-deps and libxi-dev Depends.

diff --git a/debian/changelog b/debian/changelog
index a4659f6..52333eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libxi (2:1.7.1.1-1) UNRELEASED; urgency=low
   * control: Bump x11proto-input-dev build-dep to 2.2.99.1.
   * libxi6.symbols: Added new symbols.
   * rules: Bump shlibs.
+  * control: Add libfixes-dev to build-deps and libxi-dev Depends.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Wed, 06 Feb 2013 23:43:08 +0200
 
diff --git a/debian/control b/debian/control
index 6e7964f..3161890 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends:
  x11proto-input-dev (= 2.2.99.1),
  libx11-dev (= 2:1.4.99.1),
  libxext-dev (= 2:1.1.1-3),
+ libxfixes-dev (= 5),
  xmlto,
  asciidoc (= 8.4.5),
  pkg-config,
@@ -86,6 +87,7 @@ Depends:
  libxi6 (= ${binary:Version}),
  libx11-dev,
  libxext-dev,
+

libxi: Changes to 'ubuntu'

2013-02-20 Thread Timo Aaltonen 
 debian/changelog  |   23 +++
 debian/libxi6.symbols |2 --
 debian/rules  |2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)

New commits:
commit 73b66f1f6937ae69acd37c8bfaf5cdf2327c9959
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Feb 20 11:22:23 2013 +0200

add a changelog entry for the real -0ubuntu3 upload, bump current ppa

diff --git a/debian/changelog b/debian/changelog
index 0b5a05e..31fa231 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
-libxi (2:1.6.99.1-0ubuntu3) raring; urgency=low
+libxi (2:1.6.99.1-0ubuntu3.1) raring; urgency=low
 
   * re-enable pointer barrier support.
   * libxi6.symbols: drop duplicate entries.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 07 Feb 2013 18:58:48 +0200
 
+libxi (2:1.6.99.1-0ubuntu3) raring; urgency=low
+
+  * revert-xi2.3.diff: Change .pc file to set version back to 1.6.1, to avoid
+tricking module checks of reverse dependencies into thinking that the
+installed libxi supports pointer barrier events. Fixes mutter FTBFS.
+
+ -- Martin Pitt martin.p...@ubuntu.com  Wed, 20 Feb 2013 09:58:26 +0100
+
 libxi (2:1.6.99.1-0ubuntu2) raring; urgency=low
 
   * revert support for the new pointer barrier events for now, until

commit 84c15c140c33d57c047ebcec2de25b78d5fd1882
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Feb 7 19:38:54 2013 +0200

libxi6.symbols: drop duplicate entries.

diff --git a/debian/changelog b/debian/changelog
index 8dbe2af..0b5a05e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libxi (2:1.6.99.1-0ubuntu3) raring; urgency=low
 
   * re-enable pointer barrier support.
+  * libxi6.symbols: drop duplicate entries.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 07 Feb 2013 18:58:48 +0200
 
diff --git a/debian/libxi6.symbols b/debian/libxi6.symbols
index b07392f..c8ee08a 100644
--- a/debian/libxi6.symbols
+++ b/debian/libxi6.symbols
@@ -1,6 +1,5 @@
 libXi.so.6 libxi6 #MINVER#
  XAllowDeviceEvents@Base 0
- XIAllowTouchEvents@Base 2:1.5.99.2
  XChangeDeviceControl@Base 0
  XChangeDeviceDontPropagateList@Base 0
  XChangeDeviceKeyMapping@Base 0
@@ -28,7 +27,6 @@ libXi.so.6 libxi6 #MINVER#
  XGetFeedbackControl@Base 0
  XGetSelectedExtensionEvents@Base 0
  XGrabDevice@Base 0
- XIGrabTouchBegin@Base 2:1.4.1-1ubuntu1
  XIAllowEvents@Base 2:1.2.99.4
  XIAllowTouchEvents@Base 2:1.5.99.2
  XIBarrierReleasePointer@Base 2:1.6.99.1

commit 920277f93e40acb8865ff142560b786d542671b4
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Feb 7 19:34:05 2013 +0200

rules: Bump shlibs.

diff --git a/debian/changelog b/debian/changelog
index b252c4c..d2cbec0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libxi (2:1.6.99.1-1) UNRELEASED; urgency=low
 XInputCopyCookie.
   * control: Bump x11proto-input-dev build-dep to 2.2.99.1.
   * libxi6.symbols: Added new symbols.
+  * rules: Bump shlibs.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Wed, 06 Feb 2013 23:43:08 +0200
 
diff --git a/debian/rules b/debian/rules
index 724042e..3c97ff8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,7 +95,7 @@ binary-arch: build install
dh_strip -N$(PACKAGE)
dh_compress
dh_fixperms
-   dh_makeshlibs -V'libxi6 (= 2:1.5.99.2)' --add-udeb=$(PACKAGE)-udeb -- 
-c4
+   dh_makeshlibs -V'libxi6 (= 2:1.6.99.1)' --add-udeb=$(PACKAGE)-udeb -- 
-c4
dh_shlibdeps
dh_installdeb
dh_gencontrol

commit 335d6c8c4ad7cba1149bd797b13a1b80fb649ce8
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Feb 7 18:58:43 2013 +0200

whoopsie daisy..

diff --git a/debian/changelog b/debian/changelog
index 2eeda53..e3145c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libxi (2:1.6.99.1-0ubuntu3) raring; urgency=low
+
+  * re-enable pointer barrier support.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 07 Feb 2013 18:58:48 +0200
+
+libxi (2:1.6.99.1-0ubuntu2) raring; urgency=low
+
+  * revert support for the new pointer barrier events for now, until
+the rest of the stack is ready.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 07 Feb 2013 18:55:05 +0200
+
 libxi (2:1.6.99.1-0ubuntu1) raring; urgency=low
 
   * Sync from unreleased debian git.


-- 
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/e1u85vk-0004nf...@vasks.debian.org

libxi: Changes to 'ubuntu'

2013-02-06 Thread Timo Aaltonen 
 ChangeLog|  225 +++
 configure.ac |4 
 debian/changelog |   46 +++
 debian/control   |4 
 debian/libxi6.symbols|2 
 debian/patches/0001_fix_button_mask_and_labels.patch |   59 
 debian/patches/add-missing-xi_rawtouch.diff  |   29 ++
 debian/patches/series|2 
 debian/rules |5 
 include/X11/extensions/XInput2.h |   47 +++
 man/Makefile.am  |9 
 man/XGetDeviceControl.txt|   12 -
 man/XIBarrierReleasePointer.txt  |   76 ++
 man/XIGrabButton.txt |3 
 man/XIQueryVersion.txt   |6 
 src/Makefile.am  |3 
 src/XExtInt.c|  185 +++
 src/XGetFCtl.c   |   14 -
 src/XIBarrier.c  |   81 ++
 src/XIQueryVersion.c |6 
 src/XIint.h  |2 
 src/XListDev.c   |3 
 22 files changed, 684 insertions(+), 139 deletions(-)

New commits:
commit 6a0736ca6ab0d6bbdbb1fd9cbef56abecd71ec14
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Feb 7 00:12:16 2013 +0200

release to raring

diff --git a/debian/changelog b/debian/changelog
index da9e6cd..2eeda53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxi (2:1.6.99.1-0ubuntu1) raring; urgency=low
+
+  * Sync from unreleased debian git.
+- new upstream release
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Wed, 06 Feb 2013 23:56:21 +0200
+
 libxi (2:1.6.99.1-1) UNRELEASED; urgency=low
 
   * New upstream release.

commit 21eef91cfae057ea05e3ae466b9ad0548531e53d
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Feb 7 00:10:03 2013 +0200

libxi6.symbols: Added new symbols.

diff --git a/debian/changelog b/debian/changelog
index f0517a2..b252c4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxi (2:1.6.99.1-1) UNRELEASED; urgency=low
   * add-missing-xi_rawtouch.diff: Upstream commit to add XI_RawTouch in
 XInputCopyCookie.
   * control: Bump x11proto-input-dev build-dep to 2.2.99.1.
+  * libxi6.symbols: Added new symbols.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Wed, 06 Feb 2013 23:43:08 +0200
 
diff --git a/debian/libxi6.symbols b/debian/libxi6.symbols
index 0857960..c8ee08a 100644
--- a/debian/libxi6.symbols
+++ b/debian/libxi6.symbols
@@ -29,6 +29,8 @@ libXi.so.6 libxi6 #MINVER#
  XGrabDevice@Base 0
  XIAllowEvents@Base 2:1.2.99.4
  XIAllowTouchEvents@Base 2:1.5.99.2
+ XIBarrierReleasePointer@Base 2:1.6.99.1
+ XIBarrierReleasePointers@Base 2:1.6.99.1
  XIChangeHierarchy@Base 2:1.2.99.4
  XIChangeProperty@Base 2:1.2.99.4
  XIDefineCursor@Base 2:1.2.99.4

commit 885e2247d055172649a67d4e11e7fc48e7831489
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Feb 7 00:05:21 2013 +0200

control: Bump x11proto-input-dev build-dep to 2.2.99.1.

diff --git a/debian/changelog b/debian/changelog
index b37e8f2..f0517a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxi (2:1.6.99.1-1) UNRELEASED; urgency=low
   * control: Bump policy to 3.9.4, no changes.
   * add-missing-xi_rawtouch.diff: Upstream commit to add XI_RawTouch in
 XInputCopyCookie.
+  * control: Bump x11proto-input-dev build-dep to 2.2.99.1.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Wed, 06 Feb 2013 23:43:08 +0200
 
diff --git a/debian/control b/debian/control
index c3aa7d2..6e7964f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (= 8.1.3),
  x11proto-core-dev (= 7.0.13),
  x11proto-xext-dev (= 7.0.3),
- x11proto-input-dev (= 2.1.99.6),
+ x11proto-input-dev (= 2.2.99.1),
  libx11-dev (= 2:1.4.99.1),
  libxext-dev (= 2:1.1.1-3),
  xmlto,

commit 83e6dba0860dc19500f7444c8eb89b93d8cadfd5
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Feb 6 23:52:49 2013 +0200

add-missing-xi_rawtouch.diff: Upstream commit to add XI_RawTouch in 
XInputCopyCookie.

diff --git a/debian/changelog b/debian/changelog
index a31616c..b37e8f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libxi (2:1.6.99.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * control: Bump policy to 3.9.4, no changes.
+  * add-missing-xi_rawtouch.diff: Upstream commit to add XI_RawTouch in
+XInputCopyCookie.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Wed, 06 Feb 2013 23:43:08 +0200
 
diff --git a/debian/patches/add-missing-xi_rawtouch.diff 
b/debian/patches/add-missing-xi_rawtouch.diff
new file mode 100644
index 000..4ee049e
---

libxi: Changes to 'ubuntu'

2012-04-12 Thread Chase Douglas 
 debian/changelog |7 ++
 debian/patches/0001_fix_button_mask_and_labels.patch |   59 +++
 debian/patches/series|2 
 3 files changed, 67 insertions(+), 1 deletion(-)

New commits:
commit 29ef7a1b0963cec232a7f37ef18357cd2f031eb3
Author: Chase Douglas chase.doug...@canonical.com
Date:   Thu Apr 12 09:39:03 2012 -0700

releasing version 2:1.6.0-0ubuntu2

diff --git a/debian/changelog b/debian/changelog
index a33d2f9..63316f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libxi (2:1.6.0-0ubuntu2) UNRELEASED; urgency=low
+libxi (2:1.6.0-0ubuntu2) precise; urgency=low
 
   * Report button state and labels correctly (LP: #980041)
 - Add patch 0001_fix_button_mask_and_labels.patch from upstream
 
- -- Chase Douglas chase.doug...@ubuntu.com  Thu, 12 Apr 2012 09:16:00 -0700
+ -- Chase Douglas chase.doug...@ubuntu.com  Thu, 12 Apr 2012 09:30:18 -0700
 
 libxi (2:1.6.0-0ubuntu1) precise; urgency=low
 

commit 9c555d94c8438e797d8f76f8789dbdebaaa080b3
Author: Chase Douglas chase.doug...@canonical.com
Date:   Thu Apr 12 09:30:10 2012 -0700

Report button state and labels correctly (LP: #980041)

* Report button state and labels correctly (LP: #980041)
  - Add patch 0001_fix_button_mask_and_labels.patch from upstream

diff --git a/debian/changelog b/debian/changelog
index 3eb679d..a33d2f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxi (2:1.6.0-0ubuntu2) UNRELEASED; urgency=low
+
+  * Report button state and labels correctly (LP: #980041)
+- Add patch 0001_fix_button_mask_and_labels.patch from upstream
+
+ -- Chase Douglas chase.doug...@ubuntu.com  Thu, 12 Apr 2012 09:16:00 -0700
+
 libxi (2:1.6.0-0ubuntu1) precise; urgency=low
 
   * New upstream release
diff --git a/debian/patches/0001_fix_button_mask_and_labels.patch 
b/debian/patches/0001_fix_button_mask_and_labels.patch
new file mode 100644
index 000..91a4447
--- /dev/null
+++ b/debian/patches/0001_fix_button_mask_and_labels.patch
@@ -0,0 +1,59 @@
+From 8436c920953f288aea2d6d5f370f8eaaaef82d97 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer peter.hutte...@who-t.net
+Date: Thu, 15 Mar 2012 11:51:41 +1000
+Subject: [PATCH] Fix wrong button label and mask copy on OS X
+
+Regression introduced in c1a5a70b51f12dedf354102217c7cd4247ed3a4b.
+
+If double-padding is applied, the length of the mask on the wire may be
+smaller than libXi's mask_len. When copying, only the wire length must be
+copied, with the remainder set to 0.
+When advancing to the button labels, the wire length matters, not libXi's
+internal length.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Jeremy Huddleston jerem...@apple.com
+Tested-by: Jeremy Huddleston jerem...@apple.com
+---
+ src/XExtInt.c |   10 --
+ 1 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/XExtInt.c b/src/XExtInt.c
+index 89c0894..0c64f9a 100644
+--- a/src/XExtInt.c
 b/src/XExtInt.c
+@@ -1610,12 +1610,14 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int 
*nclasses)
+ int struct_size;
+ int state_size;
+ int labels_size;
++int wire_mask_size;
+ 
+ cls_wire = (xXIButtonInfo*)any_wire;
+ sizeXIButtonClassType(cls_wire-num_buttons,
+   struct_size, state_size,
+   labels_size);
+ cls_lib = next_block(ptr_lib, struct_size);
++wire_mask_size = ((cls_wire-num_buttons + 7)/8 + 3)/4 * 
4;
+ 
+ cls_lib-type = cls_wire-type;
+ cls_lib-sourceid = cls_wire-sourceid;
+@@ -1623,10 +1625,14 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int 
*nclasses)
+ cls_lib-state.mask_len = state_size;
+ cls_lib-state.mask = next_block(ptr_lib, state_size);
+ memcpy(cls_lib-state.mask, cls_wire[1],
+-   cls_lib-state.mask_len);
++   wire_mask_size);
++if (state_size != wire_mask_size)
++memset(cls_lib-state.mask[wire_mask_size], 0,
++   state_size - wire_mask_size);
+ 
+ cls_lib-labels = next_block(ptr_lib, labels_size);
+-atoms =(uint32_t*)((char*)cls_wire[1] + 
cls_lib-state.mask_len);
++
++atoms =(uint32_t*)((char*)cls_wire[1] + wire_mask_size);
+ for (j = 0; j  cls_lib-num_buttons; j++)
+ cls_lib-labels[j] = *atoms++;
+ 
+-- 
+1.7.9.1
+
diff --git a/debian/patches/series b/debian/patches/series
index fdffa2a..250f656 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# placeholder
+0001_fix_button_mask_and_labels.patch


-- 
To UNSUBSCRIBE,

libxi: Changes to 'ubuntu'

2012-03-30 Thread Chase Douglas 
 ChangeLog|   41 ++
 configure.ac |2 
 debian/changelog |8 +
 debian/patches/0001_scroll_increment_value.patch |   34 -
 debian/patches/series|2 
 src/XExtInt.c|  140 ---
 6 files changed, 154 insertions(+), 73 deletions(-)

New commits:
commit 9d9feef0eedd08ab02a452f4f3a9f659eb4a96bc
Author: Chase Douglas chase.doug...@canonical.com
Date:   Fri Mar 30 18:01:02 2012 -0700

releasing version 2:1.6.0-0ubuntu1

diff --git a/debian/changelog b/debian/changelog
index 4e3b191..3eb679d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libxi (2:1.6.0-0ubuntu1) UNRELEASED; urgency=low
+libxi (2:1.6.0-0ubuntu1) precise; urgency=low
 
   * New upstream release
 - Bug fixes only
   * Drop 0001_scroll_increment_value.patch, merged upstream
 
- -- Chase Douglas chase.doug...@ubuntu.com  Fri, 30 Mar 2012 17:54:20 -0700
+ -- Chase Douglas chase.doug...@ubuntu.com  Fri, 30 Mar 2012 17:58:18 -0700
 
 libxi (2:1.5.99.3-0ubuntu2) precise; urgency=low
 

commit a67812efa86bb3f2594f966a95d3d354e8a3d8ce
Author: Chase Douglas chase.doug...@canonical.com
Date:   Fri Mar 30 17:54:54 2012 -0700

Remove scroll increment patch, merged upstream

diff --git a/debian/changelog b/debian/changelog
index 1388991..31698c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,9 @@ libxi (2:1.6.0-1) UNRELEASED; urgency=low
 
   * New upstream release
   * Bump build deps on x11proto-input-dev
-  * Fix scroll valuator increment value on 32-bit machines
-- Added 0001_scroll_increment_value.patch
   * Bump lintian standards version to 3.9.3
 
- -- Chase Douglas chase.doug...@ubuntu.com  Fri, 30 Mar 2012 17:51:18 -0700
+ -- Chase Douglas chase.doug...@ubuntu.com  Fri, 30 Mar 2012 17:54:20 -0700
 
 libxi (2:1.5.99.2-1) experimental; urgency=low
 
diff --git a/debian/patches/0001_scroll_increment_value.patch 
b/debian/patches/0001_scroll_increment_value.patch
deleted file mode 100644
index 4c12f18..000
--- a/debian/patches/0001_scroll_increment_value.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2a31d05ade5a37eac7874f3d118fda80f2fa074c Mon Sep 17 00:00:00 2001
-From: Chase Douglas chase.doug...@canonical.com
-Date: Wed, 7 Mar 2012 14:09:17 -0800
-Subject: [PATCH] Use unsigned long long for double fractional calculation
-
-This fixes scroll class increment values on 32-bit machines. Performing
-1UL  32 shifts the bit off the end of a 32-bit unsigned long value. By
-expanding to 1ULL, we have the full 64-bits of an unsigned long long
-including on 32-bit machines.
-
-Before this change, xinput list --long would output scroll increment
-values of -nan.
-
-Signed-off-by: Chase Douglas chase.doug...@canonical.com

- src/XExtInt.c |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/XExtInt.c b/src/XExtInt.c
-index 7694f06..89c0894 100644
 a/src/XExtInt.c
-+++ b/src/XExtInt.c
-@@ -1695,7 +1695,7 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int 
*nclasses)
- cls_lib-scroll_type= cls_wire-scroll_type;
- cls_lib-flags  = cls_wire-flags;
- cls_lib-increment  = cls_wire-increment.integral;
--cls_lib-increment += (unsigned 
int)cls_wire-increment.frac/(double)(1UL  32);
-+cls_lib-increment += (unsigned 
int)cls_wire-increment.frac/(double)(1ULL  32);
- 
- to-classes[cls_idx++] = any_lib;
- }
--- 
-1.7.9
-
diff --git a/debian/patches/series b/debian/patches/series
index b58d4b7..fdffa2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0001_scroll_increment_value.patch
+# placeholder

commit a8f9343158e7135c35d168a58c8bc6d75b84e79f
Author: Chase Douglas chase.doug...@canonical.com
Date:   Fri Mar 30 17:51:39 2012 -0700

Bump lintian standards version to 3.9.3

diff --git a/debian/changelog b/debian/changelog
index fcd8366..1388991 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ libxi (2:1.6.0-1) UNRELEASED; urgency=low
   * Bump build deps on x11proto-input-dev
   * Fix scroll valuator increment value on 32-bit machines
 - Added 0001_scroll_increment_value.patch
+  * Bump lintian standards version to 3.9.3
 
- -- Chase Douglas chase.doug...@ubuntu.com  Fri, 30 Mar 2012 17:49:28 -0700
+ -- Chase Douglas chase.doug...@ubuntu.com  Fri, 30 Mar 2012 17:51:18 -0700
 
 libxi (2:1.5.99.2-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index b7ff2cd..a503100 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends:
  xorg-sgml-doctools (= 1:1.8),
  xsltproc,
  w3m,
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxi
 Vcs-Browser:

libxi: Changes to 'ubuntu'

2012-03-07 Thread Chase Douglas 
 debian/changelog |8 +
 debian/control   |2 -
 debian/patches/0001_scroll_increment_value.patch |   34 +++
 debian/patches/series|2 -
 4 files changed, 44 insertions(+), 2 deletions(-)

New commits:
commit 2eb85ada770daf89907b0a594772959e916ba4f3
Author: Chase Douglas chase.doug...@canonical.com
Date:   Wed Mar 7 14:44:27 2012 -0800

releasing version 2:1.5.99.3-0ubuntu2

diff --git a/debian/changelog b/debian/changelog
index 9164125..d181b34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libxi (2:1.5.99.3-0ubuntu2) UNRELEASED; urgency=low
+libxi (2:1.5.99.3-0ubuntu2) precise; urgency=low
 
   * Fix scroll valuator increment value on 32-bit machines (LP: #949465)
 - Added 0001_scroll_increment_value.patch
   * Bump lintian standards to 3.9.3
 
- -- Chase Douglas chase.doug...@ubuntu.com  Wed, 07 Mar 2012 14:42:28 -0800
+ -- Chase Douglas chase.doug...@ubuntu.com  Wed, 07 Mar 2012 14:44:19 -0800
 
 libxi (2:1.5.99.3-0ubuntu1) precise; urgency=low
 

commit 092dccd901b03ad09c456ce676e17b2074e80ecf
Author: Chase Douglas chase.doug...@canonical.com
Date:   Wed Mar 7 14:42:49 2012 -0800

Bump lintian standards to 3.9.3

diff --git a/debian/changelog b/debian/changelog
index bb89c3b..9164125 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ libxi (2:1.5.99.3-0ubuntu2) UNRELEASED; urgency=low
 
   * Fix scroll valuator increment value on 32-bit machines (LP: #949465)
 - Added 0001_scroll_increment_value.patch
+  * Bump lintian standards to 3.9.3
 
- -- Chase Douglas chase.doug...@ubuntu.com  Wed, 07 Mar 2012 14:21:45 -0800
+ -- Chase Douglas chase.doug...@ubuntu.com  Wed, 07 Mar 2012 14:42:28 -0800
 
 libxi (2:1.5.99.3-0ubuntu1) precise; urgency=low
 
diff --git a/debian/control b/debian/control
index 92b65b7..1bd9ae7 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends:
  xorg-sgml-doctools (= 1:1.8),
  xsltproc,
  w3m,
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxi
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxi.git
 

commit fd98d96f01bf47043f191fbfae29667d5a8607f9
Author: Chase Douglas chase.doug...@canonical.com
Date:   Wed Mar 7 14:20:22 2012 -0800

Fix scroll valuator increment value on 32-bit machines (LP: #949465)

* Fix scroll valuator increment value on 32-bit machines (LP: #949465)
  - Added 0001_scroll_increment_value.patch

diff --git a/debian/changelog b/debian/changelog
index 77ef652..bb89c3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxi (2:1.5.99.3-0ubuntu2) UNRELEASED; urgency=low
+
+  * Fix scroll valuator increment value on 32-bit machines (LP: #949465)
+- Added 0001_scroll_increment_value.patch
+
+ -- Chase Douglas chase.doug...@ubuntu.com  Wed, 07 Mar 2012 14:21:45 -0800
+
 libxi (2:1.5.99.3-0ubuntu1) precise; urgency=low
 
   * New upstream release candidate
diff --git a/debian/patches/0001_scroll_increment_value.patch 
b/debian/patches/0001_scroll_increment_value.patch
new file mode 100644
index 000..4c12f18
--- /dev/null
+++ b/debian/patches/0001_scroll_increment_value.patch
@@ -0,0 +1,34 @@
+From 2a31d05ade5a37eac7874f3d118fda80f2fa074c Mon Sep 17 00:00:00 2001
+From: Chase Douglas chase.doug...@canonical.com
+Date: Wed, 7 Mar 2012 14:09:17 -0800
+Subject: [PATCH] Use unsigned long long for double fractional calculation
+
+This fixes scroll class increment values on 32-bit machines. Performing
+1UL  32 shifts the bit off the end of a 32-bit unsigned long value. By
+expanding to 1ULL, we have the full 64-bits of an unsigned long long
+including on 32-bit machines.
+
+Before this change, xinput list --long would output scroll increment
+values of -nan.
+
+Signed-off-by: Chase Douglas chase.doug...@canonical.com
+---
+ src/XExtInt.c |2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/XExtInt.c b/src/XExtInt.c
+index 7694f06..89c0894 100644
+--- a/src/XExtInt.c
 b/src/XExtInt.c
+@@ -1695,7 +1695,7 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int 
*nclasses)
+ cls_lib-scroll_type= cls_wire-scroll_type;
+ cls_lib-flags  = cls_wire-flags;
+ cls_lib-increment  = cls_wire-increment.integral;
+-cls_lib-increment += (unsigned 
int)cls_wire-increment.frac/(double)(1UL  32);
++cls_lib-increment += (unsigned 
int)cls_wire-increment.frac/(double)(1ULL  32);
+ 
+ to-classes[cls_idx++] = any_lib;
+ }
+-- 
+1.7.9
+
diff --git a/debian/patches/series b/debian/patches/series
index 9bf2d52..b58d4b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# placeholder.
+0001_scroll_increment_value.patch


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a

libxi: Changes to 'ubuntu'

2012-02-10 Thread Chase Douglas 
 ChangeLog |   52 ++
 configure.ac  |6 ++--
 debian/changelog  |   27 +
 debian/control|4 +--
 debian/libxi6.symbols |4 ++-
 debian/rules  |2 -
 man/XSelectExtensionEvent.txt |2 -
 src/XIAllowEvents.c   |   23 +++---
 src/XListDev.c|   27 +++--
 9 files changed, 121 insertions(+), 26 deletions(-)

New commits:
commit 784b1fb88145278b0f97549f9e4f75fda46b0be3
Author: Chase Douglas chase.doug...@canonical.com
Date:   Fri Feb 10 23:19:39 2012 +0100

releasing version 2:1.5.99.3-0ubuntu1

diff --git a/debian/changelog b/debian/changelog
index ee18a9e..77ef652 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libxi (2:1.5.99.3-0ubuntu1) UNRELEASED; urgency=low
+libxi (2:1.5.99.3-0ubuntu1) precise; urgency=low
 
   * New upstream release candidate
   * Bump deps on x11proto-input-dev to 2.1.99.6
   * Fix libxi6.symbols (delete errant XIUngrabTouchBegin from ubuntu version)
 
- -- Chase Douglas chase.doug...@ubuntu.com  Fri, 10 Feb 2012 23:18:23 +0100
+ -- Chase Douglas chase.doug...@ubuntu.com  Fri, 10 Feb 2012 23:19:36 +0100
 
 libxi (2:1.5.99.2-1) experimental; urgency=low
 

commit e6f0d0e9ba9ddee34914671579fe05731663e26c
Author: Chase Douglas chase.doug...@canonical.com
Date:   Fri Feb 10 23:19:34 2012 +0100

Fix libxi6.symbols (delete errant XIUngrabTouchBegin from ubuntu version)

diff --git a/debian/changelog b/debian/changelog
index b02174b..ee18a9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ libxi (2:1.5.99.3-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream release candidate
   * Bump deps on x11proto-input-dev to 2.1.99.6
+  * Fix libxi6.symbols (delete errant XIUngrabTouchBegin from ubuntu version)
 
- -- Chase Douglas chase.doug...@ubuntu.com  Fri, 10 Feb 2012 23:12:08 +0100
+ -- Chase Douglas chase.doug...@ubuntu.com  Fri, 10 Feb 2012 23:18:23 +0100
 
 libxi (2:1.5.99.2-1) experimental; urgency=low
 
diff --git a/debian/libxi6.symbols b/debian/libxi6.symbols
index 0643a1d..535ce2f 100644
--- a/debian/libxi6.symbols
+++ b/debian/libxi6.symbols
@@ -77,7 +77,6 @@ libXi.so.6 libxi6 #MINVER#
  XUngrabDevice@Base 0
  XUngrabDeviceButton@Base 0
  XUngrabDeviceKey@Base 0
- XIUngrabTouchBegin@Base 2:1.4.1-1ubuntu1
  _XiGetDevicePresenceNotifyEvent@Base 2:1.1.2
  _xibadclass@Base 0
  _xibaddevice@Base 0

commit 9e9f93216b12b98b7371bcd2676a96248ffdca59
Author: Chase Douglas chase.doug...@canonical.com
Date:   Fri Feb 10 23:12:29 2012 +0100

Bump deps on x11proto-input-dev to 2.1.99.6

diff --git a/debian/changelog b/debian/changelog
index 31baf3d..b02174b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 libxi (2:1.5.99.3-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream release candidate
+  * Bump deps on x11proto-input-dev to 2.1.99.6
 
- -- Chase Douglas chase.doug...@ubuntu.com  Fri, 10 Feb 2012 23:11:05 +0100
+ -- Chase Douglas chase.doug...@ubuntu.com  Fri, 10 Feb 2012 23:12:08 +0100
 
 libxi (2:1.5.99.2-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 5226e40..92b65b7 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  debhelper (= 8.1.3),
  x11proto-core-dev (= 7.0.13),
  x11proto-xext-dev (= 7.0.3),
- x11proto-input-dev (= 2.1.99.5),
+ x11proto-input-dev (= 2.1.99.6),
  libx11-dev (= 2:1.4.99.1),
  libxext-dev (= 2:1.1.1-3),
  xmlto,
@@ -87,7 +87,7 @@ Depends:
  libxi6 (= ${binary:Version}),
  libx11-dev,
  libxext-dev,
- x11proto-input-dev (= 2.1.99.4),
+ x11proto-input-dev (= 2.1.99.6),
  xorg-sgml-doctools (= 1:1.5),
 Replaces:
  x11proto-input-dev ( 1.9.99)

commit 54209d37873661d2aaf92deab9ddca702e201dc3
Author: Chase Douglas chase.doug...@canonical.com
Date:   Fri Feb 10 23:11:35 2012 +0100

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 08ddaec..d05afbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,55 @@
+commit 34964b05c16161de65709d60799b9ad97ce56296
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Fri Jan 27 15:35:44 2012 +1000
+
+libXi 1.5.99.3
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit b355b7300235395717de06809ee6631ce55d3189
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Fri Jan 27 13:28:52 2012 +1000
+
+Handle new XIAllowEvent request size
+
+inputproto 2.1.99.6 restored the previous request for ABI compatibility
+reasons, and it introduced a new XI 2.2 specific define.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Keith Packard kei...@keithp.com
+
+commit 07ced7b48219e3bc0c98806f3d7106f86d1b2ca0
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Jan 17 21:26:14 2012 +0100
+
+Force class alignment to a multiple of sizeof(XID).
+
+Calculate length field to a multiples of

libxi: Changes to 'ubuntu'

2012-01-17 Thread Christopher Halse Rogers 
 debian/changelog |   13 +
 debian/control   |4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 5c2125e70099ff87007223af4e3083ebefc6d619
Author: Christopher James Halse Rogers r...@ubuntu.com
Date:   Wed Jan 18 11:47:14 2012 +1100

Bump build-depends on x11proto-input-dev to ensure we really get the MT 
protocol

diff --git a/debian/changelog b/debian/changelog
index e1cd9c4..a97ab3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxi (2:1.5.99.2-0ubuntu3) precise; urgency=low
+
+  * Bump build depends on x11proto-input-dev to 2.1.99.5.  Our 2.1.99.4 package
+is really 2.0.2, so 2.1.99.5 is the first version with MT support.
+
+ -- Christopher James Halse Rogers r...@ubuntu.com  Wed, 18 Jan 2012 
11:44:39 +1100
+
 libxi (2:1.5.99.2-0ubuntu2) precise; urgency=low
 
   * Bump build depends on libx11-dev
diff --git a/debian/control b/debian/control
index 385a09d..5226e40 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  debhelper (= 8.1.3),
  x11proto-core-dev (= 7.0.13),
  x11proto-xext-dev (= 7.0.3),
- x11proto-input-dev (= 2.1.99.4),
+ x11proto-input-dev (= 2.1.99.5),
  libx11-dev (= 2:1.4.99.1),
  libxext-dev (= 2:1.1.1-3),
  xmlto,

commit f112c10ec56c35e81a735eca4ee957d5838fde26
Author: Christopher James Halse Rogers r...@ubuntu.com
Date:   Wed Jan 18 11:42:57 2012 +1100

Bump build-depends on libx11-dev

diff --git a/debian/changelog b/debian/changelog
index 1c2b4b8..e1cd9c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxi (2:1.5.99.2-0ubuntu2) precise; urgency=low
+
+  * Bump build depends on libx11-dev
+
+ -- Chase Douglas chase.doug...@ubuntu.com  Fri, 13 Jan 2012 17:31:04 +0100
+
 libxi (2:1.5.99.2-0ubuntu1) precise; urgency=low
 
   * New upstream release candidate:
diff --git a/debian/control b/debian/control
index 796a3f0..385a09d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  x11proto-core-dev (= 7.0.13),
  x11proto-xext-dev (= 7.0.3),
  x11proto-input-dev (= 2.1.99.4),
- libx11-dev (= 2:1.3.3-2),
+ libx11-dev (= 2:1.4.99.1),
  libxext-dev (= 2:1.1.1-3),
  xmlto,
  asciidoc (= 8.4.5),


-- 
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/e1rnkpp-0003cr...@vasks.debian.org

libxi: Changes to 'ubuntu-oneiric'

2011-12-21 Thread Chase Douglas 
New branch 'ubuntu-oneiric' available with the following commits:


-- 
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/e1rdvfd-j9...@vasks.debian.org

libxi: Changes to 'ubuntu'

2011-12-21 Thread Chase Douglas 
 ChangeLog|  647 
 Makefile.am  |2 
 configure.ac |   17 
 debian/changelog |   23 
 debian/control   |9 
 debian/libxi-dev.install |6 
 debian/libxi6.symbols|2 
 debian/patches/1_xi2.1.patch |  375 
 debian/patches/series|1 
 debian/rules |3 
 doc/.gitignore   |4 
 doc/Makefile.am  |   63 --
 doc/porting.xml  | 1209 ---
 docbook.am   |  105 +++
 include/X11/extensions/XInput2.h |   62 ++
 man/Makefile.am  |   15 
 man/XGetFeedbackControl.txt  |   55 -
 man/XIChangeProperty.txt |   16 
 man/XIGrabButton.txt |  107 ++-
 man/XIGrabDevice.txt |   15 
 man/XIGrabEnter.txt  |   23 
 man/XIQueryDevice.txt|   69 ++
 specs/.gitignore |1 
 specs/Makefile.am|   65 --
 specs/encoding.xml   |2 
 specs/inputlib.xml   |   47 -
 specs/library.xml|  446 +++---
 src/Makefile.am  |9 
 src/XAllowDv.c   |3 
 src/XChgDCtl.c   |4 
 src/XChgFCtl.c   |4 
 src/XChgKMap.c   |4 
 src/XChgKbd.c|4 
 src/XChgPnt.c|4 
 src/XChgProp.c   |4 
 src/XCloseDev.c  |4 
 src/XDevBell.c   |4 
 src/XExtInt.c|  170 +
 src/XExtToWire.c |4 
 src/XFreeLst.c   |4 
 src/XGMotion.c   |3 
 src/XGetBMap.c   |4 
 src/XGetCPtr.c   |3 
 src/XGetDCtl.c   |4 
 src/XGetFCtl.c   |4 
 src/XGetKMap.c   |4 
 src/XGetMMap.c   |3 
 src/XGetProp.c   |3 
 src/XGetVers.c   |4 
 src/XGrDvBut.c   |3 
 src/XGrDvKey.c   |3 
 src/XGrabDev.c   |3 
 src/XGtFocus.c   |3 
 src/XGtSelect.c  |3 
 src/XIAllowEvents.c  |   50 +
 src/XIDefineCursor.c |4 
 src/XIGetDevFocus.c  |3 
 src/XIGrabDevice.c   |4 
 src/XIHierarchy.c|3 
 src/XIPassiveGrab.c  |   36 +
 src/XIQueryDevice.c  |   18 
 src/XIQueryPointer.c |3 
 src/XIQueryVersion.c |5 
 src/XISelEv.c|3 
 src/XISetCPtr.c  |3 
 src/XISetDevFocus.c  |4 
 src/XIWarpPointer.c  |3 
 src/XIint.h  |   16 
 src/XListDProp.c |2 
 src/XListDev.c   |3 
 src/XOpenDev.c   |3 
 src/XQueryDv.c   |3 
 src/XSelect.c|3 
 src/XSetBMap.c   |3 
 src/XSetDVal.c   |3 
 src/XSetMMap.c   |3 
 src/XSetMode.c   |3 
 src/XSndExEv.c   |   14 
 src/XStFocus.c   |3 
 src/XUngrDev.c   |3 
 src/XUngrDvB.c   |3 
 src/XUngrDvK.c   |3 
 82 files changed, 1760 insertions(+), 2105 deletions(-)

New commits:
commit 7bce4d47d420523e45d0105e1436f3ef63aa76b3
Author: Chase Douglas chase.doug...@canonical.com
Date:   Wed Dec 21 19:26:22 2011 -0800

releasing version 2:1.5.99.2-0ubuntu1

diff --git a/debian/changelog b/debian/changelog
index 158bfc8..1c2b4b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxi (2:1.5.99.2-0ubuntu1) UNRELEASED; urgency=low
+libxi (2:1.5.99.2-0ubuntu1) precise; urgency=low
 
   * New upstream release candidate:
 - Really with multitouch support.
@@ -6,7 +6,7 @@ libxi (2:1.5.99.2-0ubuntu1) UNRELEASED; urgency=low
   * Bump x11proto-input-dev dependencies
   * Bump XIAllowTouchEvents symbols minver due to added parameter
 
- -- Chase Douglas chase.doug...@ubuntu.com  Wed, 21 Dec 2011 19:22:11 -0800
+ -- Chase Douglas chase.doug...@ubuntu.com  Wed, 21 Dec 2011 19:25:46 -0800
 
 libxi (2:1.4.99.1-1) experimental; urgency=low
 

commit 7c82aa3bd51fbc2968c31d4b54c53cbcc08bef95
Author: Chase Douglas chase.doug...@canonical.com
Date:   Wed Dec 21 19:23:03 2011 -0800

Bump XIAllowTouchEvents symbols minver due to added parameter

diff --git a/debian/changelog b/debian/changelog
index 4570ee9..158bfc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ libxi (2:1.5.99.2-0ubuntu1) UNRELEASED; urgency=low
 - Really with multitouch support.
   * Removed prototype multitouch patch
   * Bump

libxi: Changes to 'ubuntu'

2011-06-14 Thread Timo Aaltonen 
 ChangeLog|  127 +++
 configure.ac |2 
 debian/changelog |   31 ++
 debian/control   |6 +-
 debian/patches/1_xi2.1.patch |4 -
 debian/patches/series|3 -
 debian/rules |   11 ++-
 man/XGetExtensionVersion.txt |   11 ++-
 man/XIChangeHierarchy.txt|3 -
 man/XIChangeProperty.txt |2 
 man/XIGrabButton.txt |2 
 man/XIGrabEnter.txt  |2 
 src/XExtInt.c|2 
 src/XIHierarchy.c|3 +
 src/XIPassiveGrab.c  |4 -
 src/XISelEv.c|2 
 16 files changed, 191 insertions(+), 24 deletions(-)

New commits:
commit e2728a953ca72a9ef7ac63a50bb9c5a0972d2a6a
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Tue Jun 14 10:01:28 2011 +0300

Update 1_xi2.1.patch

diff --git a/debian/patches/1_xi2.1.patch b/debian/patches/1_xi2.1.patch
index 0425c1b..70caf4d 100644
--- a/debian/patches/1_xi2.1.patch
+++ b/debian/patches/1_xi2.1.patch
@@ -4,8 +4,8 @@
  
  # Initialize Autoconf
  AC_PREREQ([2.60])
--AC_INIT([libXi], [1.4.2],
-+AC_INIT([libXi], [1.4.2.99.1],
+-AC_INIT([libXi], [1.4.3],
++AC_INIT([libXi], [1.4.3.99.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi])
  AC_CONFIG_SRCDIR([Makefile.am])
  AC_CONFIG_HEADERS([src/config.h])

commit 60e06a977ee4f7bb534cda37f6a87e966036c81c
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jun 12 00:20:31 2011 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 7f416c6..0474e91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-libxi (2:1.4.3-3) UNRELEASED; urgency=low
+libxi (2:1.4.3-3) unstable; urgency=low
 
+  * Team upload.
   * Don't ship debug symbols for the udeb in libxi6-dbg.
   * Add build-{arch,indep} debian/rules targets.
 
- -- Julien Cristau jcris...@debian.org  Sun, 12 Jun 2011 00:19:18 +0200
+ -- Julien Cristau jcris...@debian.org  Sun, 12 Jun 2011 00:20:23 +0200
 
 libxi (2:1.4.3-2) unstable; urgency=low
 

commit a08b85b3f03906c80573632c7ca7ff33872d7668
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jun 12 00:20:22 2011 +0200

Add build-{arch,indep} debian/rules targets.

diff --git a/debian/changelog b/debian/changelog
index fa9b508..7f416c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libxi (2:1.4.3-3) UNRELEASED; urgency=low
 
   * Don't ship debug symbols for the udeb in libxi6-dbg.
+  * Add build-{arch,indep} debian/rules targets.
 
  -- Julien Cristau jcris...@debian.org  Sun, 12 Jun 2011 00:19:18 +0200
 
diff --git a/debian/rules b/debian/rules
index 1ea2432..d68052a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,11 @@ build/config.status: configure
 CFLAGS=$(CFLAGS) 
 
 
-build: build-stamp
+build: build-indep build-arch
+build-indep:
+build-arch: build-stamp
+.PHONY: build build-indep build-arch
+
 build-stamp: build/config.status
dh_testdir
cd build  $(MAKE)
@@ -105,4 +109,4 @@ binary-indep: build install
 # Nothing to do
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: clean binary-indep binary-arch binary install

commit 3e796717c0dffd71824145669e504659adc740eb
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jun 12 00:19:36 2011 +0200

Don't ship debug symbols for the udeb in libxi6-dbg.

diff --git a/debian/changelog b/debian/changelog
index 64511cb..fa9b508 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxi (2:1.4.3-3) UNRELEASED; urgency=low
+
+  * Don't ship debug symbols for the udeb in libxi6-dbg.
+
+ -- Julien Cristau jcris...@debian.org  Sun, 12 Jun 2011 00:19:18 +0200
+
 libxi (2:1.4.3-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index 75fb414..1ea2432 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,7 +89,8 @@ binary-arch: build install
dh_installman
dh_installchangelogs ChangeLog
dh_link
-   dh_strip --dbg-package=$(PACKAGE)-dbg
+   dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
+   dh_strip -N$(PACKAGE)
dh_compress
dh_fixperms
dh_makeshlibs -V'libxi6 (= 2:1.2.99.4)' --add-udeb=$(PACKAGE)-udeb

commit 3dc1390e099d60a1c09e69ccda9c2b019d178080
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jun 11 16:14:45 2011 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 6fcee0c..64511cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-libxi (2:1.4.3-2) UNRELEASED; urgency=low
+libxi (2:1.4.3-2) unstable; urgency=low
+
+  * Team upload.
 
   [ Steve Langasek ]
   * Build for multiarch.
@@ -6,7 +8,7 @@ libxi (2:1.4.3-2) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Remove David Nusinow from Uploaders.
 
- -- Julien Cristau jcris...@debian.org  Sat, 11 Jun 2011 16:10:55 +0200
+ -- Julien

libxi: Changes to 'ubuntu'

2011-06-14 Thread Timo Aaltonen 
 debian/changelog|   10 +++---
 debian/patches/100_len_raw_events.patch |   51 
 2 files changed, 6 insertions(+), 55 deletions(-)

New commits:
commit 6f24a910db3c5ef99a16872888e7faf17453527b
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Tue Jun 14 15:26:10 2011 +0300

Update the changelog for release.

and add some details.

diff --git a/debian/changelog b/debian/changelog
index 1b68868..070fb93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-libxi (2:1.4.3-3ubuntu1) UNRELEASED; urgency=low
+libxi (2:1.4.3-3ubuntu1) oneiric; urgency=low
 
-  * Merge from Debian unstable.
-  * Update 1_xi2.1.patch.
+  * Merge from Debian unstable, remaining changes:
+- Add xi 2.1 support
+  * Update 1_xi2.1.patch to apply.
+  * Drop 100_len_raw_events.patch, included upstream.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Wed, 25 May 2011 11:04:02 +0300
+ -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 14 Jun 2011 14:28:17 +0300
 
 libxi (2:1.4.3-3) unstable; urgency=low
 
diff --git a/debian/patches/100_len_raw_events.patch 
b/debian/patches/100_len_raw_events.patch
deleted file mode 100644
index 9320f27..000
--- a/debian/patches/100_len_raw_events.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit af65475b1f6b7209750220a74aaad9968d54aaf7
-Author: Peter Hutterer peter.hutte...@who-t.net
-Date:   Tue May 3 13:21:02 2011 +1000
-
-Allocate enough memory for raw events + extra data.
-
-Necessary space was calculated, but not actually used to allocate memory. 
As
-a result, valuator data would overwrite the allocated memory.
-
-==4166== Invalid write of size 1
-==4166==at 0x4C29F04: memcpy (mc_replace_strmem.c:497)
-==4166==by 0x8F39180: ??? (in /usr/lib/libXi.so.6.1.0)
-==4166==by 0x7433D48: _XCopyEventCookie (in /usr/lib/libX11.so.6.3.0)
-==4166==by 0x7425166: XPeekEvent (in /usr/lib/libX11.so.6.3.0)
-==4166==by 0x49C3E3: process_key (x11_be.c:1065)
-==4166==by 0x49EA5C: event_key_release (x11_be.c:2201)
-==4166==by 0x49DD6E: x11_be_process_events (x11_be.c:1892)
-==4166==by 0x4A38F4: x11_be_main_loop (x11_be.c:4353)
-==4166==by 0x4A39E1: x11_be_thread_main (x11_be.c:4385)
-==4166==by 0x87549C9: start_thread (pthread_create.c:300)
-==4166==by 0x8A516FC: clone (clone.S:112)
-==4166==  Address 0x168afe80 is 0 bytes after a block of size 96 alloc'd
-==4166==at 0x4C284A8: malloc (vg_replace_malloc.c:236)
-==4166==by 0x8F390BD: ??? (in /usr/lib/libXi.so.6.1.0)
-==4166==by 0x7433D48: _XCopyEventCookie (in /usr/lib/libX11.so.6.3.0)
-==4166==by 0x7425166: XPeekEvent (in /usr/lib/libX11.so.6.3.0)
-==4166==by 0x49C3E3: process_key (x11_be.c:1065)
-==4166==by 0x49EA5C: event_key_release (x11_be.c:2201)
-==4166==by 0x49DD6E: x11_be_process_events (x11_be.c:1892)
-==4166==by 0x4A38F4: x11_be_main_loop (x11_be.c:4353)
-==4166==by 0x4A39E1: x11_be_thread_main (x11_be.c:4385)
-==4166==by 0x87549C9: start_thread (pthread_create.c:300)
-
-Reported-by: Roger Cruz roger.c...@virtualcomputer.com
-Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
-Reviewed-by: Jeremy Huddleston jerem...@apple.com
-Reviewed-by: Daniel Stone dan...@fooishbar.org
-
-diff --git a/src/XExtInt.c b/src/XExtInt.c
-index d1451cc..134ccc6 100644
 a/src/XExtInt.c
-+++ b/src/XExtInt.c
-@@ -1259,7 +1259,7 @@ copyRawEvent(XGenericEventCookie *cookie_in,
- len = sizeof(XIRawEvent) + in-valuators.mask_len;
- len += bits * sizeof(double) * 2;
- 
--ptr = cookie_out-data = malloc(sizeof(XIRawEvent));
-+ptr = cookie_out-data = malloc(len);
- if (!ptr)
- return False;
- 


-- 
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/e1qwzwm-0008me...@vasks.debian.org

libxi: Changes to 'ubuntu'

2011-05-19 Thread Bryce Harrington 
 debian/patches/.gitignore   |1 
 debian/patches/100_len_raw_events.patch |   51 
 2 files changed, 52 insertions(+)

New commits:
commit 236593e3f348176b2a44e5118c35fac11bce2204
Author: Bryce Harrington br...@canonical.com
Date:   Thu May 19 10:26:44 2011 -0700

Add missing patch.  Stop git from ignoring patches.

diff --git a/debian/patches/.gitignore b/debian/patches/.gitignore
new file mode 100644
index 000..69f1bf4
--- /dev/null
+++ b/debian/patches/.gitignore
@@ -0,0 +1 @@
+!*.patch
diff --git a/debian/patches/100_len_raw_events.patch 
b/debian/patches/100_len_raw_events.patch
new file mode 100644
index 000..9320f27
--- /dev/null
+++ b/debian/patches/100_len_raw_events.patch
@@ -0,0 +1,51 @@
+commit af65475b1f6b7209750220a74aaad9968d54aaf7
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue May 3 13:21:02 2011 +1000
+
+Allocate enough memory for raw events + extra data.
+
+Necessary space was calculated, but not actually used to allocate memory. 
As
+a result, valuator data would overwrite the allocated memory.
+
+==4166== Invalid write of size 1
+==4166==at 0x4C29F04: memcpy (mc_replace_strmem.c:497)
+==4166==by 0x8F39180: ??? (in /usr/lib/libXi.so.6.1.0)
+==4166==by 0x7433D48: _XCopyEventCookie (in /usr/lib/libX11.so.6.3.0)
+==4166==by 0x7425166: XPeekEvent (in /usr/lib/libX11.so.6.3.0)
+==4166==by 0x49C3E3: process_key (x11_be.c:1065)
+==4166==by 0x49EA5C: event_key_release (x11_be.c:2201)
+==4166==by 0x49DD6E: x11_be_process_events (x11_be.c:1892)
+==4166==by 0x4A38F4: x11_be_main_loop (x11_be.c:4353)
+==4166==by 0x4A39E1: x11_be_thread_main (x11_be.c:4385)
+==4166==by 0x87549C9: start_thread (pthread_create.c:300)
+==4166==by 0x8A516FC: clone (clone.S:112)
+==4166==  Address 0x168afe80 is 0 bytes after a block of size 96 alloc'd
+==4166==at 0x4C284A8: malloc (vg_replace_malloc.c:236)
+==4166==by 0x8F390BD: ??? (in /usr/lib/libXi.so.6.1.0)
+==4166==by 0x7433D48: _XCopyEventCookie (in /usr/lib/libX11.so.6.3.0)
+==4166==by 0x7425166: XPeekEvent (in /usr/lib/libX11.so.6.3.0)
+==4166==by 0x49C3E3: process_key (x11_be.c:1065)
+==4166==by 0x49EA5C: event_key_release (x11_be.c:2201)
+==4166==by 0x49DD6E: x11_be_process_events (x11_be.c:1892)
+==4166==by 0x4A38F4: x11_be_main_loop (x11_be.c:4353)
+==4166==by 0x4A39E1: x11_be_thread_main (x11_be.c:4385)
+==4166==by 0x87549C9: start_thread (pthread_create.c:300)
+
+Reported-by: Roger Cruz roger.c...@virtualcomputer.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Jeremy Huddleston jerem...@apple.com
+Reviewed-by: Daniel Stone dan...@fooishbar.org
+
+diff --git a/src/XExtInt.c b/src/XExtInt.c
+index d1451cc..134ccc6 100644
+--- a/src/XExtInt.c
 b/src/XExtInt.c
+@@ -1259,7 +1259,7 @@ copyRawEvent(XGenericEventCookie *cookie_in,
+ len = sizeof(XIRawEvent) + in-valuators.mask_len;
+ len += bits * sizeof(double) * 2;
+ 
+-ptr = cookie_out-data = malloc(sizeof(XIRawEvent));
++ptr = cookie_out-data = malloc(len);
+ if (!ptr)
+ return False;
+ 


-- 
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/e1qn70a-0005kh...@alioth.debian.org

libxi: Changes to 'ubuntu'

2011-05-06 Thread Bryce Harrington 
 debian/changelog |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 893b749962ad45b10e13ce4c9adf7c2705a467a2
Author: Bryce Harrington br...@canonical.com
Date:   Thu May 5 23:41:48 2011 -0700

Add 100_len_raw_events.patch: Cherrypick upstream patch to correct the use 
of the calculated structure length for memory allocations.  Fixes issue where 
incorrect memory size was allocated, leading to valuator data overwriting 
memory, resulting in an error Invalid write of size 1 and heap corruption 
causing applications to crash when they use Raw Events.  (LP: #770522)

diff --git a/debian/changelog b/debian/changelog
index d26e303..a5ed924 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libxi (2:1.4.1-1ubuntu3) oneiric; urgency=low
+
+  * Add 100_len_raw_events.patch: Cherrypick upstream patch to correct the
+use of the calculated structure length for memory allocations.  Fixes
+issue where incorrect memory size was allocated, leading to valuator
+data overwriting memory, resulting in an error Invalid write of size
+1 and heap corruption causing applications to crash when they use Raw
+Events.  (LP: #770522)
+
+ -- Bryce Harrington br...@ubuntu.com  Thu, 05 May 2011 14:11:39 -0700
+
 libxi (2:1.4.1-1ubuntu2) natty; urgency=low
 
   * FFe LP: #733501: build for multiarch.


-- 
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/e1qiejc-00069s...@alioth.debian.org

Re: libxi: Changes to 'ubuntu'

2011-05-06 Thread Cyril Brulebois 
Hi,

Bryce Harrington bryce-gu...@alioth.debian.org (06/05/2011):
  debian/changelog |   11 +++
  1 file changed, 11 insertions(+)

git show origin/ubuntu:debian/patches seems to confirm you're
apparently missing a few git add. :)

Mraw,
KiBi.


signature.asc
Description: Digital signature

libxi: Changes to 'ubuntu'

2011-03-23 Thread Steve Langasek 
 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 97b96f89a2cab1dfdeb668419f6cc93815865b36
Author: Steve Langasek steve.langa...@ubuntu.com
Date:   Wed Mar 23 00:36:59 2011 -0700

mark as uploaded

diff --git a/debian/changelog b/debian/changelog
index 8c53ba2..0c36b24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxi (2:1.4.1-1ubuntu1) UNRELEASED; urgency=low
+libxi (2:1.4.1-1ubuntu1) natty; urgency=low
 
   * Add xi 2.1 support
 - Added 1_xi2.1.patch


-- 
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/e1q2id5-0007ro...@alioth.debian.org

libxi: Changes to 'ubuntu'

2011-03-23 Thread Steve Langasek 
 debian/changelog   |6 ++
 debian/control |5 -
 debian/libxi-dev.install   |6 +++---
 debian/libxi6-udeb.install |2 +-
 debian/libxi6.install  |2 +-
 debian/rules   |2 ++
 6 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit 4becd4a66beca9c391ff6facc1a720c70f546148
Author: Steve Langasek steve.langa...@ubuntu.com
Date:   Wed Mar 23 00:38:04 2011 -0700

FFe LP: #733501: build for multiarch.

diff --git a/debian/changelog b/debian/changelog
index 0c36b24..d26e303 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxi (2:1.4.1-1ubuntu2) natty; urgency=low
+
+  * FFe LP: #733501: build for multiarch.
+
+ -- Steve Langasek steve.langa...@ubuntu.com  Wed, 23 Mar 2011 00:37:35 -0700
+
 libxi (2:1.4.1-1ubuntu1) natty; urgency=low
 
   * Add xi 2.1 support
diff --git a/debian/control b/debian/control
index 79591f3..c315f59 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Ubuntu X-SWAT ubunt...@lists.ubuntu.com
 XSBC-Original-Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow dnusi...@debian.org, Drew Parsons 
dpars...@debian.org, Cyril Brulebois k...@debian.org
 Build-Depends:
- debhelper (= 8.1.3),
+ debhelper (= 8.1.2ubuntu2),
  x11proto-core-dev (= 7.0.13),
  x11proto-xext-dev (= 7.0.3),
  x11proto-input-dev (= 2.0.1-1ubuntu1),
diff --git a/debian/libxi6-udeb.install b/debian/libxi6-udeb.install
index 32abb0e..8ec79b8 100644
--- a/debian/libxi6-udeb.install
+++ b/debian/libxi6-udeb.install
@@ -1 +1 @@
-usr/lib/libXi.so.6*
+usr/lib/*/libXi.so.6* usr/lib

commit 6579a0f7ddc3223242214432505ee1f64ed7f493
Author: Steve Langasek steve.langa...@ubuntu.com
Date:   Wed Mar 23 00:24:38 2011 -0700

build for multiarch

diff --git a/debian/control b/debian/control
index dc0887e..79591f3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Ubuntu X-SWAT ubunt...@lists.ubuntu.com
 XSBC-Original-Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow dnusi...@debian.org, Drew Parsons 
dpars...@debian.org, Cyril Brulebois k...@debian.org
 Build-Depends:
- debhelper (= 5.0.0),
+ debhelper (= 8.1.3),
  x11proto-core-dev (= 7.0.13),
  x11proto-xext-dev (= 7.0.3),
  x11proto-input-dev (= 2.0.1-1ubuntu1),
@@ -30,6 +30,8 @@ Package: libxi6
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: multiarch-support
+Multi-Arch: same
 Description: X11 Input extension library
  libXi provides an X Window System client interface to the XINPUT
  extension to the X protocol.
@@ -57,6 +59,7 @@ Section: debug
 Architecture: any
 Priority: extra
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxi6 (= ${binary:Version})
+Multi-Arch: same
 Description: X11 Input extension library (debug package)
  libXi provides an X Window System client interface to the XINPUT
  extension to the X protocol.
diff --git a/debian/libxi-dev.install b/debian/libxi-dev.install
index 1ddc544..dd8b3e3 100644
--- a/debian/libxi-dev.install
+++ b/debian/libxi-dev.install
@@ -1,6 +1,6 @@
-usr/lib/libXi.a
-usr/lib/libXi.so
-usr/lib/pkgconfig/xi.pc
+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
diff --git a/debian/libxi6.install b/debian/libxi6.install
index 32abb0e..afccc4c 100644
--- a/debian/libxi6.install
+++ b/debian/libxi6.install
@@ -1 +1 @@
-usr/lib/libXi.so.6*
+usr/lib/*/libXi.so.6*
diff --git a/debian/rules b/debian/rules
index 7956d93..75fb414 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
 endif
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -42,6 +43,7 @@ build/config.status: configure
 --infodir=\$${prefix}/share/info $(confflags) \
 --with-xmlto \
 --without-fop \
+--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 CFLAGS=$(CFLAGS) 
 
 


-- 
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/e1q2jmx-0005po...@alioth.debian.org

libxi: Changes to 'ubuntu'

2011-02-21 Thread Chase Douglas 
Rebased ref, commits from common ancestor:
commit ad3f68e5957f1653f275ddf05997d7d839311153
Author: Chase Douglas chase.doug...@canonical.com
Date:   Tue Feb 1 17:52:05 2011 -0500

Add xi 2.1 support

* Add xi 2.1 support
  - Added 1_xi2.1.patch
  - Bump dependency on x11proto-input-dev for xi 2.1
  - Add new xi 2.1 symbols to symbols file
* Update maintainer for Ubuntu upload

diff --git a/debian/changelog b/debian/changelog
index 778348d..8c53ba2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libxi (2:1.4.1-1ubuntu1) UNRELEASED; urgency=low
+
+  * Add xi 2.1 support
+- Added 1_xi2.1.patch
+- Bump dependency on x11proto-input-dev for xi 2.1
+- Add new xi 2.1 symbols to symbols file
+  * Update maintainer for Ubuntu upload
+
+ -- Chase Douglas chase.doug...@ubuntu.com  Mon, 21 Feb 2011 19:54:15 -0500
+
 libxi (2:1.4.1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 38dbf2c..dc0887e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,14 @@
 Source: libxi
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force debian-x@lists.debian.org
+Maintainer: Ubuntu X-SWAT ubunt...@lists.ubuntu.com
+XSBC-Original-Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow dnusi...@debian.org, Drew Parsons 
dpars...@debian.org, Cyril Brulebois k...@debian.org
 Build-Depends:
  debhelper (= 5.0.0),
  x11proto-core-dev (= 7.0.13),
  x11proto-xext-dev (= 7.0.3),
- x11proto-input-dev (= 1.9.99.902),
+ x11proto-input-dev (= 2.0.1-1ubuntu1),
  libx11-dev (= 2:1.3.3-2),
  libxext-dev (= 2:1.1.1-3),
  xmlto,
@@ -82,7 +83,7 @@ Depends:
  libxi6 (= ${binary:Version}),
  libx11-dev,
  libxext-dev,
- x11proto-input-dev (= 1.9.99.902),
+ x11proto-input-dev (= 2.0.1-1ubuntu1),
  xorg-sgml-doctools (= 1:1.5),
 Replaces:
  x11proto-input-dev ( 1.9.99)
diff --git a/debian/libxi6.symbols b/debian/libxi6.symbols
index 975a92b..a76b052 100644
--- a/debian/libxi6.symbols
+++ b/debian/libxi6.symbols
@@ -1,5 +1,6 @@
 libXi.so.6 libxi6 #MINVER#
  XAllowDeviceEvents@Base 0
+ XIAllowTouchEvents@Base 2:1.4.1-1ubuntu1
  XChangeDeviceControl@Base 0
  XChangeDeviceDontPropagateList@Base 0
  XChangeDeviceKeyMapping@Base 0
@@ -27,6 +28,7 @@ libXi.so.6 libxi6 #MINVER#
  XGetFeedbackControl@Base 0
  XGetSelectedExtensionEvents@Base 0
  XGrabDevice@Base 0
+ XIGrabTouchBegin@Base 2:1.4.1-1ubuntu1
  XIAllowEvents@Base 2:1.2.99.4
  XIChangeHierarchy@Base 2:1.2.99.4
  XIChangeProperty@Base 2:1.2.99.4
@@ -72,6 +74,7 @@ libXi.so.6 libxi6 #MINVER#
  XUngrabDevice@Base 0
  XUngrabDeviceButton@Base 0
  XUngrabDeviceKey@Base 0
+ XIUngrabTouchBegin@Base 2:1.4.1-1ubuntu1
  _XiGetDevicePresenceNotifyEvent@Base 2:1.1.2
  _xibadclass@Base 0
  _xibaddevice@Base 0
diff --git a/debian/patches/1_xi2.1.patch b/debian/patches/1_xi2.1.patch
new file mode 100644
index 000..dc998d3
--- /dev/null
+++ b/debian/patches/1_xi2.1.patch
@@ -0,0 +1,375 @@
+--- a/configure.ac
 b/configure.ac
+@@ -2,7 +2,7 @@ dnl Process this file with autoconf to c
+ 
+ AC_PREREQ([2.60])
+ 
+-AC_INIT(libXi, 1.4.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
++AC_INIT(libXi, 1.4.1.99.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+@@ -24,7 +24,7 @@ AC_PROG_LIBTOOL
+ AC_PROG_SED
+ 
+ # Checks for pkg-config packages
+-PKG_CHECK_MODULES(XI, [xproto = 7.0.13] [x11 = 1.2.99.1] [xextproto = 
7.0.3] [xext = 1.0.99.1] [inputproto = 1.9.99.902])
++PKG_CHECK_MODULES(XI, [xproto = 7.0.13] [x11 = 1.2.99.1] [xextproto = 
7.0.3] [xext = 1.0.99.1] [inputproto = 2.0.99.1])
+ 
+ # Check for xmlto and asciidoc for man page conversion
+ # (only needed by people building tarballs)
+--- a/include/X11/extensions/XInput2.h
 b/include/X11/extensions/XInput2.h
+@@ -135,6 +135,25 @@ typedef struct
+ 
+ typedef struct
+ {
++int  type;
++int  sourceid;
++int  mode;
++int  num_touches;
++} XITouchClassInfo;
++
++typedef struct
++{
++int  type;
++int  sourceid;
++int  number;
++Atom label;
++double   min;
++double   max;
++int  resolution;
++} XITouchValuatorClassInfo;
++
++typedef struct
++{
+ int deviceid;
+ char*name;
+ int use;
+@@ -292,6 +311,20 @@ typedef struct {
+ int   what;
+ } XIPropertyEvent;
+ 
++typedef struct {
++int   type; /* GenericEvent */
++unsigned long serial;   /* # of last request processed by server */
++Bool  send_event;   /* true if this came from a SendEvent request 
*/
++Display   *display; /* Display the event was read from */
++int   extension;/* XI extension offset */
++int   evtype;
++Time  time;
++int   deviceid;
++

libxi: Changes to 'ubuntu'

2009-05-15 Thread Timo Aaltonen 
 ChangeLog|   48 
+
 README   |   25 
 configure.ac |2 
 debian/changelog |   45 

 debian/libxi6.symbols|   51 
++
 debian/patches/101_fix_devicepresence_declaration_cplusplus.diff |   24 
 debian/patches/series|1 
 debian/rules |2 
 src/XGetDCtl.c   |7 -
 src/XListDProp.c |   12 --
 10 files changed, 203 insertions(+), 14 deletions(-)

New commits:
commit 1d5a0804f337a8731ea9a834357863d371873bab
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Fri May 15 11:23:47 2009 +0300

Release 1.2.1-2ubuntu1

update the changelog.

diff --git a/debian/changelog b/debian/changelog
index 9017833..c0ebcb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+libxi (2:1.2.1-2ubuntu1) karmic; urgency=low
+
+  * Merge with Debian experimental, remaining changes:
+- debian/control: libxi-dev Replaces x11proto-input-dev (= 1.4.3-2)
+- copy XInput.h from inputproto 1.5.0, libxi-dev includes it.
+  Upstream decided not to move it for 1.2.0, but we already had it so
+  continue shipping it in libxi-dev.
+- 100_install_xinput.h.diff: Modify the Makefile.am to install
+  XInput.h.
+- 101_fix_devicepresence_declaration_cplusplus.diff:
+  Use extern C in the declaration for DevicePresence (in
+  XInput.h) so that it can be accessed from C++.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Fri, 15 May 2009 11:22:00 +0300
+
 libxi (2:1.2.1-2) unstable; urgency=low
 
   * Fix typo in debian/rules, which made us build with make -j if

commit 5e64cc1f789a23bb9c75d56efc361183c9cf99db
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Fri May 15 11:16:26 2009 +0300

101_fix_devicepresence_declaration_cplusplus.diff:

- Use extern C in the declaration for DevicePresence (in
  XInput.h) so that it can be accessed from C++ (LP: #373711).

diff --git a/debian/changelog b/debian/changelog
index 8bcaefa..029eb17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libxi (2:1.2.0-1ubuntu2) karmic; urgency=low
+
+  [ Alberto Milone ]
+  * debian/patches/101_fix_devicepresence_declaration_cplusplus.diff:
+- Use extern C in the declaration for DevicePresence (in 
+  XInput.h) so that it can be accessed from C++ (LP: #373711).
+
+ -- Alberto Milone alberto.mil...@canonical.com  Fri, 08 May 2009 17:05:49 
+0200
+
 libxi (2:1.2.0-1ubuntu1) jaunty; urgency=low
 
   * Merge with Debian experimental, remaining changes:
diff --git a/debian/patches/101_fix_devicepresence_declaration_cplusplus.diff 
b/debian/patches/101_fix_devicepresence_declaration_cplusplus.diff
new file mode 100644
index 000..3758b01
--- /dev/null
+++ b/debian/patches/101_fix_devicepresence_declaration_cplusplus.diff
@@ -0,0 +1,24 @@
+Index: libxi/include/X11/extensions/XInput.h
+===
+--- libxi-1.2.0.orig/include/X11/extensions/XInput.h   2009-05-08 
15:25:01.0 +0200
 libxi-1.2.0/include/X11/extensions/XInput.h2009-05-08 
15:40:12.0 +0200
+@@ -156,9 +156,18 @@
+ #define NoExtensionEvent(d,type,_class) \
+ { _class =  ((XDevice *) d)-device_id  8 | _noExtensionEvent;}
+ 
++
++/* We need the declaration for DevicePresence. */
++#if defined(__cplusplus) || defined(c_plusplus)
++extern C {
++#endif
++extern int _XiGetDevicePresenceNotifyEvent(Display *);
++#if defined(__cplusplus) || defined(c_plusplus)
++}
++#endif
++
+ #define DevicePresence(dpy, type, _class)   \
+ {   \
+-extern int _XiGetDevicePresenceNotifyEvent(Display *);  \
+ type = _XiGetDevicePresenceNotifyEvent(dpy);\
+ _class =  (0x1 | _devicePresence);  \
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 01a17de..1c54206 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 100_install_xinput.h.diff
+101_fix_devicepresence_declaration_cplusplus.diff

commit 78b6f5770ea5df55763e06131c6e9ecc5ddd9b7d
Author: Julien Cristau jcris...@debian.org
Date:   Mon Mar 16 15:27:59 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 58039b3..e615ac7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libxi (2:1.2.1-2) UNRELEASED; urgency=low
+libxi (2:1.2.1-2) unstable; urgency=low
 
   * Fix typo in debian/rules, which made us build with make -j if
 DEB_BUILD_OPTIONS didn't ask for

libxi: Changes to 'ubuntu'

2009-01-22 Thread Timo Aaltonen 
New branch 'ubuntu' available with the following commits:
commit c9c95455a963241b1d2c87c472b931612c772eef
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Thu Jan 22 17:49:28 2009 +0200

Release

commit 46326153f50b14e4c81fe07ae99d01e4085923cf
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Thu Jan 22 17:29:18 2009 +0200

Initial ubuntu commit

deleted src/config.h.in while at it.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org