xserver-xorg-input-evdev: Changes to 'ubuntu'
ChangeLog | 8 ++++++++
configure.ac | 2 +-
debian/changelog | 10 ++++++++++
debian/control | 2 +-
debian/patches/0005-fix-horiz-scrolling.patch | 23 +++++++++++++++++++++++
debian/patches/series | 1 +
6 files changed, 44 insertions(+), 2 deletions(-)
New commits:
commit 07dd490a682621169023b781509eac59898faf38
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Thu Mar 15 08:46:23 2012 -0700
releasing version 1:2.7.0-0ubuntu1
diff --git a/debian/changelog b/debian/changelog
index 25f0e10..8fc1ffb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.7.0-0ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.7.0-0ubuntu1) precise; urgency=low
* New upstream release
- No changes since last git snapshot
@@ -6,7 +6,7 @@ xserver-xorg-input-evdev (1:2.7.0-0ubuntu1) UNRELEASED; urgency=low
- Add 0005-fix-horiz-scrolling.patch from upstream
* Bump lintian standards version to 3.9.3
- -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 15 Mar 2012 08:40:14 -0700
+ -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 15 Mar 2012 08:40:36 -0700
xserver-xorg-input-evdev (1:2.6.99.901+git20120126-0ubuntu2) precise; urgency=low
commit 6a1d5186a223c342b8344121b5848734fe10285f
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Thu Mar 15 08:40:31 2012 -0700
Bump lintian standards version to 3.9.3
diff --git a/debian/changelog b/debian/changelog
index 900920d..25f0e10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ xserver-xorg-input-evdev (1:2.7.0-0ubuntu1) UNRELEASED; urgency=low
- No changes since last git snapshot
* Fix horizontal scroll direction (LP: #932439)
- Add 0005-fix-horiz-scrolling.patch from upstream
+ * Bump lintian standards version to 3.9.3
- -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 15 Mar 2012 08:36:17 -0700
+ -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 15 Mar 2012 08:40:14 -0700
xserver-xorg-input-evdev (1:2.6.99.901+git20120126-0ubuntu2) precise; urgency=low
diff --git a/debian/control b/debian/control
index de451b0..7de165d 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
xutils-dev (>= 1:7.5+4),
libudev-dev,
libmtdev-dev,
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evdev
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.git
commit 978eaa84d8bbc203bb5d2b8f925adafd5633d37d
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Thu Mar 15 08:39:44 2012 -0700
Fix horizontal scroll direction (LP: #932439)
* Fix horizontal scroll direction (LP: #932439)
- Add 0005-fix-horiz-scrolling.patch from upstream
diff --git a/debian/changelog b/debian/changelog
index 2b521be..900920d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ xserver-xorg-input-evdev (1:2.7.0-0ubuntu1) UNRELEASED; urgency=low
* New upstream release
- No changes since last git snapshot
+ * Fix horizontal scroll direction (LP: #932439)
+ - Add 0005-fix-horiz-scrolling.patch from upstream
- -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 15 Mar 2012 08:31:47 -0700
+ -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 15 Mar 2012 08:36:17 -0700
xserver-xorg-input-evdev (1:2.6.99.901+git20120126-0ubuntu2) precise; urgency=low
diff --git a/debian/patches/0005-fix-horiz-scrolling.patch b/debian/patches/0005-fix-horiz-scrolling.patch
new file mode 100644
index 0000000..d9b10ee
--- /dev/null
+++ b/debian/patches/0005-fix-horiz-scrolling.patch
@@ -0,0 +1,23 @@
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Subject: [PATCH evdev] Fix inverted horizontal scroll (#46205)
+
+REL_HWHEEL has a positive increment, not a negative one like REL_WHEEL.
+
+X.Org Bug 46205 <http://bugs.freedesktop.org/show_bug.cgi?id=46205>
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
+
+diff --git a/src/evdev.c b/src/evdev.c
+index d540b87..8cf630c 100644
+--- a/src/evdev.c
++++ b/src/evdev.c
+@@ -1600,7 +1600,7 @@ EvdevAddRelValuatorClass(DeviceIntPtr device)
+ else if (axis == REL_DIAL)
+ SetScrollValuator(device, axnum, SCROLL_TYPE_VERTICAL, -1.0, SCROLL_FLAG_NONE);
+ else if (axis == REL_HWHEEL)
+- SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, -1.0, SCROLL_FLAG_NONE);
++ SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, 1.0, SCROLL_FLAG_NONE);
+ #endif
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index a25b353..6b40bce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0004-xi22-ubuntu.patch
+0005-fix-horiz-scrolling.patch
commit 7e53a388256c84f0c5c3929b13bdeedcccde821b
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Thu Mar 15 08:32:58 2012 -0700
New upstream release
* New upstream release
- No changes since last git snapshot
diff --git a/ChangeLog b/ChangeLog
index 5633ae6..3171574 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+commit 76b1d58a9791257fa8b4e6d3322fcb082c86b18a
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Mar 7 20:39:09 2012 +1000
+
+ evdev 2.7.0
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
commit 224a28de25fda654040a9fd4e5c4d748c9e29809
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jan 25 16:03:34 2012 +1000
diff --git a/debian/changelog b/debian/changelog
index 8463753..2b521be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-evdev (1:2.7.0-0ubuntu1) UNRELEASED; urgency=low
+
+ * New upstream release
+ - No changes since last git snapshot
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 15 Mar 2012 08:31:47 -0700
+
xserver-xorg-input-evdev (1:2.6.99.901+git20120126-0ubuntu2) precise; urgency=low
* Fix bad release commit for previous version
commit 76b1d58a9791257fa8b4e6d3322fcb082c86b18a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 7 20:39:09 2012 +1000
evdev 2.7.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 47f70b4..dff2bcf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-evdev],
- [2.6.99.901],
+ [2.7.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-evdev])
AC_CONFIG_SRCDIR([Makefile.am])
Reply to: