xserver-xorg-input-evdev: Changes to 'ubuntu'
debian/changelog | 257 ++------------------------
debian/control | 2
debian/patches/0005-fix-horiz-scrolling.patch | 23 --
debian/patches/series | 1
4 files changed, 22 insertions(+), 261 deletions(-)
New commits:
commit 121dd1324633d7a9cf6d5e960f6ae196993f51d4
Author: Timo Aaltonen <Timo Aaltonen tjaalton@cc.hut.fi>
Date: Wed Aug 1 12:15:57 2012 +0300
release to quantal-proposed
diff --git a/debian/changelog b/debian/changelog
index 60a90d7..90d0a5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.7.0-2~ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.7.0-2~ubuntu1) quantal-proposed; urgency=low
[ Maarten Lankhorst ]
* Merge from unreleased debian git, remaining changes:
@@ -12,7 +12,7 @@ xserver-xorg-input-evdev (1:2.7.0-2~ubuntu1) UNRELEASED; urgency=low
* control: Drop xserver-xorg-core from Depends, it's enough to depend on the
ABI version now.
- -- Maarten Lankhorst <maarten.lankhorst@canonical.com> Mon, 16 Jul 2012 13:24:29 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Wed, 01 Aug 2012 12:15:32 +0300
xserver-xorg-input-evdev (1:2.7.0-2) UNRELEASED; urgency=low
commit 7d9251ae8d32460fbc7c08a5c7788f296212626b
Author: Timo Aaltonen <Timo Aaltonen tjaalton@cc.hut.fi>
Date: Wed Aug 1 12:15:29 2012 +0300
control: Drop xserver-xorg-core from Depends, it's enough to depend on the ABI version now.
diff --git a/debian/changelog b/debian/changelog
index 3d148dc..60a90d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ xserver-xorg-input-evdev (1:2.7.0-2~ubuntu1) UNRELEASED; urgency=low
* Remove no longer needed patches:
- 0004-xi22-ubuntu.patch
+ [ Timo Aaltonen ]
+ * control: Drop xserver-xorg-core from Depends, it's enough to depend on the
+ ABI version now.
+
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Mon, 16 Jul 2012 13:24:29 +0200
xserver-xorg-input-evdev (1:2.7.0-2) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 3df1ed6..3280e61 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,6 @@ Depends:
${shlibs:Depends},
${misc:Depends},
${xinpdriver:Depends},
- xserver-xorg-core (>= 2:1.11.2.902-1ubuntu1)
Provides:
${xinpdriver:Provides}
Description: X.Org X server -- evdev input driver
@@ -50,7 +49,6 @@ Depends:
${misc:Depends},
${xinpdriver:Depends},
udev-udeb,
- xserver-xorg-core-udeb (>= 2:1.11.2.902-1ubuntu1)
Provides:
${xinpdriver:Provides}
Description: X.Org X server -- evdev input driver
commit c6dd56b8c8d807a160ac45157e624113b2ec9598
Author: Timo Aaltonen <Timo Aaltonen tjaalton@cc.hut.fi>
Date: Wed Aug 1 12:11:15 2012 +0300
typo fix
diff --git a/debian/changelog b/debian/changelog
index 3e7a20e..8c2ead6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ xserver-xorg-input-evdev (1:2.7.0-2) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
* Bump build-dep to xorg 2:1.12.99.901
* Remove upstreamed 0001-configure.ac-Fix-udev-libudev-dependency.patch
- * Add upstream bugfixe from ubuntu:
+ * Add upstream bugfix from ubuntu:
- 0006-axis-label-overrun.patch
* Upstream tree includes bugfix commit 99340147 from master, which will show on the
diff.gz.
commit d9ce605c8e388147765917d2dd9c725ba65f4fae
Author: Timo Aaltonen <Timo Aaltonen tjaalton@cc.hut.fi>
Date: Wed Aug 1 11:48:48 2012 +0300
drop patch 0005, and clarify the changelog
diff --git a/debian/changelog b/debian/changelog
index 25056d3..3e7a20e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,10 @@ xserver-xorg-input-evdev (1:2.7.0-2) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
* Bump build-dep to xorg 2:1.12.99.901
* Remove upstreamed 0001-configure.ac-Fix-udev-libudev-dependency.patch
- * Add upstream bugfixes from ubuntu:
- - 0005-fix-horiz-scrolling.patch
+ * Add upstream bugfixe from ubuntu:
- 0006-axis-label-overrun.patch
- * I messed up the tree, manually unapply debian/patches/0005* if you
- build directly from git, this will be fixed by a new point release
+ * Upstream tree includes bugfix commit 99340147 from master, which will show on the
+ diff.gz.
* Add -dbg package for symbols
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Mon, 16 Jul 2012 13:24:29 +0200
diff --git a/debian/patches/0005-fix-horiz-scrolling.patch b/debian/patches/0005-fix-horiz-scrolling.patch
deleted file mode 100644
index 144e1da..0000000
--- a/debian/patches/0005-fix-horiz-scrolling.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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 ab563b2..618ccee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0005-fix-horiz-scrolling.patch
0006-axis-label-overrun.patch
Reply to: