libxi: Changes to 'ubuntu'
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.douglas@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.douglas@ubuntu.com> Wed, 07 Mar 2012 14:42:28 -0800
+ -- Chase Douglas <chase.douglas@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.douglas@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.douglas@ubuntu.com> Wed, 07 Mar 2012 14:21:45 -0800
+ -- Chase Douglas <chase.douglas@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.douglas@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.douglas@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 0000000..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.douglas@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.douglas@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
Reply to: