xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Timo Aaltonen]

 debian/control |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0873ef6e22932959c8757a38fe938c88477446b2
Author: Timo Aaltonen 
Date:   Wed Jan 20 12:57:01 2016 +0200

add xserver epoch to Breaks/Replaces

diff --git a/debian/control b/debian/control
index b00c181..2196891 100644
--- a/debian/control
+++ b/debian/control
@@ -30,8 +30,8 @@ Depends:
  ${xinpdriver:Depends},
 Provides:
  ${xinpdriver:Provides}
-Breaks: xserver-xorg-core (<< 1.18.0-1)
-Replaces: xserver-xorg-core (<< 1.18.0-1)
+Breaks: xserver-xorg-core (<< 2:1.18.0-1)
+Replaces: xserver-xorg-core (<< 2:1.18.0-1)
 Description: X.Org X server -- evdev input driver
  This package provides the driver for input devices using evdev, the Linux
  kernel's event delivery mechanism.  This driver allows for multiple keyboards

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Timo Aaltonen]

 10-evdev.conf|   40 +
 ChangeLog|  131 +
 Makefile.am  |1 
 configure.ac |   21 
 debian/changelog |   29 +
 debian/control   |   10 
 debian/rules |3 
 debian/upstream/signing-key.asc  |   24 
 debian/watch |1 
 debian/xserver-xorg-input-evdev-udeb.install |1 
 debian/xserver-xorg-input-evdev.install  |1 
 man/evdev.man|6 
 src/emuThird.c   |   10 
 src/emuWheel.c   |2 
 src/evdev.c  |  689 ++-
 src/evdev.h  |   43 -
 16 files changed, 632 insertions(+), 380 deletions(-)

New commits:
commit ca013742a622e8385938bc23547bc605eac75add
Author: Timo Aaltonen 
Date:   Mon Jan 18 14:54:13 2016 +0200

control, install: Ship 10-evdev.conf with the driver, breaks/replaces 
server << 1.18.0-1.

diff --git a/debian/changelog b/debian/changelog
index 68a973d..06adf38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xserver-xorg-input-evdev (1:2.10.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * control, install: Ship 10-evdev.conf with the driver,
+breaks/replaces server << 1.18.0-1.
 
  -- Timo Aaltonen   Mon, 18 Jan 2016 14:40:32 +0200
 
diff --git a/debian/control b/debian/control
index 1411a8d..b00c181 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,8 @@ Depends:
  ${xinpdriver:Depends},
 Provides:
  ${xinpdriver:Provides}
+Breaks: xserver-xorg-core (<< 1.18.0-1)
+Replaces: xserver-xorg-core (<< 1.18.0-1)
 Description: X.Org X server -- evdev input driver
  This package provides the driver for input devices using evdev, the Linux
  kernel's event delivery mechanism.  This driver allows for multiple keyboards
diff --git a/debian/xserver-xorg-input-evdev-udeb.install 
b/debian/xserver-xorg-input-evdev-udeb.install
index 4ac2576..2044bb5 100644
--- a/debian/xserver-xorg-input-evdev-udeb.install
+++ b/debian/xserver-xorg-input-evdev-udeb.install
@@ -1 +1,2 @@
 usr/lib/xorg/modules/input/*.so
+usr/share/X11/xorg.conf.d/10-evdev.conf
diff --git a/debian/xserver-xorg-input-evdev.install 
b/debian/xserver-xorg-input-evdev.install
index 97e3c20..e393ea7 100644
--- a/debian/xserver-xorg-input-evdev.install
+++ b/debian/xserver-xorg-input-evdev.install
@@ -1,2 +1,3 @@
 usr/lib/xorg/modules/input/*.so
 usr/share/man
+usr/share/X11/xorg.conf.d/10-evdev.conf

commit 479d37f0768947688ffc98ff32e8c3c884d3ea16
Author: Timo Aaltonen 
Date:   Mon Jan 18 14:47:41 2016 +0200

update the changelog

diff --git a/debian/changelog b/debian/changelog
index 81c35d2..68a973d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.10.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Mon, 18 Jan 2016 14:40:32 +0200
+
 xserver-xorg-input-evdev (1:2.9.2-1) unstable; urgency=medium
 
   * New upstream release.

commit 6a3beab6137b262fc847093ed5fa51ff70df6a21
Author: Peter Hutterer 
Date:   Fri Jan 8 15:11:59 2016 +1000

evdev 2.10.1

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index cc60ce7..3fe2012 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-evdev],
-[2.10.0],
+[2.10.1],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-input-evdev])
 AC_CONFIG_SRCDIR([Makefile.am])

commit d7e61a7074b802b49f57549530b289bbaa0a4855
Author: Peter Hutterer 
Date:   Tue Nov 10 14:35:51 2015 +1000

Only map x and y to axes 0 and 1

The Logitech G600 has one device with all axes north of ABS_MISC. The 
current
code assigns ABS_MISC as first axis to map to axis 0, i.e. x. On button 
press,
one node sends the BTN_LEFT but the other node sends an ABS_MISC with a 1 0
value. ABS_MISC is mapped to axis 0, this moves the pointer to (0, y) on
every button click.

Avoid this by simply mapping any axis other than x/y to at least axis 3, and
make sure we only override the MT 0/1 axes when we actually have MT axes.

https://bugs.freedesktop.org/show_bug.cgi?id=92856

Signed-off-by: Peter Hutterer 
Reviewed-by: Keith Packard 

diff --git a/src/evdev.c b/src/evdev.c
index 17d9d61..3176660 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1377,7 +1377,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device, int 
num_scroll_axes)
 }
 atoms = 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Cyril Brulebois]

 debian/changelog |7 +++
 debian/control   |2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 0fb26dcaca8bac795fad8b15d422a83cfc0e7c02
Author: Cyril Brulebois k...@debian.org
Date:   Sun Jul 6 22:21:33 2014 +0200

Bump libevdev-dev build-dep to make sure the udeb gets a dependency on 
libevdev2-udeb instead of libevdev2 (see: #750698).

diff --git a/debian/changelog b/debian/changelog
index e51c6b2..dde8ee2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-evdev (1:2.9.0-2) UNRELEASED; urgency=medium
+
+  * Bump libevdev-dev build-dep to make sure the udeb gets a dependency
+on libevdev2-udeb instead of libevdev2 (see: #750698).
+
+ -- Cyril Brulebois k...@debian.org  Sun, 06 Jul 2014 22:06:28 +0200
+
 xserver-xorg-input-evdev (1:2.9.0-1) experimental; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 8e25605..ddf9af2 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  xutils-dev (= 1:7.5+4),
  libudev-dev,
  libmtdev-dev,
- libevdev-dev (= 0.4),
+ libevdev-dev (= 1.2.2+dfsg-1~),
 Standards-Version: 3.9.4
 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


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1x44ku-0006ud...@moszumanska.debian.org

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 ChangeLog  |  349 +
 configure.ac   |3 
 debian/changelog   |   29 +
 debian/control |7 
 debian/rules   |3 
 include/evdev-properties.h |4 
 man/evdev.man  |   21 +
 src/Makefile.am|4 
 src/apple.c|3 
 src/emuWheel.c |   14 
 src/evdev.c|  741 +++--
 src/evdev.h|   21 -
 12 files changed, 812 insertions(+), 387 deletions(-)

New commits:
commit d9a5284b1afa79464c2c60458edcebd0042c0b88
Author: Julien Cristau jcris...@debian.org
Date:   Fri Jun 6 09:16:34 2014 +0200

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 507cc7d..e51c6b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.9.0-1) UNRELEASED; urgency=medium
+xserver-xorg-input-evdev (1:2.9.0-1) experimental; urgency=medium
 
   * New upstream release
 - smooth scrolling improvements (closes: #702739)
@@ -6,7 +6,7 @@ xserver-xorg-input-evdev (1:2.9.0-1) UNRELEASED; urgency=medium
   * Remove Cyril from Uploaders.
   * Build against xserver 1.16 RC.
 
- -- Julien Cristau jcris...@debian.org  Thu, 05 Jun 2014 22:17:26 +0200
+ -- Julien Cristau jcris...@debian.org  Fri, 06 Jun 2014 09:16:30 +0200
 
 xserver-xorg-input-evdev (1:2.8.2-1) unstable; urgency=low
 

commit a9fa37763847b741ac18c86f573a7879a95f4630
Author: Julien Cristau jcris...@debian.org
Date:   Fri Jun 6 09:16:22 2014 +0200

Build against xserver 1.16 RC.

diff --git a/debian/changelog b/debian/changelog
index b53815e..507cc7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-input-evdev (1:2.9.0-1) UNRELEASED; urgency=medium
 - smooth scrolling improvements (closes: #702739)
   * Add build-dep on libevdev-dev.
   * Remove Cyril from Uploaders.
+  * Build against xserver 1.16 RC.
 
  -- Julien Cristau jcris...@debian.org  Thu, 05 Jun 2014 22:17:26 +0200
 
diff --git a/debian/control b/debian/control
index 3bddcb7..8e25605 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  dh-autoreconf,
  pkg-config,
  quilt,
- xserver-xorg-dev (= 2:1.11.99.901),
+ xserver-xorg-dev (= 2:1.15.99),
  x11proto-core-dev,
  x11proto-randr-dev,
  x11proto-input-dev (= 2.1.99.3),

commit f0fbd4743bac70ec674b01fee66d7542b923e72f
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jun 5 22:47:33 2014 +0200

Remove Cyril from Uploaders.

diff --git a/debian/changelog b/debian/changelog
index d714cdb..b53815e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-evdev (1:2.9.0-1) UNRELEASED; urgency=medium
   * New upstream release
 - smooth scrolling improvements (closes: #702739)
   * Add build-dep on libevdev-dev.
+  * Remove Cyril from Uploaders.
 
  -- Julien Cristau jcris...@debian.org  Thu, 05 Jun 2014 22:17:26 +0200
 
diff --git a/debian/control b/debian/control
index c4964f4..3bddcb7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-evdev
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: Drew Parsons dpars...@debian.org, Cyril Brulebois 
k...@debian.org
+Uploaders: Drew Parsons dpars...@debian.org,
 Build-Depends:
  debhelper (= 8),
  dh-autoreconf,

commit d83d42c341230177ad048444622a87195ce512f8
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jun 5 22:21:55 2014 +0200

Add build-dep on libevdev-dev.

diff --git a/debian/changelog b/debian/changelog
index 1e7c8fa..d714cdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-evdev (1:2.9.0-1) UNRELEASED; urgency=medium
 
   * New upstream release
 - smooth scrolling improvements (closes: #702739)
+  * Add build-dep on libevdev-dev.
 
  -- Julien Cristau jcris...@debian.org  Thu, 05 Jun 2014 22:17:26 +0200
 
diff --git a/debian/control b/debian/control
index 719859d..c4964f4 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends:
  xutils-dev (= 1:7.5+4),
  libudev-dev,
  libmtdev-dev,
+ libevdev-dev (= 0.4),
 Standards-Version: 3.9.4
 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 c49c361b981dd0ab0d4db0c3afbcba110dfed36d
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jun 5 22:19:04 2014 +0200

Bump changelogs

diff --git a/ChangeLog b/ChangeLog
index 903d473..033aa02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,27 +1,171 @@
-commit 51575b60b14d414490d31ff23f07c30431525667
+commit 5d239ceb260cd554245e8f0dc3627990726ea9b9
 Author: Peter Hutterer peter.hutte...@who-t.net
-Date:   Mon Oct 7 09:23:09 2013 +1100
+Date:   Thu May 15 08:41:06 2014 +1000
 
-evdev 2.8.2
+evdev 2.9.0
 
 Signed-off-by: Peter Hutterer 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Timo Aaltonen]

 ChangeLog |  380 +-
 autogen.sh|4 
 configure.ac  |3 
 debian/changelog  |2 
 src/Makefile.am   |3 
 src/axis_labels.h |  198 +++
 src/emuMB.c   |4 
 src/emuWheel.c|2 
 src/evdev.c   |  677 ++
 src/evdev.h   |   10 
 10 files changed, 872 insertions(+), 411 deletions(-)

New commits:
commit fa931895b62b07b3fec008079fd7028ef9a952ef
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Apr 10 09:29:22 2013 +0300

update the changelogs

diff --git a/ChangeLog b/ChangeLog
index a4aa1cc..89834ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,246 @@
-commit 777cfa148f8b5febaab1330e8df791f2188c046b
+commit 5138cd2ff47a1a28db82688b932cb1ecd618778f
 Author: Peter Hutterer peter.hutte...@who-t.net
-Date:   Mon Aug 13 16:22:00 2012 +1000
+Date:   Tue Mar 26 16:01:39 2013 +1000
 
-evdev 2.7.3
+evdev 2.8.0
 
 Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
 
-commit 447fd220e05752ec9ab388cc78826c297e1b7e24
+commit c085c8b6c1f8e95f6f4d91bc65268fe57154018c
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Feb 12 12:58:08 2013 +1000
+
+Return BadValue if EvdevOpenMTDev fails
+
+FALSE == Success, so if we fail during EvdevOpenMTDev, the caller thinks
+that everything worked fine, proceeds to set up the fd, etc.
+
+This may later cause a crash, when a device comes back later as different
+device and posts axis events where we didn't configure axes in the first
+place.
+
+Note: Unclear why there was no udev event received for the device being
+removed and coming back as different device though.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 2b675f85aef6df3bb3fb5e68648982e11b752764
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Feb 12 12:48:38 2013 +1000
+
+Make errors on EVIOCGBIT more obvious
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 2b8b0df62ec554952784f2820fb4143c495232b0
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Thu Jan 24 16:18:48 2013 +1000
+
+Always init axis mapping for the first two rel axes (#59784)
+
+Fixes regression introduced in 2f67509b53b27dd7f51ca2aadd19605aee613a61.
+
+If evdev is used for touchpads, the abs axis movement is converted to a rel
+movement. Without the two relative axes initialized, the events are
+discarded.
+
+Axes 0 and 1 are always x/y anyway unless specifically configured 
otherwise.
+
+X.Org Bug 59784 http://bugs.freedesktop.org/show_bug.cgi?id=59784
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit bb9b4146cb828bd366675e8736fc145e92c9269a
+Merge: f5fe533 67e5376
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Fri Jan 25 11:12:05 2013 +1000
+
+Merge branch 'touch-axis-swap'
+
+commit f5fe533f1bef0c636b98658aaf40748c219c9879
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Mar 27 12:18:46 2012 +1000
+
+Allow relative scroll valuators on absolute devices (#54387)
+
+Special-case RHEL_WHEEL, RHEL_HWHEEL and REL_DIAL to add scroll valuators
+for those axes in addition to the absolute axes.
+
+X.Org Bug 54387 http://bugs.freedesktop.org/show_bug.cgi?id=54387
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 2f67509b53b27dd7f51ca2aadd19605aee613a61
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Wed Jan 16 08:38:52 2013 +1000
+
+Split rel and abs axis mapping into two separate arrays
+
+This will enable a device to have relative scrolling axes in addition to
+absolute axes (required by the QEMU tablet).
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit ffc0a34642d5ab573c2ae63c873a5befd8688493
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Jan 15 16:15:47 2013 +1000
+
+Move some stuff into the new alloc function
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 93de7b0b73d4c5f6f68e3a2ffe8f76b5212ee016
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Jan 15 16:11:16 2013 +1000
+
+Move allocation of EvdevRec into a helper function
+
+Makes it easier to initialise everything to the right values.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 9ec9d214d072ef4aaffb65b5575eff58edcb62ed
+Author: Colin Walters walt...@verbum.org
+Date:   Wed Jan 4 17:37:06 2012 -0500
+
+autogen.sh: Implement GNOME Build API
+
+http://people.gnome.org/~walters/docs/build-api.txt
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit 94e6df8f5f6048b8d0c7aa34efe1c0dc70b997d1
+Author: Adam Jackson a...@redhat.com
+Date:   Wed Jan 16 13:11:11 2013 -0500
+
+configure: Drop AM_MAINTAINER_MODE
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Timo Aaltonen]

 ChangeLog|   56 +++
 configure.ac |2 -
 debian/changelog |2 -
 src/Makefile.am  |2 -
 src/evdev.c  |   10 ++---
 5 files changed, 62 insertions(+), 10 deletions(-)

New commits:
commit f1ce4a05f3abc6fb64e3c6724e7697957e48bb8e
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Aug 15 11:35:04 2012 +0300

update the changelogs

diff --git a/ChangeLog b/ChangeLog
index 9810488..a4aa1cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,59 @@
+commit 777cfa148f8b5febaab1330e8df791f2188c046b
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon Aug 13 16:22:00 2012 +1000
+
+evdev 2.7.3
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 447fd220e05752ec9ab388cc78826c297e1b7e24
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Aug 7 14:32:17 2012 +1000
+
+Fix broken ButtonMapping option (#53168)
+
+Regression introduced in 8af0e6f1ebaf327f735bca507134b34bb24b26c6.
+s is now initialized to NULL, so we never entered the loop.
+
+X.Org Bug 53168 http://bugs.freedesktop.org/show_bug.cgi?id=53168
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit 33e7831b5fabc5c9dcc0224800a04761086952a7)
+
+commit f2c6da02429eaabf9111d54c41bf46aa19b49776
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Sun Aug 5 12:26:38 2012 +1000
+
+Link against libudev
+
+Fixes /usr/bin/Xorg: symbol lookup error:
+/usr/lib64/xorg/modules/input/evdev_drv.so: undefined symbol: udev_new
+
+This doesn't appear in the default configuration as Xorg links against
+libudev and the symbol is defined when evdev is loaded. It can be 
reproduced
+with a HAL-enabled server.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Chase Douglas chase.doug...@canonical.com
+(cherry picked from commit bc8997e8120cc8d4f33f44e0734fa488f9fef3b0)
+
+commit 9791afc4c16eab92f30884a7e616dd93ac9b7513
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Jul 31 16:39:00 2012 +1000
+
+Don't delete the device on ENODEV
+
+This is signal handler code and we cannot clean up properly while in the
+signal handler. So reduce the code to removing the signal handler and let
+the device be cleaned up later.
+
+If hotplugging is on, the server will remove it when the config backend 
says
+so and if it is off, the server will remove it on shutdown.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Chase Douglas chase.doug...@canonical.com
+(cherry picked from commit 1cb8f074df8d16879ec80d778d26fb5b9af05a3b)
+
 commit f1ee12b9a363028c0d0a6668fca9eeb011f2354d
 Author: Peter Hutterer peter.hutte...@who-t.net
 Date:   Fri Aug 3 16:00:31 2012 +1000
diff --git a/debian/changelog b/debian/changelog
index aa36361..3c2bd94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.7.2-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.7.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
 

commit 777cfa148f8b5febaab1330e8df791f2188c046b
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon Aug 13 16:22:00 2012 +1000

evdev 2.7.3

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 5a91236..e0545e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-evdev],
-[2.7.2],
+[2.7.3],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-input-evdev])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 447fd220e05752ec9ab388cc78826c297e1b7e24
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Tue Aug 7 14:32:17 2012 +1000

Fix broken ButtonMapping option (#53168)

Regression introduced in 8af0e6f1ebaf327f735bca507134b34bb24b26c6.
s is now initialized to NULL, so we never entered the loop.

X.Org Bug 53168 http://bugs.freedesktop.org/show_bug.cgi?id=53168

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit 33e7831b5fabc5c9dcc0224800a04761086952a7)

diff --git a/src/evdev.c b/src/evdev.c
index 6729f23..54772c7 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1665,7 +1665,7 @@ EvdevInitButtonMapping(InputInfoPtr pInfo)
 
 xf86IDrvMsg(pInfo, X_CONFIG, ButtonMapping '%s'\n, mapping);
 map = mapping;
-while (s  *s != '\0'  nbuttons  EVDEV_MAXBUTTONS)
+do
 {
 btn = strtol(map, s, 10);
 
@@ -1679,7 +1679,7 @@ EvdevInitButtonMapping(InputInfoPtr pInfo)
 
 pEvdev-btnmap[nbuttons++] = btn;
 map = s;
-}
+} while (s  *s != '\0'  nbuttons  EVDEV_MAXBUTTONS);
 free(mapping);
 }
 

commit f2c6da02429eaabf9111d54c41bf46aa19b49776
Author: Peter Hutterer 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Maarten Lankhorst]

 ChangeLog|8 
 configure.ac |2 +-
 debian/changelog |6 ++
 3 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 763b63e4dfbbc831303520f05f6e220e90f692be
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Aug 10 19:09:21 2012 +0200

New upstream release.

diff --git a/ChangeLog b/ChangeLog
index 149f824..9810488 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+commit f1ee12b9a363028c0d0a6668fca9eeb011f2354d
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Fri Aug 3 16:00:31 2012 +1000
+
+evdev 2.7.2
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
 commit 74690817fcd3e91ea384b8f311d8ce5626d8c409
 Author: Peter Hutterer peter.hutte...@who-t.net
 Date:   Wed Jul 4 09:14:41 2012 +1000
diff --git a/debian/changelog b/debian/changelog
index 2d08085..aa36361 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.7.2-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst maarten.lankho...@canonical.com  Fri, 10 Aug 2012 
19:08:53 +0200
+
 xserver-xorg-input-evdev (1:2.7.1-1) experimental; urgency=low
 
   [ Maarten Lankhorst ]

commit f1ee12b9a363028c0d0a6668fca9eeb011f2354d
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Fri Aug 3 16:00:31 2012 +1000

evdev 2.7.2

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 13adec7..5a91236 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-evdev],
-[2.7.1],
+[2.7.2],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-input-evdev])
 AC_CONFIG_SRCDIR([Makefile.am])


-- 
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/e1szsjv-0004ec...@vasks.debian.org

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 ChangeLog|  159 ++-
 configure.ac |2 
 debian/changelog |   16 +-
 debian/control   |2 
 debian/patches/0006-axis-label-overrun.patch |   66 ---
 debian/patches/series|2 
 src/emuWheel.c   |4 
 src/evdev.c  |   83 +-
 src/evdev.h  |1 
 9 files changed, 226 insertions(+), 109 deletions(-)

New commits:
commit bc376031365d24ac60a18cc98db73d2da803c59b
Author: Julien Cristau jcris...@debian.org
Date:   Fri Aug 3 12:33:49 2012 +0200

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index d12859a..2d08085 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.7.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.7.1-1) experimental; urgency=low
 
   [ Maarten Lankhorst ]
   * Merge the 1:2.7.0-1 sid upload
@@ -6,10 +6,10 @@ xserver-xorg-input-evdev (1:2.7.1-1) UNRELEASED; urgency=low
   * Add -dbg package for symbols
 
   [ Julien Cristau ]
-  * New upstream bugfix release.
+  * New upstream bugfix release, with multitouch enabled (closes: #683723).
   * Pull from upstream evdev-2.7-branch, commit 7469081.
 
- -- Julien Cristau jcris...@debian.org  Fri, 03 Aug 2012 12:24:21 +0200
+ -- Julien Cristau jcris...@debian.org  Fri, 03 Aug 2012 12:32:30 +0200
 
 xserver-xorg-input-evdev (1:2.7.0-1) unstable; urgency=low
 

commit f72e464ea26ebb030651f270fee308612e9d5083
Author: Julien Cristau jcris...@debian.org
Date:   Fri Aug 3 12:29:54 2012 +0200

Bump changelogs, drop patch merged upstream

diff --git a/ChangeLog b/ChangeLog
index c7775ac..149f824 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,160 @@
-commit 99340147b9092a5aaec997eca407282a51e1f063
+commit 74690817fcd3e91ea384b8f311d8ce5626d8c409
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Wed Jul 4 09:14:41 2012 +1000
+
+Don't re-open mtdev after PreInit
+
+==16557== 388,240 (3,520 direct, 384,720 indirect) bytes in 10 blocks are 
definitely lost in loss record 1,669 of 1,671
+==16557==at 0x4A06F18: calloc (vg_replace_malloc.c:566)
+==16557==by 0xC3EAD4D: mtdev_new (core.c:345)
+==16557==by 0xC3EAE6B: mtdev_new_open (core.c:383)
+==16557==by 0xC1E0452: EvdevOpenDevice (evdev.c:2365)
+==16557==by 0xC1E068C: EvdevPreInit (evdev.c:2431)
+==16557==by 0x4B8304: xf86NewInputDevice (xf86Xinput.c:846)
+==16557==by 0x4B8857: NewInputDeviceRequest (xf86Xinput.c:989)
+==16557==by 0x4CCB4C: device_added (udev.c:211)
+==16557==by 0x4CCFA6: config_udev_init (udev.c:342)
+==16557==by 0x4CBE81: config_init (config.c:48)
+==16557==by 0x4A8A9A: InitInput (xf86Init.c:918)
+==16557==by 0x4921EE: main (main.c:258)
+
+After PreInit, the fd and mtdev pointer are still valid. We check for the
+fd, but unconditionally allocated another mtdev struct for each device.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Chase Douglas chase.doug...@canonical.com
+(cherry picked from commit 98af2003d48530b2e102cf667a9d40dcb94cb0fe)
+
+commit b2cbbb178e9a3650118bdf498e678ca4e12062fe
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon May 28 10:08:23 2012 +1000
+
+Constify InputDriverRec-default_options
+
+Removes a warning, and with the input ABI 18 this is forced to const in the
+server.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Chase Douglas chase.doug...@canonical.com
+(cherry picked from commit 9624f4e2ba7d1973813de066806eed108748a53a)
+
+commit 7d91fc7bfcdaaac657aeb7b8876a4002ad0fa68d
+Author: Marcin Slusarz marcin.slus...@gmail.com
+Date:   Mon May 21 01:22:33 2012 +0200
+
+Fix some obvious constness-related compile warnings.
+
+Signed-off-by: Marcin Slusarz marcin.slus...@gmail.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit 2c8da280b3ab635d049784345d025d289348687b)
+
+commit 09987eab9a77aa94127ecacca41498bc5e83c0eb
+Author: Daniel Stone dan...@fooishbar.org
+Date:   Tue Jul 10 00:34:56 2012 +0100
+
+Fix compilation warnings for non-multitouch builds
+
+Signed-off-by: Daniel Stone dan...@fooishbar.org
+Reviewed-by: Chase Douglas chase.doug...@canonical.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit f5ede98085688b59dc56a9cc6592f75552a4e7ed)
+
+commit 8af0e6f1ebaf327f735bca507134b34bb24b26c6
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Fri May 25 14:04:22 2012 +1000
+
+strtol doesn't need a empty string, NULL is good enough.
+
+Fixes:
+evdev.c: In function 'EvdevInitButtonMapping':
+evdev.c:1659:25: warning: 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Timo Aaltonen]

 debian/changelog  |7 +++
 debian/patches/0005-fix-horiz-scrolling.patch |   23 ---
 debian/patches/series |1 -
 3 files changed, 3 insertions(+), 28 deletions(-)

New commits:
commit c6dd56b8c8d807a160ac45157e624113b2ec9598
Author: Timo Aaltonen Timo Aaltonen tjaal...@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 tjaal...@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.lankho...@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..000
--- a/debian/patches/0005-fix-horiz-scrolling.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Peter Hutterer peter.hutte...@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.hutte...@who-t.net
-Reviewed-by: Chase Douglas chase.doug...@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


-- 
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/e1swv2l-0005os...@vasks.debian.org

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Maarten Lankhorst]

 debian/changelog  |6 ++
 debian/control|   21 +++-
 debian/patches/0005-fix-horiz-scrolling.patch |   23 +
 debian/patches/0006-axis-label-overrun.patch  |   66 ++
 debian/patches/series |2 
 debian/rules  |4 +
 6 files changed, 121 insertions(+), 1 deletion(-)

New commits:
commit 0368af80cc1903618fb3f467c3e2193bf4a60208
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jul 20 11:28:00 2012 +0200

Update packaging

* Add upstream bugfixes from ubuntu:
  - 0005-fix-horiz-scrolling.patch
  - 0006-axis-label-overrun.patch
* I messed up the tree, manually unapply debian/patches/0005* if you
  build directly from git against 2.7.0 tarball, this will be fixed
  by a new point release
* Add -dbg package for symbols

diff --git a/debian/changelog b/debian/changelog
index 19588e1..25056d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,12 @@ 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
+- 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
+  * Add -dbg package for symbols
 
  -- Maarten Lankhorst maarten.lankho...@canonical.com  Mon, 16 Jul 2012 
13:24:29 +0200
 
diff --git a/debian/control b/debian/control
index 8fe99e5..34eaea7 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  xutils-dev (= 1:7.5+4),
  libudev-dev,
  libmtdev-dev,
-Standards-Version: 3.9.1
+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
 
@@ -68,3 +68,22 @@ Description: X.Org X server -- evdev input driver 
(development headers)
  URL:http://www.X.org
  .
  This package is built from the X.org xf86-input-evdev driver module.
+
+Package: xserver-xorg-input-evdev-dbg
+Architecture: linux-any
+Depends:
+ ${misc:Depends},
+ xserver-xorg-input-evdev (= ${binary:Version}),
+Section: debug
+Priority: extra
+Description: X.Org X server -- evdev input driver (development headers)
+ This package provides the development headers for the evdev input driver
+ found in xserver-xorg-input-evdev. Non-developers likely have little use
+ for this package.
+ .
+ More information about X.Org can be found at:
+ URL:http://www.X.org
+ .
+ This package is built from the X.org xf86-input-evdev driver module.
+ .
+ This package provides debugging symbols for this Xorg X driver.
diff --git a/debian/patches/0005-fix-horiz-scrolling.patch 
b/debian/patches/0005-fix-horiz-scrolling.patch
new file mode 100644
index 000..144e1da
--- /dev/null
+++ b/debian/patches/0005-fix-horiz-scrolling.patch
@@ -0,0 +1,23 @@
+From: Peter Hutterer peter.hutte...@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.hutte...@who-t.net
+Reviewed-by: Chase Douglas chase.doug...@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/0006-axis-label-overrun.patch 
b/debian/patches/0006-axis-label-overrun.patch
new file mode 100644
index 000..df7519e
--- /dev/null
+++ b/debian/patches/0006-axis-label-overrun.patch
@@ -0,0 +1,66 @@
+From 4145fe1c087708bf5d6608e328342282ecb93ab0 Mon Sep 17 00:00:00 2001
+From: Chase Douglas chase.doug...@canonical.com
+Date: Wed, 6 Jun 2012 12:07:12 -0700
+Subject: [PATCH] Fix buffer overrun when populating axis label property array
+
+The axis label property array currently only has enough elements for the
+non-multitouch axes. This change allocates enough space for all axes,
+which prevents an array overrun write. This may manifest as stack
+corruption on some platforms.
+
+Signed-off-by: Chase Douglas chase.doug...@canonical.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+---
+ src/evdev.c |8 +---
+ src/evdev.h |1 +
+ 2 files 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Maarten Lankhorst]

 ChangeLog  |  193 
+
 configure.ac   |4 
 debian/changelog   |   26 +
 debian/control |2 
 debian/patches/0001-configure.ac-Fix-udev-libudev-dependency.patch |   31 -
 debian/patches/series  |1 
 src/evdev.c|  194 
--
 src/evdev.h|2 
 src/udev.c |   69 ---
 9 files changed, 380 insertions(+), 142 deletions(-)

New commits:
commit ff743c7977ae8e0e48d8f4c247e301c13127363d
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Jul 16 13:43:18 2012 +0200

Remove upstreamed 0001-configure.ac-Fix-udev-libudev-dependency.patch

diff --git a/debian/changelog b/debian/changelog
index c3d8334..19588e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,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
 
  -- Maarten Lankhorst maarten.lankho...@canonical.com  Mon, 16 Jul 2012 
13:24:29 +0200
 
diff --git a/debian/patches/0001-configure.ac-Fix-udev-libudev-dependency.patch 
b/debian/patches/0001-configure.ac-Fix-udev-libudev-dependency.patch
deleted file mode 100644
index b3fb246..000
--- a/debian/patches/0001-configure.ac-Fix-udev-libudev-dependency.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6f639c450c513c44b6eb7ddfd31e207ca83bcd39 Mon Sep 17 00:00:00 2001
-From: Cyril Brulebois k...@debian.org
-Date: Sat, 31 Dec 2011 19:35:17 +0100
-Subject: [PATCH:xf86-input-evdev 1/2] configure.ac: Fix udev/libudev
- dependency.
-
-In 683a55e504f4fc2d1c847c54986439a0c61b2f20, a dependency on libudev was
-added, but documented in configure.ac as a dependency on udev (which
-also happens to ship a pkg-config file).
-
-Signed-off-by: Cyril Brulebois k...@debian.org

- configure.ac |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 57690c4..47f70b4 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -46,7 +46,7 @@ XORG_DEFAULT_OPTIONS
- 
- # Obtain compiler/linker options from server and required extensions
- PKG_CHECK_MODULES(XORG, [xorg-server = 1.10] xproto inputproto)
--PKG_CHECK_MODULES(UDEV, udev)
-+PKG_CHECK_MODULES(UDEV, libudev)
- 
- PKG_CHECK_MODULES(XI22, [inputproto = 2.1.99.3] [xorg-server = 
1.11.99.901], HAVE_XI22=yes, HAVE_XI22=no)
- 
--- 
-1.7.7.3
-
diff --git a/debian/patches/series b/debian/patches/series
index e6f3ebc..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-0001-configure.ac-Fix-udev-libudev-dependency.patch

commit f7759b8615f7db7e27f4a1415c33777dba31d413
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Jul 16 13:41:43 2012 +0200

Bump build-dep to xorg 2:1.12.99.901

diff --git a/debian/changelog b/debian/changelog
index edcad8e..c3d8334 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,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
+
+ -- Maarten Lankhorst maarten.lankho...@canonical.com  Mon, 16 Jul 2012 
13:24:29 +0200
+
 xserver-xorg-input-evdev (1:2.7.0-1) unstable; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/control b/debian/control
index 7989b8b..8fe99e5 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  dh-autoreconf,
  pkg-config,
  quilt,
- xserver-xorg-dev (= 2:1.11.99.901),
+ xserver-xorg-dev (= 2:1.12.99.901),
  x11proto-core-dev,
  x11proto-randr-dev,
  x11proto-input-dev (= 2.1.99.3),

commit 985dd1d5f604769617c0138d8bc18cdc0121cbc9
Author: Cyril Brulebois k...@debian.org
Date:   Tue Mar 20 00:40:42 2012 +

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index f7954cb..fd723f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.7.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.7.0-1) unstable; urgency=low
 
   [ Timo Aaltonen ]
   * Remove obsolete .manpages.
@@ -14,7 +14,7 @@ xserver-xorg-input-evdev (1:2.7.0-1) UNRELEASED; urgency=low
   * Bump xserver-xorg-dev build-dep to 2:1.10, now required.
   * Add libudev-dev build-dep.
 
- -- Cyril Brulebois k...@debian.org  Tue, 20 Mar 2012 00:32:26 +
+ -- Cyril Brulebois k...@debian.org  Tue, 20 Mar 2012 00:40:39 +
 
 xserver-xorg-input-evdev (1:2.6.0-2) unstable; urgency=low
 

commit 5350f4720d7bfe0efaec574c02f66731fc2736da
Author: Cyril Brulebois k...@debian.org
Date:   Tue Mar 20 00:39:13 2012 +

Add libudev-dev build-dep.

diff 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Cyril Brulebois]

Rebased ref, commits from common ancestor:
commit a619cd71e35e33b7aeb3edd01b4c3301ea37bb21
Author: Cyril Brulebois k...@debian.org
Date:   Sat Dec 31 19:55:44 2011 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index f6b830a..0a85430 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.6.99.901-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.6.99.901-1) experimental; urgency=low
 
   [ Timo Aaltonen ]
   * Remove obsolete .manpages.
@@ -11,7 +11,7 @@ xserver-xorg-input-evdev (1:2.6.99.901-1) UNRELEASED; 
urgency=low
   * Add patch to fix udev/libudev detection:
 - 0001-configure.ac-Fix-udev-libudev-dependency.patch
 
- -- Cyril Brulebois k...@debian.org  Sat, 31 Dec 2011 18:51:03 +0100
+ -- Cyril Brulebois k...@debian.org  Sat, 31 Dec 2011 19:55:39 +0100
 
 xserver-xorg-input-evdev (1:2.6.0-2) unstable; urgency=low
 

commit 11336a145e0bb797af0a81c56925678b79e35115
Author: Cyril Brulebois k...@debian.org
Date:   Sat Dec 31 19:55:33 2011 +0100

Add patch to fix udev/libudev detection: 
0001-configure.ac-Fix-udev-libudev-dependency.patch

diff --git a/debian/changelog b/debian/changelog
index 7001934..f6b830a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ xserver-xorg-input-evdev (1:2.6.99.901-1) UNRELEASED; 
urgency=low
   * Update build dependencies:
 - Add libudev-dev and libmtdev-dev.
 - Bump xserver-xorg-dev and x11proto-input-dev.
+  * Add patch to fix udev/libudev detection:
+- 0001-configure.ac-Fix-udev-libudev-dependency.patch
 
  -- Cyril Brulebois k...@debian.org  Sat, 31 Dec 2011 18:51:03 +0100
 
diff --git a/debian/patches/0001-configure.ac-Fix-udev-libudev-dependency.patch 
b/debian/patches/0001-configure.ac-Fix-udev-libudev-dependency.patch
new file mode 100644
index 000..b3fb246
--- /dev/null
+++ b/debian/patches/0001-configure.ac-Fix-udev-libudev-dependency.patch
@@ -0,0 +1,31 @@
+From 6f639c450c513c44b6eb7ddfd31e207ca83bcd39 Mon Sep 17 00:00:00 2001
+From: Cyril Brulebois k...@debian.org
+Date: Sat, 31 Dec 2011 19:35:17 +0100
+Subject: [PATCH:xf86-input-evdev 1/2] configure.ac: Fix udev/libudev
+ dependency.
+
+In 683a55e504f4fc2d1c847c54986439a0c61b2f20, a dependency on libudev was
+added, but documented in configure.ac as a dependency on udev (which
+also happens to ship a pkg-config file).
+
+Signed-off-by: Cyril Brulebois k...@debian.org
+---
+ configure.ac |2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 57690c4..47f70b4 100644
+--- a/configure.ac
 b/configure.ac
+@@ -46,7 +46,7 @@ XORG_DEFAULT_OPTIONS
+ 
+ # Obtain compiler/linker options from server and required extensions
+ PKG_CHECK_MODULES(XORG, [xorg-server = 1.10] xproto inputproto)
+-PKG_CHECK_MODULES(UDEV, udev)
++PKG_CHECK_MODULES(UDEV, libudev)
+ 
+ PKG_CHECK_MODULES(XI22, [inputproto = 2.1.99.3] [xorg-server = 
1.11.99.901], HAVE_XI22=yes, HAVE_XI22=no)
+ 
+-- 
+1.7.7.3
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..e6f3ebc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-configure.ac-Fix-udev-libudev-dependency.patch

commit 75763f974b5e53b600f38770267e052bfb6fdb10
Author: Cyril Brulebois k...@debian.org
Date:   Sat Dec 31 19:53:12 2011 +0100

Mention multitouch support.

diff --git a/debian/changelog b/debian/changelog
index 2f4be85..7001934 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ xserver-xorg-input-evdev (1:2.6.99.901-1) UNRELEASED; 
urgency=low
   * Remove obsolete .manpages.
 
   [ Cyril Brulebois ]
-  * New upstream release candidate.
+  * New upstream release candidate, with multitouch support.
   * Update build dependencies:
 - Add libudev-dev and libmtdev-dev.
 - Bump xserver-xorg-dev and x11proto-input-dev.

commit 693cd9272ff0f822abab081be6aff5b1a05ef78e
Author: Cyril Brulebois k...@debian.org
Date:   Sat Dec 31 19:20:26 2011 +0100

Update build dependencies.

diff --git a/debian/changelog b/debian/changelog
index 3c870fe..2f4be85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ xserver-xorg-input-evdev (1:2.6.99.901-1) UNRELEASED; 
urgency=low
 
   [ Cyril Brulebois ]
   * New upstream release candidate.
+  * Update build dependencies:
+- Add libudev-dev and libmtdev-dev.
+- Bump xserver-xorg-dev and x11proto-input-dev.
 
  -- Cyril Brulebois k...@debian.org  Sat, 31 Dec 2011 18:51:03 +0100
 
diff --git a/debian/control b/debian/control
index f45858a..7989b8b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,13 +8,15 @@ Build-Depends:
  dh-autoreconf,
  pkg-config,
  quilt,
- xserver-xorg-dev (= 2:1.9.4),
+ xserver-xorg-dev (= 2:1.11.99.901),
  x11proto-core-dev,
  x11proto-randr-dev,
- x11proto-input-dev,
+ x11proto-input-dev (= 2.1.99.3),
  x11proto-kb-dev,
  libxkbfile-dev,
  xutils-dev (= 1:7.5+4),
+ libudev-dev,
+ libmtdev-dev,
 Standards-Version: 3.9.1
 Vcs-Git: 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Cyril Brulebois]

 debian/README.source   |   24 -
 debian/changelog   |   28 +-
 debian/compat  |2 
 debian/control |   37 +-
 debian/rules   |  119 -
 debian/watch   |1 
 debian/xsfbs/repack.sh |   32 --
 debian/xsfbs/xsfbs.mk  |  285 --
 debian/xsfbs/xsfbs.sh  |  622 -
 9 files changed, 60 insertions(+), 1090 deletions(-)

New commits:
commit 1634e8b8195d7a7c0c80722bc3641ce6bfe7338c
Author: Cyril Brulebois k...@debian.org
Date:   Sun Feb 20 07:32:30 2011 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 28789f2..0a542b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-evdev (1:2.6.0-3) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.6.0-3) experimental; urgency=low
 
   * Rebuild against Xserver 1.10 rc2.
 
- -- Cyril Brulebois k...@debian.org  Sat, 19 Feb 2011 11:49:19 +0100
+ -- Cyril Brulebois k...@debian.org  Sun, 20 Feb 2011 07:30:30 +0100
 
 xserver-xorg-input-evdev (1:2.6.0-2) unstable; urgency=low
 

commit 117392328c4b51fba6563e36bbd66684525a4769
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 19 16:17:49 2011 +0100

Rebuild against Xserver 1.10 rc2.

diff --git a/debian/changelog b/debian/changelog
index a56f98c..28789f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.6.0-3) UNRELEASED; urgency=low
+
+  * Rebuild against Xserver 1.10 rc2.
+
+ -- Cyril Brulebois k...@debian.org  Sat, 19 Feb 2011 11:49:19 +0100
+
 xserver-xorg-input-evdev (1:2.6.0-2) unstable; urgency=low
 
   * Get rid of “[linux-any]” for the dependency on udev-udeb, evdev is
diff --git a/debian/control b/debian/control
index f45858a..3ecef1e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  dh-autoreconf,
  pkg-config,
  quilt,
- xserver-xorg-dev (= 2:1.9.4),
+ xserver-xorg-dev (= 2:1.9.99.902),
  x11proto-core-dev,
  x11proto-randr-dev,
  x11proto-input-dev,

commit 8bc8c9cdd3c7d3f478067c2e773a403c661fd7ff
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 14:38:02 2011 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index fa36265..a56f98c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.6.0-2) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.6.0-2) unstable; urgency=low
 
   * Get rid of “[linux-any]” for the dependency on udev-udeb, evdev is
 Linux-only.
@@ -21,7 +21,7 @@ xserver-xorg-input-evdev (1:2.6.0-2) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.1 (no changes needed).
   * Wrap Depends/Provides.
 
- -- Cyril Brulebois k...@debian.org  Wed, 02 Feb 2011 05:44:06 +0100
+ -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 14:38:02 +0100
 
 xserver-xorg-input-evdev (1:2.6.0-1) experimental; urgency=low
 

commit e2071f1c2f2650d6a68019a8266c223e94a071ca
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 11:39:27 2011 +0100

Fix sequence ordering.

Since both the autoreconf and quilt sequences insert a command before
dh_auto_configure, it is important that we use the quilt one in the first
place, so that autoreconf is run on a patched tree. Ditto for dh_clean.

diff --git a/debian/rules b/debian/rules
index 63d3106..3d192dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,4 +14,4 @@ override_dh_shlibdeps:
dh_shlibdeps -- --warnings=6
 
 %:
-   dh $@ --with autoreconf,quilt,xsf --builddirectory=build/
+   dh $@ --with quilt,autoreconf,xsf --builddirectory=build/

commit f45135c71209127b0f66901b56be26ad23c1e952
Author: Cyril Brulebois k...@debian.org
Date:   Thu Feb 3 06:55:07 2011 +0100

Ensure installation under debian/tmp.

This is not strictly needed since there are several binaries built from this
source package, so debhelper uses debian/tmp rather than debian/$package.
But let's make all drivers use a similar debian/rules file. Also, a binary
package might be dropped at some point.

diff --git a/debian/rules b/debian/rules
index d2aad39..63d3106 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,9 @@
 #!/usr/bin/make -f
 
+# Install in debian/tmp to retain control through dh_install:
+override_dh_auto_install:
+   dh_auto_install --destdir=debian/tmp
+
 # Kill *.la files, and forget no-one:
 override_dh_install:
find debian/tmp -name '*.la' -delete

commit 001a682996e9c0ab181a7ae90a9ae577ed21826f
Author: Cyril Brulebois k...@debian.org
Date:   Thu Feb 3 02:11:29 2011 +0100

Wrap Depends/Provides.

diff --git a/debian/changelog b/debian/changelog
index e2036a0..fa36265 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ xserver-xorg-input-evdev (1:2.6.0-2) UNRELEASED; urgency=low
 - dpkg-dev is recent enough on stable and higher.
 - automake and libtool are pulled through dh-autoreconf.
   * Bump 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Cyril Brulebois]

 ChangeLog|   17 +
 configure.ac |2 +-
 debian/changelog |6 ++
 src/evdev.c  |   20 
 4 files changed, 40 insertions(+), 5 deletions(-)

New commits:
commit 2878df8527e08fe5906703f8611a3b82ceb0f67d
Author: Cyril Brulebois k...@debian.org
Date:   Tue Jan 11 15:40:06 2011 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index c77f6c4..14a1c65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-evdev (1:2.6.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.6.0-1) experimental; urgency=low
 
   * New upstream release.
 
- -- Cyril Brulebois k...@debian.org  Tue, 11 Jan 2011 15:39:46 +0100
+ -- Cyril Brulebois k...@debian.org  Tue, 11 Jan 2011 15:40:01 +0100
 
 xserver-xorg-input-evdev (1:2.5.99.903-1) experimental; urgency=low
 

commit 0fd6b8582f7481f7d180662dfbc4cc168ff3a8f6
Author: Cyril Brulebois k...@debian.org
Date:   Tue Jan 11 15:39:59 2011 +0100

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 64e90f2..3c729ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+commit 30c3645e20e945b0f8b7dc624748948464be606e
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Jan 11 12:46:40 2011 +1000
+
+evdev 2.6.0
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 3b52fe2ea4a934a8d87aacd185593beb01f8f273
+Author: Chase Douglas chase.doug...@canonical.com
+Date:   Wed Jan 5 10:09:55 2011 -0500
+
+Print out error messages when failing to init devices
+
+Signed-off-by: Chase Douglas chase.doug...@canonical.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
 commit 540a4cce9071fce183c941ded35e7e8fb8f3507e
 Author: Peter Hutterer peter.hutte...@who-t.net
 Date:   Wed Jan 5 09:04:56 2011 +1000
diff --git a/debian/changelog b/debian/changelog
index 09791bf..c77f6c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.6.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Cyril Brulebois k...@debian.org  Tue, 11 Jan 2011 15:39:46 +0100
+
 xserver-xorg-input-evdev (1:2.5.99.903-1) experimental; urgency=low
 
   * New upstream release candidate.

commit 30c3645e20e945b0f8b7dc624748948464be606e
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Tue Jan 11 12:46:40 2011 +1000

evdev 2.6.0

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 44d5976..887021c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-evdev],
-[2.5.99.903],
+[2.6.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-input-evdev])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 3b52fe2ea4a934a8d87aacd185593beb01f8f273
Author: Chase Douglas chase.doug...@canonical.com
Date:   Wed Jan 5 10:09:55 2011 -0500

Print out error messages when failing to init devices

Signed-off-by: Chase Douglas chase.doug...@canonical.com
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/src/evdev.c b/src/evdev.c
index d47b6c2..45873c1 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1320,8 +1320,11 @@ EvdevAddAbsClass(DeviceIntPtr device)
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION)  3
GetMotionHistory,
 #endif
-   GetMotionHistorySize(), Absolute))
+   GetMotionHistorySize(), Absolute)) {
+xf86Msg(X_ERROR, %s: failed to initialize valuator class device.\n,
+device-name);
 return !Success;
+}
 
 for (axis = ABS_X; axis = ABS_MAX; axis++) {
 int axnum = pEvdev-axis_map[axis];
@@ -1365,8 +1368,11 @@ EvdevAddAbsClass(DeviceIntPtr device)
 }
 }
 
-if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc))
+if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc)) {
+xf86Msg(X_ERROR, %s: failed to initialize pointer feedback class 
+device.\n, device-name);
 return !Success;
+}
 
 if (pEvdev-flags  EVDEV_TOUCHPAD)
 pEvdev-flags |= EVDEV_RELATIVE_MODE;
@@ -1449,11 +1455,17 @@ EvdevAddRelClass(DeviceIntPtr device)
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION)  3
GetMotionHistory,
 #endif
-   GetMotionHistorySize(), Relative))
+   GetMotionHistorySize(), Relative)) {
+xf86Msg(X_ERROR, %s: failed to initialize valuator class device.\n,
+device-name);
 return !Success;
+}
 
-if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc))
+if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc)) {
+xf86Msg(X_ERROR, %s: failed to initialize pointer feedback class 
+device.\n, 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Cyril Brulebois]

 debian/changelog |6 --
 src/evdev.c  |9 ++---
 2 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit c6c52d038bd641316197bde2a481378014fcc0c0
Author: Cyril Brulebois k...@debian.org
Date:   Tue Jan 4 16:06:59 2011 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 61b29e4..211f4fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-input-evdev (1:2.5.99.901-2) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.5.99.901-2) experimental; urgency=low
 
   * Switch Architecture for all binary packages from any to linux-any
 since this driver is Linux-only.
   * Cherry-pick bed25600 from upstream to fix crashes in
 GetProximityEvents (Closes: #605374).
 
- -- Cyril Brulebois k...@debian.org  Fri, 03 Dec 2010 19:19:49 +0100
+ -- Cyril Brulebois k...@debian.org  Tue, 04 Jan 2011 16:06:52 +0100
 
 xserver-xorg-input-evdev (1:2.5.99.901-1) experimental; urgency=low
 

commit e5479f812ee51a76462b07164f461464dc79efcc
Author: Cyril Brulebois k...@debian.org
Date:   Tue Jan 4 16:06:46 2011 +0100

Add bug closure for #605374.

diff --git a/debian/changelog b/debian/changelog
index 78cf3b0..61b29e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ xserver-xorg-input-evdev (1:2.5.99.901-2) UNRELEASED; 
urgency=low
   * Switch Architecture for all binary packages from any to linux-any
 since this driver is Linux-only.
   * Cherry-pick bed25600 from upstream to fix crashes in
-GetProximityEvents.
+GetProximityEvents (Closes: #605374).
 
  -- Cyril Brulebois k...@debian.org  Fri, 03 Dec 2010 19:19:49 +0100
 

commit 482fb728577672742d1e7d6e3ffe4235336ab9f3
Author: Cyril Brulebois k...@debian.org
Date:   Tue Jan 4 15:59:01 2011 +0100

Document the cherry-pick.

diff --git a/debian/changelog b/debian/changelog
index 029f19f..78cf3b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xserver-xorg-input-evdev (1:2.5.99.901-2) UNRELEASED; 
urgency=low
 
   * Switch Architecture for all binary packages from any to linux-any
 since this driver is Linux-only.
+  * Cherry-pick bed25600 from upstream to fix crashes in
+GetProximityEvents.
 
  -- Cyril Brulebois k...@debian.org  Fri, 03 Dec 2010 19:19:49 +0100
 

commit 3e98473acdc9caf63c604a96b3173ada748b4703
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Thu Dec 23 12:13:16 2010 +1000

Don't update first_val and num_val if we don't have data (#32480)

For touchpads, rel_queued may be on (due to abs to rel conversion) but the
delta for x/y is 0/0 on the first touch. Hence, we don't have any valuators
to post. The current results in a num_vals of -15 and a subsequent segfault
when the data is posted to the server.

Start with a last valuator of -1, so that we know if we have at least one to
post.

X.Org Bug 32480 http://bugs.freedesktop.org/show_bug.cgi?id=32480

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Chase Douglas chase.doug...@canonical.com
(cherry picked from commit bed25600f66db245b895a48d6edca30568ca7559)

Signed-off-by: Cyril Brulebois k...@debian.org

diff --git a/src/evdev.c b/src/evdev.c
index 040cfdc..c005f9f 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -402,7 +402,7 @@ EvdevProcessValuators(InputInfoPtr pInfo, int 
v[MAX_VALUATORS], int *num_v,
 }
 
 if (pEvdev-rel_queued) {
-int first = REL_CNT, last = 0;
+int first = REL_CNT, last = -1;
 int i;
 
 if (pEvdev-swap_axes) {
@@ -428,8 +428,11 @@ EvdevProcessValuators(InputInfoPtr pInfo, int 
v[MAX_VALUATORS], int *num_v,
 }
 }
 
-*num_v = (last - first + 1);
-*first_v = first;
+if (last = 0)
+{
+*num_v = (last - first + 1);
+*first_v = first;
+}
 }
 /*
  * Some devices only generate valid abs coords when BTN_TOOL_PEN is


-- 
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/e1pa8wb-0005n5...@alioth.debian.org

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Cyril Brulebois]

 ChangeLog|  138 +++
 configure.ac |2 
 debian/changelog |6 ++
 src/evdev.c  |  130 ++-
 src/evdev.h  |3 -
 5 files changed, 194 insertions(+), 85 deletions(-)

New commits:
commit 80e24db12778bdf41d3af92fc9b0247e4c458dc1
Author: Cyril Brulebois k...@debian.org
Date:   Wed Jan 5 01:33:47 2011 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 5d26cbd..09791bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-evdev (1:2.5.99.903-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.5.99.903-1) experimental; urgency=low
 
   * New upstream release candidate.
 
- -- Cyril Brulebois k...@debian.org  Wed, 05 Jan 2011 01:30:00 +0100
+ -- Cyril Brulebois k...@debian.org  Wed, 05 Jan 2011 01:33:36 +0100
 
 xserver-xorg-input-evdev (1:2.5.99.901-2) experimental; urgency=low
 

commit 44e94bbc201e3f71d25966bd720eafbfe6067eb2
Author: Cyril Brulebois k...@debian.org
Date:   Wed Jan 5 01:30:50 2011 +0100

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 8c8c06d..64e90f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,141 @@
+commit 540a4cce9071fce183c941ded35e7e8fb8f3507e
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Wed Jan 5 09:04:56 2011 +1000
+
+evdev 2.5.99.903
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit bed25600f66db245b895a48d6edca30568ca7559
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Thu Dec 23 12:13:16 2010 +1000
+
+Don't update first_val and num_val if we don't have data (#32480)
+
+For touchpads, rel_queued may be on (due to abs to rel conversion) but the
+delta for x/y is 0/0 on the first touch. Hence, we don't have any valuators
+to post. The current results in a num_vals of -15 and a subsequent segfault
+when the data is posted to the server.
+
+Start with a last valuator of -1, so that we know if we have at least one 
to
+post.
+
+X.Org Bug 32480 http://bugs.freedesktop.org/show_bug.cgi?id=32480
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Chase Douglas chase.doug...@canonical.com
+
+commit 9aea1c5fa09c25ad83bcf2fd4ee4bd853d889e5e
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Dec 21 10:53:06 2010 +1000
+
+Add use_proximity bit for BTN_TOOL handling.
+
+Touchpads send garbage data between BTN_TOOL_FINGER and BTN_TOUCH. This
+leads to cursor movement towards invalid positions (bottom left corner,
+usually).
+
+Add a new flag use_proximity as a delimiter for BTN_TOUCH handling. If
+unset, the actual proximity bits are ignored, no proximity events are sent
+and BTN_TOUCH is used for the tool handling.
+
+Example event stream for synaptics:
+
+Event: time 1292893041.002731, -- Report Sync 
+Event: time 1292893041.015807, type 1 (Key), code 330 (Touch), value 0
+Event: time 1292893041.015812, type 3 (Absolute), code 0 (X), value 4283
+Event: time 1292893041.015813, type 3 (Absolute), code 1 (Y), value 4860
+Event: time 1292893041.015815, type 3 (Absolute), code 24 (Pressure), 
value 23
+Event: time 1292893041.015817, type 3 (Absolute), code 28 (Tool Width), 
value 5
+Event: time 1292893041.027537, -- Report Sync 
+Event: time 1292893041.038854, type 3 (Absolute), code 0 (X), value 1
+Event: time 1292893041.038857, type 3 (Absolute), code 1 (Y), value 5855
+Event: time 1292893041.038859, type 3 (Absolute), code 24 (Pressure), 
value 1
+Event: time 1292893041.038861, type 3 (Absolute), code 28 (Tool Width), 
value 5
+Event: time 1292893041.038864, -- Report Sync 
+Event: time 1292893041.062432, type 3 (Absolute), code 24 (Pressure), 
value 0
+Event: time 1292893041.062435, type 3 (Absolute), code 28 (Tool Width), 
value 0
+Event: time 1292893041.062437, type 1 (Key), code 325 (ToolFinger), value 0
+Event: time 1292893041.062438, -- Report Sync 
+
+Reported-by: Dave Airlie airl...@redhat.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Chris Bagwell ch...@cnpbagwell.com
+
+commit 0c987a929dd4c98d4a80d8b7f75286902eb572f2
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Dec 21 10:45:11 2010 +1000
+
+Revert Don't count BTN_TOUCH as tool. (#29428)
+
+Synaptics devices send garbage between BTN_TOUCH and BTN_TOOL_FINGER. By
+switching to use this as proximity data now, the pointer is reset to the
+garbage data position (usually around 1/5855).
+
+This reverts commit 899218e18120918138f6d7420465763422d5b3b7.
+
+Reported-by: Dave Airlie airl...@redhat.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Chris 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Cyril Brulebois]

 debian/changelog |7 +++
 debian/control   |4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit af50e93dcf76cd8038445fcc0aca33944b013d4b
Author: Cyril Brulebois k...@debian.org
Date:   Fri Dec 3 19:20:43 2010 +0100

Switch Architecture for all binary packages from any to linux-any since 
this driver is Linux-only.

diff --git a/debian/changelog b/debian/changelog
index ac6bb30..029f19f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-evdev (1:2.5.99.901-2) UNRELEASED; urgency=low
+
+  * Switch Architecture for all binary packages from any to linux-any
+since this driver is Linux-only.
+
+ -- Cyril Brulebois k...@debian.org  Fri, 03 Dec 2010 19:19:49 +0100
+
 xserver-xorg-input-evdev (1:2.5.99.901-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index aa80eaa..f92f39a 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ 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
 
 Package: xserver-xorg-input-evdev
-Architecture: any
+Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xinpdriver:Depends},
 Provides: ${xinpdriver:Provides}
 Replaces: xserver-xorg ( 6.8.2-35)
@@ -39,7 +39,7 @@ Description: X.Org X server -- evdev input driver
 Package: xserver-xorg-input-evdev-udeb
 XC-Package-Type: udeb
 Section: debian-installer
-Architecture: any
+Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends},
  udev-udeb [linux-any],
 Provides: ${xinpdriver:Provides}


-- 
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/e1pofaj-a7...@alioth.debian.org

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Cyril Brulebois]

 debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit b72947a79aa136ea6d68ac7bda49bfcac390a025
Author: Cyril Brulebois k...@debian.org
Date:   Thu Oct 21 16:03:30 2010 +0200

Close some bugs in changelog.

diff --git a/debian/changelog b/debian/changelog
index 2704945..3528f62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 xserver-xorg-input-evdev (1:2.5.0-1) UNRELEASED; urgency=low
 
+  [ Robert Hooker ]
   * New upstream release.
   * Bump xutils-dev build dep for new util-macros.
 
+  [ Cyril Brulebois ]
+  * New upstream release fixes some bugs:
+ - Forward keycodes  255 (Closes: #500096).
+ - No longer list README.mouse (Closes: #590529).
+
  -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 13:29:49 -0400
 
 xserver-xorg-input-evdev (1:2.3.2-7) experimental; urgency=low


-- 
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/e1p8wxi-0004fd...@alioth.debian.org

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Cyril Brulebois]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f3df7e123601ecf3ae62d7fcc50b8f516b26d14e
Author: Cyril Brulebois k...@debian.org
Date:   Thu Oct 21 19:55:01 2010 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 3528f62..8358d8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.5.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.5.0-1) experimental; urgency=low
 
   [ Robert Hooker ]
   * New upstream release.
@@ -9,7 +9,7 @@ xserver-xorg-input-evdev (1:2.5.0-1) UNRELEASED; urgency=low
  - Forward keycodes  255 (Closes: #500096).
  - No longer list README.mouse (Closes: #590529).
 
- -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 13:29:49 -0400
+ -- Cyril Brulebois k...@debian.org  Thu, 21 Oct 2010 19:49:10 +0200
 
 xserver-xorg-input-evdev (1:2.3.2-7) experimental; urgency=low
 


-- 
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/e1p8zmh-00084l...@alioth.debian.org

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Robert Hooker]

 src/evdev.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4d26acc4f2d55d7e8fbb68d633b392326156c1e6
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 15:06:42 2010 -0400

Fix up a merge conflict.

This change was lost because of a bad git workflow being used on my part.

diff --git a/src/evdev.c b/src/evdev.c
index 049a688..512e957 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -386,7 +386,7 @@ EvdevProcessValuators(InputInfoPtr pInfo, int 
v[MAX_VALUATORS], int *num_v,
 for (i = 0; i  REL_CNT; i++)
 {
 int map = pEvdev-axis_map[i];
-if (map != -1)
+if (pEvdev-delta[i]  map != -1)
 {
 v[map] = pEvdev-delta[i];
 if (map  first)


-- 
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/e1p7v7z-0004lj...@alioth.debian.org

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 debian/xsfbs/xsfbs.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois k...@debian.org
Date:   Sun May 2 02:14:45 2010 +0200

Add xorg-driver-{video,input} to Provides.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 77c4a39..3c59c20 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 
2/dev/null)
 # these two can be removed post-squeeze
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)
-VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input
 
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }'  debian/control)


-- 
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/e1p61xd-0004dk...@alioth.debian.org

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Cyril Brulebois]

 debian/README.source |2 
 debian/changelog |   64 +++
 debian/control   |   25 ++
 debian/local/65-xorg-evdev.rules |9 ---
 debian/rules |   35 ++
 debian/xserver-xorg-input-evdev-udeb.install |1 
 debian/xserver-xorg-input-evdev.install  |1 
 debian/xserver-xorg-input-evdev.postinst.in  |   23 -
 debian/xsfbs/xsfbs.mk|   31 -
 9 files changed, 126 insertions(+), 65 deletions(-)

New commits:
commit 6b4bdea60a6caaef8f4f33d08d3b8bf6c9030cbb
Author: Cyril Brulebois k...@debian.org
Date:   Tue Oct 12 23:53:39 2010 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 6807d35..a814a0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-evdev (1:2.3.2-7) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.3.2-7) experimental; urgency=low
 
   * Build against Xserver 1.9.1 rc1.
 
- -- Cyril Brulebois k...@debian.org  Mon, 11 Oct 2010 10:53:39 +0200
+ -- Cyril Brulebois k...@debian.org  Tue, 12 Oct 2010 23:52:24 +0200
 
 xserver-xorg-input-evdev (1:2.3.2-6) unstable; urgency=low
 

commit a9a5222673e0dfca26467b40e57fc09e3b8b0696
Author: Cyril Brulebois k...@debian.org
Date:   Mon Oct 11 10:54:20 2010 +0200

Build against Xserver 1.9.1 rc1.

diff --git a/debian/changelog b/debian/changelog
index 861eb0c..6807d35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.3.2-7) UNRELEASED; urgency=low
+
+  * Build against Xserver 1.9.1 rc1.
+
+ -- Cyril Brulebois k...@debian.org  Mon, 11 Oct 2010 10:53:39 +0200
+
 xserver-xorg-input-evdev (1:2.3.2-6) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 89c7495..e6e695c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (= 5.0.0),
  pkg-config,
  quilt,
- xserver-xorg-dev (= 2:1.7.6.901),
+ xserver-xorg-dev (= 2:1.9.0.901),
  x11proto-core-dev,
  x11proto-randr-dev,
  x11proto-input-dev,

commit c50b97738d5072f930cf685933abbc116d002fa5
Author: Mikhail Gusarov dotted...@debian.org
Date:   Fri May 7 18:58:55 2010 +0700

Remove duplicate xorg.fd.o URL and confusing mailing list URL from 
debian/control

diff --git a/debian/control b/debian/control
index 9ed92d8..89c7495 100644
--- a/debian/control
+++ b/debian/control
@@ -33,8 +33,6 @@ Description: X.Org X server -- evdev input driver
  .
  More information about X.Org can be found at:
  URL:http://www.X.org
- URL:http://xorg.freedesktop.org
- URL:http://lists.freedesktop.org/mailman/listinfo/xorg
  .
  This package is built from the X.org xf86-input-evdev driver module.
 
@@ -59,7 +57,5 @@ Description: X.Org X server -- evdev input driver 
(development headers)
  .
  More information about X.Org can be found at:
  URL:http://www.X.org
- URL:http://xorg.freedesktop.org
- URL:http://lists.freedesktop.org/mailman/listinfo/xorg
  .
  This package is built from the X.org xf86-input-evdev driver module.

commit ccd7faf17d467d03605be3a9c821cecdb4065817
Author: Cyril Brulebois k...@debian.org
Date:   Sat Apr 17 21:40:27 2010 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 46fa594..861eb0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-xserver-xorg-input-evdev (1:2.3.2-6) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.3.2-6) unstable; urgency=low
 
+  [ Julien Cristau ]
   * Drop 05-evdev.conf, this moved to the server.
   * Build-Depend on xserver-xorg-dev 1.7.6.901.
   * Sanitize manpage installation.
   * Update to new xsfbs, use ${xinpdriver:Depends} in debian/control.
 
- -- Julien Cristau jcris...@debian.org  Sat, 17 Apr 2010 00:35:44 +0200
+ -- Cyril Brulebois k...@debian.org  Sat, 17 Apr 2010 21:40:15 +0200
 
 xserver-xorg-input-evdev (1:2.3.2-5) unstable; urgency=low
 

commit 9ebeafb521e62e964397c2d4c0ca830489ce59e4
Author: Julien Cristau jcris...@debian.org
Date:   Sat Apr 17 00:41:04 2010 +0200

Update to new xsfbs, use ${xinpdriver:Depends} in debian/control.

diff --git a/debian/changelog b/debian/changelog
index 7450b8e..46fa594 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-evdev (1:2.3.2-6) UNRELEASED; urgency=low
   * Drop 05-evdev.conf, this moved to the server.
   * Build-Depend on xserver-xorg-dev 1.7.6.901.
   * Sanitize manpage installation.
+  * Update to new xsfbs, use ${xinpdriver:Depends} in debian/control.
 
  -- Julien Cristau jcris...@debian.org  Sat, 17 Apr 2010 00:35:44 +0200
 
diff --git a/debian/control b/debian/control
index 448573b..9ed92d8 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.g
 
 Package: xserver-xorg-input-evdev
 Architecture: 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Brice Goglin]

 ChangeLog   |   70 
 configure.ac|2 
 debian/changelog|   15 +
 debian/control  |   21 ++
 debian/local/65-xorg-evdev.rules|2 
 debian/xserver-xorg-input-evdev-dev.install |3 
 debian/xserver-xorg-input-evdev.postinst.in |   23 ++
 debian/xsfbs/xsfbs.mk   |   21 --
 debian/xsfbs/xsfbs.sh   |  233 
 src/evdev.c |   43 +++--
 10 files changed, 168 insertions(+), 265 deletions(-)

New commits:
commit a75796f02c1b507f1a4777b76a0755af403dad49
Author: Brice Goglin bgog...@debian.org
Date:   Sat Dec 12 17:56:28 2009 +0100

Prepare Changelog for upload

diff --git a/debian/changelog b/debian/changelog
index d6f9b23..4d24f84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.3.2-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.3.2-1) experimental; urgency=low
 
   [ Timo Aaltonen ]
   * Build against Xserver 1.7.
@@ -11,7 +11,7 @@ xserver-xorg-input-evdev (1:2.3.2-1) UNRELEASED; urgency=low
   [ Brice Goglin ]
   * New upstream release.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 08 Dec 2009 13:47:20 +0200
+ -- Brice Goglin bgog...@debian.org  Sat, 12 Dec 2009 17:56:22 +0100
 
 xserver-xorg-input-evdev (1:2.3.1-1) experimental; urgency=low
 

commit edca5b7c041ee5435707a54170e36a104487847b
Author: Brice Goglin bgog...@debian.org
Date:   Sat Dec 12 17:56:12 2009 +0100

New upstream release

diff --git a/ChangeLog b/ChangeLog
index de41ae1..e5357db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,73 @@
+commit f7850a40424f7ec0c32fb2b46d427b51b5410d99
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Fri Dec 11 13:42:33 2009 +1000
+
+evdev 2.3.2
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit bd4102af6e168c1b9129301f88e9601f8f5e0848
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Dec 1 15:44:39 2009 +1000
+
+Fix up BTN_TOUCH handling for non-button tablets.
+
+BTN_TOOL_* is treated as tool, just like before. BTN_TOUCH on the other 
hand
+may need to be treated as a button left press. This again requires a button
+class.
+
+Tested on an HP Touchsmart and a Wacom tablet.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit 1b0df04abe329433658c95debdafdf1714173814)
+
+commit 22e816eb326a5495a5dc6e0a94394534d6645bae
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Dec 1 14:16:10 2009 +1000
+
+Only init the calibration property for absolute devices.
+
+Relative devices can't be calibrated anyway so why bother.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit 2ca24a16f08095f35d5610f16e202c525b3075e9)
+
+commit b6b377fe9afa51ee8cbef8e9830537806e94a3ac
+Author: David Woodhouse dw...@infradead.org
+Date:   Tue Dec 1 00:14:54 2009 +
+
+Report initial calibration parameters.
+
+Where an initial calibration is provided through the Calibration option
+to the driver, it wasn't being exposed in the 'Evdev Axis Calibration'
+property. Remedy that...
+
+Signed-off-by: David Woodhouse david.woodho...@intel.com
+Acked-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit 7b285a802b8ccddd1edcf40ab345c4a96bcdf43c)
+
+commit 3772676fd65065b43a94234127537ab5030b09f8
+Author: David Woodhouse dw...@infradead.org
+Date:   Tue Dec 1 00:12:36 2009 +
+
+Swap axes before applying touch screen calibration.
+
+When the SwapAxes option is set, the X and Y axes in calibration should
+be labelled as the user perceives them -- not as the kernel sends them.
+
+Currently, we apply the X-axis calibration to the X-axis of the input,
+and then do the axis swapping so we've actually applied the X-axis
+calibration to what the user sees as the Y-axis.
+
+This patch changes the order of the operations, so that the axes are
+swapped before the calibration is applied.
+
+Signed-off-by: David Woodhouse david.woodho...@intel.com
+Acked-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit f187badb71554a73bf9ca30ce75c9d166e688f03)
+
 commit 4f05afd495214ad48ffab7bdb1cde69aacc5af8f
 Author: Peter Hutterer peter.hutte...@who-t.net
 Date:   Fri Nov 20 11:18:03 2009 +1000
diff --git a/debian/changelog b/debian/changelog
index 6d7df35..d6f9b23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.3.1-2) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.3.2-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * Build against Xserver 1.7.
@@ -8,6 +8,9 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 ChangeLog|  194 +++
 configure.ac |2 
 debian/changelog |9 +
 debian/local/10-x11-evdev.fdi|   18 --
 debian/local/65-xorg-evdev.rules |9 +
 debian/rules |4 
 man/evdev.man|   28 +++-
 src/draglock.c   |9 -
 src/evdev.c  |  271 +--
 9 files changed, 419 insertions(+), 125 deletions(-)

New commits:
commit cd69069e6b6e3d7c0309dd8752c152070b5768ff
Author: Julien Cristau jcris...@debian.org
Date:   Sat Nov 28 20:42:23 2009 +0100

Add bug closers

diff --git a/debian/changelog b/debian/changelog
index d497506..4c6e4ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xserver-xorg-input-evdev (1:2.3.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
++ Finalize the middle button emulation when a read error occurs
+  (closes: #550970, #552012)
   * Replace the fdi file with an udev rule.
 
  -- Julien Cristau jcris...@debian.org  Thu, 26 Nov 2009 18:27:58 +0100

commit 440c73d5be3c06cdebba5001a08dc40e5fa289da
Author: Julien Cristau jcris...@debian.org
Date:   Thu Nov 26 18:43:11 2009 +0100

Replace the fdi file with an udev rule.

diff --git a/debian/changelog b/debian/changelog
index 76826f1..d497506 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-input-evdev (1:2.3.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Replace the fdi file with an udev rule.
 
  -- Julien Cristau jcris...@debian.org  Thu, 26 Nov 2009 18:27:58 +0100
 
diff --git a/debian/local/10-x11-evdev.fdi b/debian/local/10-x11-evdev.fdi
deleted file mode 100644
index a7fe8cc..000
--- a/debian/local/10-x11-evdev.fdi
+++ /dev/null
@@ -1,18 +0,0 @@
-?xml version=1.0 encoding=ISO-8859-1?
-deviceinfo version=0.2
-  device
-match key=info.capabilities contains=input.mouse
-  match key=/org/freedesktop/Hal/devices/computer:system.kernel.name
- string=Linux
-merge key=input.x11_driver type=stringevdev/merge
-  /match
-/match
-
-match key=info.capabilities contains=input.keys
-  match key=/org/freedesktop/Hal/devices/computer:system.kernel.name
- string=Linux
-merge key=input.x11_driver type=stringevdev/merge
-  /match
-/match
-  /device
-/deviceinfo
diff --git a/debian/local/65-xorg-evdev.rules b/debian/local/65-xorg-evdev.rules
new file mode 100644
index 000..48bbc8a
--- /dev/null
+++ b/debian/local/65-xorg-evdev.rules
@@ -0,0 +1,9 @@
+ACTION!=add, GOTO=xorg_evdev_end
+SUBSYSTEM!=input, GOTO=xorg_evdev_end
+KERNEL!=event*, GOTO=xorg_evdev_end
+
+# By default, we use the -evdev driver for every input device; later rules can
+# then change the driver for specific input devices.
+ENV{x11_driver}=evdev
+
+LABEL=xorg_evdev_end
diff --git a/debian/rules b/debian/rules
index c48fbf0..78555f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,8 +80,8 @@ binary-arch: build install serverabi
dh_installdocs
dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing --exclude=evdev_drv.la 
--exclude=usr/share/man/man4
-   install -d 
debian/xserver-xorg-input-evdev/usr/share/hal/fdi/policy/20thirdparty
-   install -m 644 debian/local/10-x11-evdev.fdi 
debian/xserver-xorg-input-evdev/usr/share/hal/fdi/policy/20thirdparty/
+   install -d debian/xserver-xorg-input-evdev/lib/udev/rules.d
+   install -m 644 debian/local/65-xorg-evdev.rules 
debian/xserver-xorg-input-evdev/lib/udev/rules.d/
dh_installman
dh_link
dh_strip

commit 581588b270d6f61a7fa2d236be922a8cff0bdcac
Author: Julien Cristau jcris...@debian.org
Date:   Thu Nov 26 18:28:33 2009 +0100

Bump changelogs

diff --git a/ChangeLog b/ChangeLog
index 6c26889..de41ae1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,197 @@
+commit 4f05afd495214ad48ffab7bdb1cde69aacc5af8f
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Fri Nov 20 11:18:03 2009 +1000
+
+evdev 2.3.1
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit c6964dd28a114e23de21f91c0323ae4f03fb0f16
+Author: Bartosz Brachaczek b.brachac...@gmail.com
+Date:   Fri Nov 13 00:18:00 2009 +1000
+
+Set all valuators for relative motion events (#24737)
+
+We should process all the deltas reported by a relative motion device,
+otherwise some devices such as A4Tech X-750F or similar may trigger a
+situation when the `v` array contains random values (it isn't
+initialized anywhere) and later we process them and in effect the mouse
+cursor jumps on the screen.
+I'm not sure why, but we also must be sure that the `first` and `last`
+variables reflect the axis map, otherwise the mouse cursor jumps on
+the screen when clicking mouse buttons in some rare cases reported by
+Bartek Iwaniec on Bugzilla. That's why a 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 092f322c85297f9a73e4fefb32fab0ee5d54f6d7
Author: Julien Cristau jcris...@debian.org
Date:   Sat Nov 28 20:43:05 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 4c6e4ac..b3a899a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-input-evdev (1:2.3.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.3.1-1) experimental; urgency=low
 
   * New upstream release.
 + Finalize the middle button emulation when a read error occurs
   (closes: #550970, #552012)
   * Replace the fdi file with an udev rule.
 
- -- Julien Cristau jcris...@debian.org  Thu, 26 Nov 2009 18:27:58 +0100
+ -- Julien Cristau jcris...@debian.org  Sat, 28 Nov 2009 20:42:52 +0100
 
 xserver-xorg-input-evdev (1:2.2.99.1-1) experimental; urgency=low
 


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

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 .cvsignore |   19 
 .gitignore |5 
 ChangeLog  | 1369 +++---
 Makefile.am|9 
 README |   20 
 configure.ac   |   29 
 debian/README.source   |   73 ++
 debian/changelog   |   44 +
 debian/control |8 
 debian/xsfbs/repack.sh |   32 
 debian/xsfbs/xsfbs.mk  |   29 
 debian/xsfbs/xsfbs.sh  |   78 --
 include/evdev-properties.h |2 
 man/.cvsignore |2 
 man/evdev.man  |  114 +--
 src/.cvsignore |6 
 src/Makefile.am|2 
 src/draglock.c |   12 
 src/emuMB.c|   14 
 src/emuWheel.c |   82 +-
 src/evdev.c| 1598 +
 src/evdev.h|   78 +-
 22 files changed, 2828 insertions(+), 797 deletions(-)

New commits:
commit 9ecc42ebc88789a8cc0a00c210bf9fd1de60c472
Author: Julien Cristau jcris...@debian.org
Date:   Tue Sep 29 21:46:02 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 5f2a7b0..b3a0d76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-input-evdev (1:2.2.99.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.2.99.1-1) experimental; urgency=low
 
   * New upstream snapshot.
   * Bump build-dep on xutils-dev for new xorg-macros.
   * Build against xserver 1.7 RC.
   * Bump Standards-Version to 3.8.3.
 
- -- Julien Cristau jcris...@debian.org  Tue, 29 Sep 2009 20:45:28 +0200
+ -- Julien Cristau jcris...@debian.org  Tue, 29 Sep 2009 21:04:26 +0200
 
 xserver-xorg-input-evdev (1:2.2.5-1) unstable; urgency=low
 

commit eead939cd7a3faeda0e5479b5b7699bd1efc6580
Author: Julien Cristau jcris...@debian.org
Date:   Tue Sep 29 20:54:21 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 95189f5..5f2a7b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-evdev (1:2.2.99.1-1) UNRELEASED; urgency=low
   * New upstream snapshot.
   * Bump build-dep on xutils-dev for new xorg-macros.
   * Build against xserver 1.7 RC.
+  * Bump Standards-Version to 3.8.3.
 
  -- Julien Cristau jcris...@debian.org  Tue, 29 Sep 2009 20:45:28 +0200
 
diff --git a/debian/control b/debian/control
index 23ba9f1..82faedc 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev (= 1:7.5~1)
-Standards-Version: 3.8.2
+Standards-Version: 3.8.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 9c6e0f09e8b204907b80c6d20cbf9e1dc381e8d9
Author: Julien Cristau jcris...@debian.org
Date:   Tue Sep 29 20:54:01 2009 +0200

Build against xserver 1.7 RC.

diff --git a/debian/changelog b/debian/changelog
index 9fb5206..95189f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-evdev (1:2.2.99.1-1) UNRELEASED; urgency=low
 
   * New upstream snapshot.
   * Bump build-dep on xutils-dev for new xorg-macros.
+  * Build against xserver 1.7 RC.
 
  -- Julien Cristau jcris...@debian.org  Tue, 29 Sep 2009 20:45:28 +0200
 
diff --git a/debian/control b/debian/control
index 7a26bd0..23ba9f1 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (= 5.0.0),
  pkg-config,
  quilt,
- xserver-xorg-dev (= 2:1.5.99.901),
+ xserver-xorg-dev (= 2:1.6.99.900),
  x11proto-core-dev,
  x11proto-randr-dev,
  x11proto-input-dev,

commit bc9af1887de4b49d3e1ecb9394c9a032b93c7a90
Author: Julien Cristau jcris...@debian.org
Date:   Tue Sep 29 20:52:25 2009 +0200

Bump build-dep on xutils-dev for new xorg-macros.

diff --git a/debian/changelog b/debian/changelog
index f29cbe7..9fb5206 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-input-evdev (1:2.2.99.1-1) UNRELEASED; urgency=low
 
   * New upstream snapshot.
+  * Bump build-dep on xutils-dev for new xorg-macros.
 
  -- Julien Cristau jcris...@debian.org  Tue, 29 Sep 2009 20:45:28 +0200
 
diff --git a/debian/control b/debian/control
index 726b204..7a26bd0 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
  dpkg-dev (= 1.14.17),
  automake,
  libtool,
- xutils-dev
+ xutils-dev (= 1:7.5~1)
 Standards-Version: 3.8.2
 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 1d11fb9a2fcee3834150347ab3a51e1d1f22a950
Author: Julien Cristau jcris...@debian.org
Date:   Tue Sep 29 20:50:20 2009 +0200

Bump changelogs

diff --git a/ChangeLog b/ChangeLog
index 5127feb..6c26889 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,23 @@
-commit cd24c2cc183d56603056805ed0084e3abb11c758
+commit 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 debian/changelog |5 +++--
 debian/control   |   17 +++--
 2 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 24c195433c69374ed687794320928f490feca498
Author: Julien Cristau jcris...@debian.org
Date:   Wed Jan 21 21:59:31 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 757d9cc..a629d36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-input-evdev (1:2.1.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.1.1-1) experimental; urgency=low
 
   * New upstream release.
   * Update debian/copyright from upstream's COPYING.
   * Build against xserver 1.6 rc1.
 
- -- Julien Cristau jcris...@debian.org  Wed, 03 Dec 2008 00:09:44 +0100
+ -- Julien Cristau jcris...@debian.org  Wed, 21 Jan 2009 21:58:47 +0100
 
 xserver-xorg-input-evdev (1:2.1.0-1) experimental; urgency=low
 

commit fcffce9f8fb86efebdadc965aa767bab93d7d740
Author: Julien Cristau jcris...@debian.org
Date:   Wed Jan 21 21:58:40 2009 +0100

Build against xserver 1.6 rc1.

diff --git a/debian/changelog b/debian/changelog
index 69250b6..757d9cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-evdev (1:2.1.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Update debian/copyright from upstream's COPYING.
+  * Build against xserver 1.6 rc1.
 
  -- Julien Cristau jcris...@debian.org  Wed, 03 Dec 2008 00:09:44 +0100
 
diff --git a/debian/control b/debian/control
index d05e52f..910bf2b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (= 5.0.0),
  pkg-config,
  quilt,
- xserver-xorg-dev (= 2:1.4.99.906),
+ xserver-xorg-dev (= 2:1.5.99.901),
  x11proto-core-dev,
  x11proto-randr-dev,
  x11proto-input-dev,
@@ -23,7 +23,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.g
 
 Package: xserver-xorg-input-evdev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}, 
xserver-xorg-core (= 2:1.5.3)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
 Provides: ${xinpdriver:Provides}
 Replaces: xserver-xorg ( 6.8.2-35)
 Description: X.Org X server -- evdev input driver

commit 87dae6972bb0f7f8bd7e7a56e71120eeafb20f9b
Author: Julien Cristau jcris...@debian.org
Date:   Wed Jan 21 21:57:25 2009 +0100

debian/control: wrap build-deps

diff --git a/debian/control b/debian/control
index 3deefd2..d05e52f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,20 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow dnusi...@debian.org, Drew Parsons 
dpars...@debian.org, Julien Cristau jcris...@debian.org
-Build-Depends: debhelper (= 5.0.0), pkg-config, quilt, xserver-xorg-dev (= 
2:1.4.99.906), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, 
x11proto-kb-dev, libxkbfile-dev, dpkg-dev (= 1.14.17), automake, libtool, 
xutils-dev
+Build-Depends:
+ debhelper (= 5.0.0),
+ pkg-config,
+ quilt,
+ xserver-xorg-dev (= 2:1.4.99.906),
+ x11proto-core-dev,
+ x11proto-randr-dev,
+ x11proto-input-dev,
+ x11proto-kb-dev,
+ libxkbfile-dev,
+ dpkg-dev (= 1.14.17),
+ automake,
+ libtool,
+ xutils-dev
 Standards-Version: 3.7.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


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

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 ChangeLog|   84 +++
 configure.ac |2 -
 debian/changelog |3 +
 man/evdev.man|2 -
 src/emuMB.c  |5 +++
 src/evdev.c  |   28 +-
 src/evdev.h  |   32 
 7 files changed, 133 insertions(+), 23 deletions(-)

New commits:
commit 1a967b5e9b0fb51b61b80dd8e2c9e35f36531dd3
Author: Julien Cristau jcris...@debian.org
Date:   Fri Jan 16 05:12:17 2009 +0100

update changelogs for new upstream

diff --git a/ChangeLog b/ChangeLog
index 9740312..7a2f78f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,87 @@
+commit 11d506dce6363525e80eda219aee8af429fb302e
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Jan 13 11:32:05 2009 +1000
+
+evdev 2.1.1
+
+commit a34a2cd3476441f29c9faa79ffa9289dbf2eebf4
+Author: Michael Chapman m...@very.puzzling.org
+Date:   Fri Jan 9 19:07:10 2009 +1100
+
+Disable middle mouse button emulation when a middle mouse button event is 
registered
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit 0592d97fbb5a1241ee79397ce9203346d050a9f9)
+
+commit 78c00bd77f983aa22611c9966fbcb7e22453b588
+Author: Matt Helsley matt.hels...@gmail.com
+Date:   Tue Jan 13 11:03:04 2009 +1000
+
+Fix FOO_MAX off-by-one
+
+In linux/input.h each section's (e.g. ABS) FOO_MAX is the maximum FOO
+value. Recent kernels define FOO_CNT as the maximum number of FOO there
+will ever be. Hence using FOO_MAX to size the bit vectors representing
+the capabilities of an evdev device is off by one.
+
+Define FOO_CNT values for use with Linux kernels which lack them. Use
+FOO_CNT whenever we need to know the number of bits needed -- usually to
+calculate the number of longs needed.
+
+When iterating over the values FOO_MAX still seems appropriate however
+the loop test should include FOO_MAX rather than skip it.
+
+Signed-off-by: Matt Helsley matt.hels...@gmail.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit 4dfd86b2201b2b19761a1abb3c580cecf0060224)
+
+Conflicts:
+
+   src/evdev.c
+
+commit 760f1c6bb184e3b48ca6a6bfe8942d306f378148
+Author: Matt Helsley matt.hels...@gmail.com
+Date:   Sun Jan 11 18:04:40 2009 -0800
+
+rename NBITS to NLONGS to reflect its actual meaning
+
+NBITS really convers the number of bits passed as its argument
+into a number of longs. This is somewhat atypical of many
+function-like-macro names. Rename it to NLONGS.
+
+Signed-off-by: Matt Helsley matt.hels...@gmail.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+(cherry-picked from commit d3fd42d8644310abcae23bbf534f8c445296bcb7)
+Not really required, but it makes cherry-picking
+4dfd86b2201b2b19761a1abb3c580cecf0060224 easier.
+
+commit 2db04ba3c35e4976b34d92f8f7c6c2c9ec09f3ab
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Fri Jan 9 16:13:09 2009 -0800
+
+Remove xorgconfig  xorgcfg from See Also list in man page
+(cherry picked from commit 0f0a149067abdd1ed89717de43febe89b2a3490b)
+
+commit 363d0bdb9fcae7f57f53c50667429ac9b37d41cc
+Author: Yan Li yan.i...@intel.com
+Date:   Mon Jan 5 16:35:09 2009 +0800
+
+Fix XkbModel parsing error
+
+Signed-off-by: Yan Li yan.i...@intel.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit d170cba0cdd8f7a2e500e094f5b21fc33aefb52a)
+
+commit 16a26a1eca6395284fcb8e62be7b2bc30becb0d3
+Author: Peter Hutterer peter.hutte...@redhat.com
+Date:   Wed Nov 26 15:01:57 2008 +1000
+
+Finalize MB emu (and wakeup handlers) before closing the fd.
+
+Signed-off-by: Peter Hutterer peter.hutte...@redhat.com
+(cherry picked from commit 2bf6e29b40f0da2bc417964fd2bd819306e5d3ed)
+
 commit b879ae73510ad733c266fba80e0ec4b0f903e71b
 Author: Peter Hutterer peter.hutte...@redhat.com
 Date:   Mon Nov 17 09:27:25 2008 +1000
diff --git a/debian/changelog b/debian/changelog
index 84ef79d..69250b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xserver-xorg-input-evdev (1:2.1.0-2) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.1.1-1) UNRELEASED; urgency=low
 
+  * New upstream release.
   * Update debian/copyright from upstream's COPYING.
 
  -- Julien Cristau jcris...@debian.org  Wed, 03 Dec 2008 00:09:44 +0100

commit 11d506dce6363525e80eda219aee8af429fb302e
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Tue Jan 13 11:32:05 2009 +1000

evdev 2.1.1

diff --git a/configure.ac b/configure.ac
index f668d1e..28294e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-evdev],
-2.1.0,
+2.1.1,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-evdev)
 

commit a34a2cd3476441f29c9faa79ffa9289dbf2eebf4
Author: Michael Chapman m...@very.puzzling.org

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 debian/changelog |6 ++
 debian/copyright |  126 +--
 2 files changed, 101 insertions(+), 31 deletions(-)

New commits:
commit 28b0f7622cc0b62bdb9f5e33a0cdb080f2bb9c44
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Dec 3 00:09:59 2008 +0100

Update debian/copyright from upstream's COPYING.

diff --git a/debian/changelog b/debian/changelog
index 4a3d5ab..84ef79d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.1.0-2) UNRELEASED; urgency=low
+
+  * Update debian/copyright from upstream's COPYING.
+
+ -- Julien Cristau [EMAIL PROTECTED]  Wed, 03 Dec 2008 00:09:44 +0100
+
 xserver-xorg-input-evdev (1:2.1.0-1) experimental; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/copyright b/debian/copyright
index bf3af89..4cf9803 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,34 +3,98 @@ 
git://anongit.freedesktop.org/git/xorg/driver/xf86-input-evdev.
 Release tarballs are available at
 http://xorg.freedesktop.org/releases/individual/driver/
 
- Copyright © 2006-2007 Zephaniah E. Hull
- Copyright © 2004 Red Hat, Inc.
-
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the Soft-
- ware), to deal in the Software without restriction, including without
- limitation the rights to use, copy, modify, merge, publish, distribute,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, provided that the above copyright
- notice(s) and this permission notice appear in all copies of the Soft-
- ware and that both the above copyright notice(s) and this permission
- notice appear in supporting documentation.
-
- THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
- ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
- RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
- THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
- QUENTIAL 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 PERFOR-
- MANCE OF THIS SOFTWARE.
-
- Except as contained in this notice, the name of a copyright holder shall
- not be used in advertising or otherwise to promote the sale, use or
- other dealings in this Software without prior written authorization of
- the copyright holder.
-
- Authors:
-   Zephaniah E. Hull ([EMAIL PROTECTED]),
-   Kristian Høgsberg ([EMAIL PROTECTED])
+Various copyright notices found in this driver:
+
+Copyright © 2004-2008 Red Hat, Inc.
+
+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, and that the name of Red Hat
+not be used in advertising or publicity pertaining to distribution
+of the software without specific, written prior permission.  Red
+Hat makes no representations about the suitability of this software
+for any purpose.  It is provided as is without express or implied
+warranty.
+
+THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+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 2005 Sun Microsystems, Inc.  All rights reserved.
+
+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 OPEN GROUP 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 copyright holders shall
+not be used in advertising or otherwise to promote the sale, use or
+other 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 debian/changelog |   10 --
 debian/control   |6 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 3f9b7dadf130cbb7d51eb1f24df0b8cde1b43ed8
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Nov 26 19:27:28 2008 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 29e5e5a..4a3d5ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.1.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.1.0-1) experimental; urgency=low
 
   [ Timo Aaltonen ]
   * New upstream release.
@@ -10,7 +10,7 @@ xserver-xorg-input-evdev (1:2.1.0-1) UNRELEASED; urgency=low
 matching anymore, that's hal/udev's job.  Also drop the mention of
 'Protocol evdev', which unexists since quite a while.
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Wed, 19 Nov 2008 15:34:39 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Wed, 26 Nov 2008 19:27:26 +0100
 
 xserver-xorg-input-evdev (1:2.0.99.3-1) experimental; urgency=low
 

commit f7e807ed8c31d5da5393ee23e0a34cf7332b210c
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Nov 26 19:26:57 2008 +0100

debian/control: update the long description.

We don't do clever device matching anymore, that's hal/udev's job.
Also drop the mention of 'Protocol evdev', which unexists since quite a
while.

diff --git a/debian/changelog b/debian/changelog
index 3a27448..29e5e5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 xserver-xorg-input-evdev (1:2.1.0-1) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release.
 + Store device file's minor/major to avoid duplicate devices
   (closes: #505635)
 
+  [ Julien Cristau ]
+  * debian/control: update the long description.  We don't do clever device
+matching anymore, that's hal/udev's job.  Also drop the mention of
+'Protocol evdev', which unexists since quite a while.
+
  -- Timo Aaltonen [EMAIL PROTECTED]  Wed, 19 Nov 2008 15:34:39 +0200
 
 xserver-xorg-input-evdev (1:2.0.99.3-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index ba1663c..3deefd2 100644
--- a/debian/control
+++ b/debian/control
@@ -16,11 +16,7 @@ Replaces: xserver-xorg ( 6.8.2-35)
 Description: X.Org X server -- evdev input driver
  This package provides the driver for input devices using evdev, the Linux
  kernel's event delivery mechanism.  This driver allows for multiple keyboards
- and mice to be treated as separate input devices, and matched on physical
- attributes such as which USB port they're connected to.
- .
- Note that this driver is different from Protocol evdev in the keyboard and
- mouse drivers, as shipped with Ubuntu 4.10 and 5.04, and Debian 3.1.
+ and mice to be treated as separate input devices.
  .
  More information about X.Org can be found at:
  URL:http://www.X.org


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 ChangeLog|   26 ++
 debian/changelog |2 ++
 2 files changed, 28 insertions(+)

New commits:
commit 7a6b1cb456fe5fa872b3938f6ce94a56f315b27b
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Nov 26 16:53:00 2008 +0100

Add bug closer

diff --git a/debian/changelog b/debian/changelog
index b672544..3a27448 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xserver-xorg-input-evdev (1:2.1.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
++ Store device file's minor/major to avoid duplicate devices
+  (closes: #505635)
 
  -- Timo Aaltonen [EMAIL PROTECTED]  Wed, 19 Nov 2008 15:34:39 +0200
 

commit 6c4746bb84578c7c8af86ff0bf6470afdda0b6ef
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Nov 26 16:49:52 2008 +0100

Update upstream changelog

diff --git a/ChangeLog b/ChangeLog
index c1249c8..9740312 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+commit b879ae73510ad733c266fba80e0ec4b0f903e71b
+Author: Peter Hutterer [EMAIL PROTECTED]
+Date:   Mon Nov 17 09:27:25 2008 +1000
+
+evdev 2.1
+
+commit 53566b7d4d7e641df4db5720ae9132eb4c812c84
+Author: Peter Hutterer [EMAIL PROTECTED]
+Date:   Mon Nov 17 10:03:11 2008 +1000
+
+Store device file's minor/major to avoid duplicate devices.
+
+Devices added that use the same min/maj as an already added device are 
ignored
+by the driver. This way users can have an xorg.conf entry on
+/dev/input/by-id/blahblah and not get the same device added by HAL.
+
+Signed-off-by: Peter Hutterer [EMAIL PROTECTED]
+(cherry picked from commit 63af314368cec47b6b8266db331f2c820e7a071f)
+
+commit 29c2765fc30c74171e51ba694ea4810916803c31
+Author: Fernando Carrijo [EMAIL PROTECTED]
+Date:   Thu Nov 6 13:20:16 2008 -0500
+
+Fix error message
+(cherry picked from commit 4c5c9c111d406e5590429377262b86e91868ef76)
+
 commit 7ef4e2c5e14e558f41fb7f411e2976f517b6b526
 Author: Peter Hutterer [EMAIL PROTECTED]
 Date:   Mon Nov 3 13:47:15 2008 +1030


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Timo Aaltonen]

 configure.ac |2 
 debian/changelog |6 ++
 src/evdev.c  |  114 ++-
 src/evdev.h  |4 +
 4 files changed, 124 insertions(+), 2 deletions(-)

New commits:
commit 7a0c4edcbf434043eb022c87086f97fb5ef398cb
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Wed Nov 19 15:37:09 2008 +0200

Update the changelog.

diff --git a/debian/changelog b/debian/changelog
index 9d09e19..b672544 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.1.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen [EMAIL PROTECTED]  Wed, 19 Nov 2008 15:34:39 +0200
+
 xserver-xorg-input-evdev (1:2.0.99.3-1) experimental; urgency=low
 
   [ Timo Aaltonen ]

commit b879ae73510ad733c266fba80e0ec4b0f903e71b
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Mon Nov 17 09:27:25 2008 +1000

evdev 2.1

diff --git a/configure.ac b/configure.ac
index f1d06cd..f668d1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-evdev],
-2.0.99.3,
+2.1.0,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-evdev)
 

commit 53566b7d4d7e641df4db5720ae9132eb4c812c84
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Mon Nov 17 10:03:11 2008 +1000

Store device file's minor/major to avoid duplicate devices.

Devices added that use the same min/maj as an already added device are 
ignored
by the driver. This way users can have an xorg.conf entry on
/dev/input/by-id/blahblah and not get the same device added by HAL.

Signed-off-by: Peter Hutterer [EMAIL PROTECTED]
(cherry picked from commit 63af314368cec47b6b8266db331f2c820e7a071f)

diff --git a/src/evdev.c b/src/evdev.c
index 3051531..25325a3 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -32,6 +32,7 @@
 
 #include X11/keysym.h
 
+#include sys/stat.h
 #include unistd.h
 #include errno.h
 #include fcntl.h
@@ -51,6 +52,10 @@
 #include evdev-properties.h
 #endif
 
+#ifndef MAXDEVICES
+#include inputstr.h /* for MAX_DEVICES */
+#define MAXDEVICES MAX_DEVICES
+#endif
 
 /* 2.4 compatibility */
 #ifndef EVIOCGRAB
@@ -112,6 +117,88 @@ static Atom prop_calibration = 0;
 static Atom prop_swap = 0;
 #endif
 
+/* All devices the evdev driver has allocated and knows about.
+ * MAXDEVICES is safe as null-terminated array, as two devices (VCP and VCK)
+ * cannot be used by evdev, leaving us with a space of 2 at the end. */
+static EvdevPtr evdev_devices[MAXDEVICES] = {0};
+
+static int
+EvdevGetMajorMinor(InputInfoPtr pInfo)
+{
+struct stat st;
+
+if (fstat(pInfo-fd, st) == -1)
+{
+xf86Msg(X_ERROR, %s: stat failed (%s). cannot check for 
duplicates.\n,
+pInfo-name, strerror(errno));
+return 0;
+}
+
+return st.st_rdev;
+}
+
+/**
+ * Return TRUE if one of the devices we know about has the same min/maj
+ * number.
+ */
+static BOOL
+EvdevIsDuplicate(InputInfoPtr pInfo)
+{
+EvdevPtr pEvdev = pInfo-private;
+EvdevPtr* dev   = evdev_devices;
+
+if (pEvdev-min_maj)
+{
+while(*dev)
+{
+if ((*dev) != pEvdev 
+(*dev)-min_maj 
+(*dev)-min_maj == pEvdev-min_maj)
+return TRUE;
+dev++;
+}
+}
+return FALSE;
+}
+
+/**
+ * Add to internal device list.
+ */
+static void
+EvdevAddDevice(InputInfoPtr pInfo)
+{
+EvdevPtr pEvdev = pInfo-private;
+EvdevPtr* dev = evdev_devices;
+
+while(*dev)
+dev++;
+
+*dev = pEvdev;
+}
+
+/**
+ * Remove from internal device list.
+ */
+static void
+EvdevRemoveDevice(InputInfoPtr pInfo)
+{
+EvdevPtr pEvdev = pInfo-private;
+EvdevPtr *dev   = evdev_devices;
+int count   = 0;
+
+while(*dev)
+{
+count++;
+if (*dev == pEvdev)
+{
+memmove(dev, dev + 1,
+sizeof(evdev_devices) - (count * sizeof(EvdevPtr)));
+break;
+}
+dev++;
+}
+}
+
 
 static void
 SetXkbOption(InputInfoPtr pInfo, char *name, char **option)
@@ -205,6 +292,7 @@ EvdevReopenTimer(OsTimerPtr timer, CARD32 time, pointer arg)
 DisableDevice(pInfo-dev);
 close(pInfo-fd);
 pInfo-fd = -1;
+pEvdev-min_maj = 0; /* don't hog the device */
 }
 pEvdev-reopen_left = 0;
 return 0;
@@ -217,6 +305,7 @@ EvdevReopenTimer(OsTimerPtr timer, CARD32 time, pointer arg)
 xf86Msg(X_ERROR, %s: Failed to reopen device after %d attempts.\n,
 pInfo-name, pEvdev-reopen_attempts);
 DisableDevice(pInfo-dev);
+pEvdev-min_maj = 0; /* don't hog the device */
 return 0;
 }
 
@@ -1024,6 +1113,14 @@ EvdevOn(DeviceIntPtr device)
 pEvdev-reopen_timer = TimerSet(NULL, 0, 100, EvdevReopenTimer, pInfo);
 } else
 {
+pEvdev-min_maj = EvdevGetMajorMinor(pInfo);
+if 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 debian/changelog  |8 ++--
 debian/control|2 +-
 debian/local/10-x11-evdev.fdi |   18 ++
 debian/rules  |2 ++
 4 files changed, 27 insertions(+), 3 deletions(-)

New commits:
commit b61f874ea93c0c69d5c0ba6df4d4c8e2e8bef541
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Nov 12 20:23:10 2008 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 653a3b0..9d09e19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.0.99.3-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.0.99.3-1) experimental; urgency=low
 
   [ Timo Aaltonen ]
   * rules: Clean config.h.in.
@@ -14,7 +14,7 @@ xserver-xorg-input-evdev (1:2.0.99.3-1) UNRELEASED; 
urgency=low
   * Depend on xserver-xorg-core = 2:1.5.3, to make sure the console is set to
 RAW mode.
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Fri, 12 Sep 2008 14:52:54 +0300
+ -- Julien Cristau [EMAIL PROTECTED]  Wed, 12 Nov 2008 20:22:57 +0100
 
 xserver-xorg-input-evdev (1:2.0.3-2) experimental; urgency=low
 

commit 6333071f519af11e20ce3af9c0215bad402f1eae
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Nov 12 20:22:20 2008 +0100

Depend on xserver-xorg-core = 2:1.5.3, to make sure the console is set to 
RAW mode.

diff --git a/debian/changelog b/debian/changelog
index 44beffb..653a3b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ xserver-xorg-input-evdev (1:2.0.99.3-1) UNRELEASED; 
urgency=low
   * Drop patch included upstream.
   * Install (temporarily) an fdi file to get Xorg to load the evdev driver for
 mice and keyboards.
+  * Depend on xserver-xorg-core = 2:1.5.3, to make sure the console is set to
+RAW mode.
 
  -- Timo Aaltonen [EMAIL PROTECTED]  Fri, 12 Sep 2008 14:52:54 +0300
 
diff --git a/debian/control b/debian/control
index 6b613ce..ba1663c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.g
 
 Package: xserver-xorg-input-evdev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}, 
xserver-xorg-core (= 2:1.5.3)
 Provides: ${xinpdriver:Provides}
 Replaces: xserver-xorg ( 6.8.2-35)
 Description: X.Org X server -- evdev input driver

commit b4855a4dca3bd1f7556a7d0adad93b3f2e16f6c1
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Nov 12 15:24:36 2008 +0100

Install (temporarily) an fdi file to get Xorg to load the evdev driver for 
mice and keyboards.

diff --git a/debian/changelog b/debian/changelog
index 8d24ae8..44beffb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ xserver-xorg-input-evdev (1:2.0.99.3-1) UNRELEASED; urgency=low
 + close the device on DEVICE_OFF, and reopen it on DEVICE_ON
   (closes: #496101, #492146)
   * Drop patch included upstream.
+  * Install (temporarily) an fdi file to get Xorg to load the evdev driver for
+mice and keyboards.
 
  -- Timo Aaltonen [EMAIL PROTECTED]  Fri, 12 Sep 2008 14:52:54 +0300
 
diff --git a/debian/local/10-x11-evdev.fdi b/debian/local/10-x11-evdev.fdi
new file mode 100644
index 000..a7fe8cc
--- /dev/null
+++ b/debian/local/10-x11-evdev.fdi
@@ -0,0 +1,18 @@
+?xml version=1.0 encoding=ISO-8859-1?
+deviceinfo version=0.2
+  device
+match key=info.capabilities contains=input.mouse
+  match key=/org/freedesktop/Hal/devices/computer:system.kernel.name
+ string=Linux
+merge key=input.x11_driver type=stringevdev/merge
+  /match
+/match
+
+match key=info.capabilities contains=input.keys
+  match key=/org/freedesktop/Hal/devices/computer:system.kernel.name
+ string=Linux
+merge key=input.x11_driver type=stringevdev/merge
+  /match
+/match
+  /device
+/deviceinfo
diff --git a/debian/rules b/debian/rules
index ff63d05..c48fbf0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,6 +80,8 @@ binary-arch: build install serverabi
dh_installdocs
dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing --exclude=evdev_drv.la 
--exclude=usr/share/man/man4
+   install -d 
debian/xserver-xorg-input-evdev/usr/share/hal/fdi/policy/20thirdparty
+   install -m 644 debian/local/10-x11-evdev.fdi 
debian/xserver-xorg-input-evdev/usr/share/hal/fdi/policy/20thirdparty/
dh_installman
dh_link
dh_strip


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 .gitignore|
1 
 COPYING   |   
99 +
 ChangeLog |  
744 -
 Makefile.am   |
5 
 configure.ac  |   
28 
 debian/changelog  |   
11 
 debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch |   
21 
 debian/patches/series |
1 
 include/Makefile.am   |
2 
 include/evdev-properties.h|   
69 
 man/Makefile.am   |
2 
 man/evdev.man |  
155 +
 src/Makefile.am   |
7 
 src/draglock.c|  
318 +++
 src/emuMB.c   |  
102 +
 src/emuWheel.c|  
466 +
 src/evdev.c   |  
813 --
 src/evdev.h   |   
83 -
 xorg-evdev.pc.in  |
6 
 19 files changed, 2664 insertions(+), 269 deletions(-)

New commits:
commit c4037996e6aa87057132b10938b2d26bc3d9d7d4
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Nov 12 00:08:29 2008 +0100

Drop patch, update changelog for new upstream

diff --git a/debian/changelog b/debian/changelog
index 9f56a3a..8d24ae8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-xserver-xorg-input-evdev (1:2.0.4-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.0.99.3-1) UNRELEASED; urgency=low
 
-  * New upstream release.
+  [ Timo Aaltonen ]
   * rules: Clean config.h.in.
 
+  [ Julien Cristau ]
+  * New upstream release.
++ don't grab the device by default
++ close the device on DEVICE_OFF, and reopen it on DEVICE_ON
+  (closes: #496101, #492146)
+  * Drop patch included upstream.
+
  -- Timo Aaltonen [EMAIL PROTECTED]  Fri, 12 Sep 2008 14:52:54 +0300
 
 xserver-xorg-input-evdev (1:2.0.3-2) experimental; urgency=low
diff --git 
a/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch 
b/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
deleted file mode 100644
index 8b3d7d4..000
--- a/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 9007585c1fce21e786372c2f1ca1c7776f3eafdb Mon Sep 17 00:00:00 2001
-From: Julien Cristau [EMAIL PROTECTED]
-Date: Thu, 22 May 2008 20:54:02 +0200
-Subject: [PATCH] include the proper header for XkbSetRulesDflts and 
XkbInitKeyboardDeviceStruct
-

- src/evdev.h |3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
 xserver-xorg-input-evdev.orig/src/evdev.h
-+++ xserver-xorg-input-evdev/src/evdev.h
-@@ -36,8 +36,7 @@
- #include xf86_OSproc.h
- 
- #if defined(XKB)
--/* XXX VERY WRONG.  this is a client side header. */
--#include X11/extensions/XKBstr.h
-+#include xkbsrv.h
- #endif
- 
- typedef struct {
diff --git a/debian/patches/series b/debian/patches/series
index 0bc726b..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-include-the-proper-header-for-XkbSetRulesDflts-and-X.patch

commit 7ef4e2c5e14e558f41fb7f411e2976f517b6b526
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Mon Nov 3 13:47:15 2008 +1030

evdev 2.1 RC 3

That's it, no more new features. Now it's down to bugfixing only.

diff --git a/configure.ac b/configure.ac
index 144964c..f1d06cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-evdev],
-2.0.99.2,
+2.0.99.3,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-evdev)
 

commit dd0eeacc24a80893209f24d9ad028a6bc7e3a390
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Mon Nov 3 13:25:06 2008 +1030

Add support for axes swapping.

New option: SwapAxes (boolean)
New property: EVDEV_PROP_SWAP_AXES.

Actual swapping code written by Donnie Berkholz.

Signed-off-by: Peter Hutterer [EMAIL PROTECTED]
(cherry picked from commit 4826969f23a0b298da2750c2e23a92b9d91819dd)

diff --git a/include/evdev-properties.h b/include/evdev-properties.h
index be4307b..31f6c66 100644
--- a/include/evdev-properties.h
+++ b/include/evdev-properties.h
@@ -62,4 +62,8 @@
 /* CARD32, 4 values [minx, maxx, miny, maxy], or no values for unset */
 #define 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Timo Aaltonen]

 config.h.in  |   66 ---
 configure.ac |2 -
 debian/changelog |7 +
 debian/rules |2 -
 src/evdev.c  |   12 +-
 5 files changed, 20 insertions(+), 69 deletions(-)

New commits:
commit dd74edd87a5f7925b2dc19b44b60c8f5aea68b5d
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Fri Sep 12 14:53:34 2008 +0300

Update changelog.

diff --git a/debian/changelog b/debian/changelog
index 3ae0e6d..9f56a3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-input-evdev (1:2.0.3-3) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.0.4-1) UNRELEASED; urgency=low
 
+  * New upstream release.
   * rules: Clean config.h.in.
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Fri, 12 Sep 2008 14:47:02 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED]  Fri, 12 Sep 2008 14:52:54 +0300
 
 xserver-xorg-input-evdev (1:2.0.3-2) experimental; urgency=low
 

commit caa7b61b9004573ca3825d0b26cc0808e53736fe
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Fri Sep 12 14:47:46 2008 +0300

rules: Clean config.h.in.

diff --git a/debian/changelog b/debian/changelog
index e13ac38..3ae0e6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.0.3-3) UNRELEASED; urgency=low
+
+  * rules: Clean config.h.in.
+
+ -- Timo Aaltonen [EMAIL PROTECTED]  Fri, 12 Sep 2008 14:47:02 +0300
+
 xserver-xorg-input-evdev (1:2.0.3-2) experimental; urgency=low
 
   * Build against xserver 1.5 rc6.
diff --git a/debian/rules b/debian/rules
index 9c3f84a..ff63d05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,7 +60,7 @@ clean: xsfclean
rm -rf obj-*
rm -f $$(find -name Makefile.in)
rm -f compile config.guess config.sub configure depcomp install-sh
-   rm -f ltmain.sh missing INSTALL aclocal.m4 ylwrap mkinstalldirs
+   rm -f ltmain.sh missing INSTALL aclocal.m4 ylwrap mkinstalldirs 
config.h.in
 
dh_clean
 

commit 47b9c64055852d56a06193e8e0e6bbccb755752b
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Fri Sep 12 14:43:56 2008 +0300

delete autogenerated config.h.in

diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index a6aea89..000
--- a/config.h.in
+++ /dev/null
@@ -1,66 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-#include xorg-server.h
-
-/* Define to 1 if you have the dlfcn.h header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the inttypes.h header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the memory.h header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the stdint.h header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the stdlib.h header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the strings.h header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the string.h header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the sys/stat.h header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the sys/types.h header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the unistd.h header file. */
-#undef HAVE_UNISTD_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Major version of this package */
-#undef PACKAGE_VERSION_MAJOR
-
-/* Minor version of this package */
-#undef PACKAGE_VERSION_MINOR
-
-/* Patch version of this package */
-#undef PACKAGE_VERSION_PATCHLEVEL
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION

commit ed1382866c54ffa34e3d0352ad65414650497f78
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Thu Aug 14 23:17:16 2008 +0930

evdev 2.0.4

diff --git a/configure.ac b/configure.ac
index 251c431..a04f694 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-evdev],
-2.0.3,
+2.0.4,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-evdev)
 

commit 8fe38b228702bddebe26a6d2c5c170a2a91d6ebc
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Thu Aug 7 09:21:26 2008 +0930

Print a warning if a keycode exceeds the range accepted by the server.

Keycodes over 255 are silently ignored in the server. The least we can do is
put a warning in the logs.

Signed-off-by: Peter Hutterer [EMAIL PROTECTED]
(cherry picked from commit c1f7f8c3d22ecae7839f82ea8b584069f54f1f5e)

diff --git a/src/evdev.c b/src/evdev.c
index 164346a..a857db3 100644
--- a/src/evdev.c
+++ 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 ChangeLog |   49 
 Makefile.in   |  685 -
 aclocal.m4| 8256 --
 compile   |  142 
 config.guess  | 1526 ---
 config.sub| 1658 ---
 configure |22716 --
 configure.ac  |2 
 debian/changelog  |   28 
 debian/control|2 
 debian/patches/series |2 
 debian/rules  |   27 
 depcomp   |  589 -
 install-sh|  519 -
 ltmain.sh | 6964 ---
 man/Makefile.in   |  425 
 missing   |  367 
 mkinstalldirs |  161 
 src/Makefile.in   |  517 -
 src/evdev.c   |   18 
 20 files changed, 103 insertions(+), 44550 deletions(-)

New commits:
commit b11cb42cedde6c116d642d9ca2a0304775f0fa37
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Aug 4 13:38:51 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 3f18092..e13ac38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-input-evdev (1:2.0.3-2) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.0.3-2) experimental; urgency=low
 
   * Build against xserver 1.5 rc6.
   * Run autoreconf at build time; build-depend on automake, libtool and
 xutils-dev.
   * Add support for parallel builds.
 
- -- Julien Cristau [EMAIL PROTECTED]  Fri, 18 Jul 2008 22:23:45 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Mon, 04 Aug 2008 13:38:46 +0200
 
 xserver-xorg-input-evdev (1:2.0.3-1) unstable; urgency=low
 

commit 2661189e98e2db0b80e2c96498a1b2d2d2ba2c73
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Aug 4 13:28:55 2008 +0200

Add support for parallel builds.

diff --git a/debian/changelog b/debian/changelog
index 3ccec6d..3f18092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-evdev (1:2.0.3-2) UNRELEASED; urgency=low
   * Build against xserver 1.5 rc6.
   * Run autoreconf at build time; build-depend on automake, libtool and
 xutils-dev.
+  * Add support for parallel builds.
 
  -- Julien Cristau [EMAIL PROTECTED]  Fri, 18 Jul 2008 22:23:45 +0200
 
diff --git a/debian/rules b/debian/rules
index b3f7845..9c3f84a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,14 @@
 include debian/xsfbs/xsfbs.mk
 
 CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
 else
CFLAGS += -O2
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-   INSTALL_PROGRAM += -s
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+   NUMJOBS = $(patsubst parallel=%,%,$(filter 
parallel=%,$(DEB_BUILD_OPTIONS)))
+   MAKEFLAGS += -j$(NUMJOBS)
 endif
 
 DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)

commit fb6e5d49c1ea0dfa712c32744be0bbc23da4c2fe
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Aug 4 13:34:01 2008 +0200

Run autoreconf at build time; build-depend on automake, libtool and 
xutils-dev.

diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 5d47b13..000
--- a/Makefile.in
+++ /dev/null
@@ -1,685 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
[EMAIL PROTECTED]@
-
-#  Copyright 2005 Adam Jackson.
-#
-#  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
-#  on the rights to use, copy, modify, merge, publish, distribute, sub
-#  license, 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
-#  ADAM JACKSON 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 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 .gitignore   |   26 ++
 ChangeLog|   43 +++
 Makefile.am  |   12 
 Makefile.in  |   40 +++-
 configure|   20 ++--
 configure.ac |2 +-
 debian/changelog |   11 +--
 src/evdev.c  |   22 --
 8 files changed, 144 insertions(+), 32 deletions(-)

New commits:
commit cbb612173b074e7dcf13f77498c9d9ea3a271cbb
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Jul 18 22:21:30 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 3dffb84..b7199e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-input-evdev (1:2.0.2-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.0.2-1) unstable; urgency=low
 
   * New upstream release
 + fixes mice with lots of buttons (Closes: #491061)
 
- -- Julien Cristau [EMAIL PROTECTED]  Fri, 18 Jul 2008 22:00:06 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Fri, 18 Jul 2008 22:21:17 +0200
 
 xserver-xorg-input-evdev (1:2.0.1-1) unstable; urgency=low
 

commit 164dc67a23e5197566a63a85b4e2d238cd5e3a0a
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Jul 18 22:15:09 2008 +0200

update changelog

diff --git a/debian/changelog b/debian/changelog
index 5ba992c..3dffb84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-evdev (1:2.0.2-1) UNRELEASED; urgency=low
+
+  * New upstream release
++ fixes mice with lots of buttons (Closes: #491061)
+
+ -- Julien Cristau [EMAIL PROTECTED]  Fri, 18 Jul 2008 22:00:06 +0200
+
 xserver-xorg-input-evdev (1:2.0.1-1) unstable; urgency=low
 
   [ Julien Cristau, Timo Aaltonen ]

commit 788172f9215fe10fdf80c4cafdd21a0a6680d3db
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Jul 18 22:00:00 2008 +0200

autoreconf

diff --git a/Makefile.in b/Makefile.in
index 3199d0a..5d47b13 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -218,6 +218,8 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src man
+EXTRA_DIST = ChangeLog autogen.sh
+MAINTAINERCLEANFILES = ChangeLog
 all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -457,6 +459,9 @@ distdir: $(DISTFILES)
  || exit 1; \
  fi; \
done
+   $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir=$(top_distdir) distdir=$(distdir) \
+ dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -589,6 +594,7 @@ distclean-generic:
 maintainer-clean-generic:
@echo This command is intended for maintainers to use
@echo it deletes files that may require special tools to rebuild.
+   -test -z $(MAINTAINERCLEANFILES) || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
@@ -653,19 +659,27 @@ uninstall-am:
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-   dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
-   distclean distclean-generic distclean-hdr distclean-libtool \
-   distclean-tags distcleancheck distdir distuninstallcheck dvi \
-   dvi-am html html-am info info-am install install-am \
-   install-data install-data-am install-dvi install-dvi-am \
-   install-exec install-exec-am install-html install-html-am \
-   install-info install-info-am install-man install-pdf \
-   install-pdf-am install-ps install-ps-am install-strip \
-   installcheck installcheck-am installdirs installdirs-am \
-   maintainer-clean maintainer-clean-generic mostlyclean \
-   mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-   tags tags-recursive uninstall uninstall-am
-
+   dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
+   distcheck distclean distclean-generic distclean-hdr \
+   distclean-libtool distclean-tags distcleancheck distdir \
+   distuninstallcheck dvi dvi-am html html-am info info-am \
+   install install-am install-data install-data-am install-dvi \
+   install-dvi-am install-exec install-exec-am install-html \
+   install-html-am install-info install-info-am install-man \
+   install-pdf install-pdf-am install-ps install-ps-am \
+   install-strip installcheck installcheck-am installdirs \
+   installdirs-am maintainer-clean maintainer-clean-generic \
+   mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+   ps ps-am tags tags-recursive uninstall uninstall-am
+
+
+.PHONY: ChangeLog
+
+ChangeLog:
+   (GIT_DIR=$(top_srcdir)/.git git-log  .changelog.tmp  mv 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 ChangeLog |  
165 
 configure |   
20 
 debian/changelog  |   
18 
 debian/control|
2 
 debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch |   
21 
 debian/patches/series |
1 
 debian/rules  |
4 
 debian/xsfbs/xsfbs-autoreconf.mk  |  
150 ---
 debian/xsfbs/xsfbs.mk |   
79 --
 debian/xsfbs/xsfbs.sh |  
387 +-
 src/Makefile.in   |
8 
 11 files changed, 437 insertions(+), 418 deletions(-)

New commits:
commit 633117c00ee7c57818e1194bb0fb788fe3a584e2
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Jul 14 02:20:26 2008 +0200

Build against xserver 1.5 rc5.

Disable the patch for now, xkbfile.h is missing from xserver-xorg-dev.

diff --git a/debian/changelog b/debian/changelog
index 5ba992c..993f07e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-evdev (1:2.0.1-2) experimental; urgency=low
+
+  * Build against xserver 1.5 rc5.
+  * Disable the patch for now, xkbfile.h is missing from xserver-xorg-dev.
+
+ -- Julien Cristau [EMAIL PROTECTED]  Mon, 14 Jul 2008 02:20:56 +0200
+
 xserver-xorg-input-evdev (1:2.0.1-1) unstable; urgency=low
 
   [ Julien Cristau, Timo Aaltonen ]
diff --git a/debian/control b/debian/control
index 757ea46..5e66802 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow [EMAIL PROTECTED], Drew Parsons [EMAIL 
PROTECTED], Julien Cristau [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5.0.0), pkg-config, quilt, xserver-xorg-dev (= 
2:1.4), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, 
x11proto-kb-dev, dpkg-dev (= 1.14.17)
+Build-Depends: debhelper (= 5.0.0), pkg-config, quilt, xserver-xorg-dev (= 
2:1.4.99.905), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, 
x11proto-kb-dev, dpkg-dev (= 1.14.17)
 Standards-Version: 3.7.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
diff --git a/debian/patches/series b/debian/patches/series
index 0bc726b..8241de9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
+#include-the-proper-header-for-XkbSetRulesDflts-and-X.patch

commit b809c20bec5be95db5f9278586ca0965b1b4d6a7
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Jul 13 15:37:15 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index aa4bd65..5ba992c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.0.1-1) unstable; urgency=low
 
   [ Julien Cristau, Timo Aaltonen ]
   * New upstream release.
@@ -14,7 +14,7 @@ xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
 dpkg-dev = 1.14.17.
   * Fix target dependencies in debian/rules.
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Tue, 01 Jul 2008 19:26:00 +0300
+ -- Julien Cristau [EMAIL PROTECTED]  Sun, 13 Jul 2008 15:37:13 +0200
 
 xserver-xorg-input-evdev (1:1.2.0-1) unstable; urgency=low
 

commit abce57373bd789036f1f960fbe68c36ba56d4126
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Jul 13 15:32:08 2008 +0200

fix attribution in changelog

diff --git a/debian/changelog b/debian/changelog
index 739e01c..aa4bd65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
 
+  [ Julien Cristau, Timo Aaltonen ]
+  * New upstream release.
+
   [ Julien Cristau ]
   * Drop the XS- prefix from Vcs-* control fields.
-  * New upstream release.
   * Drop evdev_no_flush_on_init.diff, obsolete.
   * New patch include-the-proper-header-for-XkbSetRulesDflts-and-X.patch, fix
 a 'missing declaration' compiler warning by including the right header.

commit 0a43b67e7dd432e891610590d409122ae3ef5992
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Jul 13 15:31:27 2008 +0200

Fix target dependencies in debian/rules.

diff --git a/debian/changelog b/debian/changelog
index 8dfa877..739e01c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
 /usr/bin/Xorg and other modules, and that's not a bug, so we want
 dpkg-shlibdeps to shut 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Timo Aaltonen]

 configure.ac |2 
 debian/changelog |5 
 man/evdev.man|   13 ++
 src/Makefile.am  |4 
 src/emuMB.c  |  334 +++
 src/evdev.c  |   67 ---
 src/evdev.h  |   81 +
 7 files changed, 464 insertions(+), 42 deletions(-)

New commits:
commit d03266926a5ac587ec6d93b3dd3805f62cced43f
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Tue Jul 1 19:27:40 2008 +0300

2.0.1

diff --git a/debian/changelog b/debian/changelog
index c27e9eb..68d3c54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xserver-xorg-input-evdev (1:1.99.2-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Drop the XS- prefix from Vcs-* control fields.
   * New upstream release candidate.
   * Drop evdev_no_flush_on_init.diff, obsolete.
@@ -10,7 +11,7 @@ xserver-xorg-input-evdev (1:1.99.2-1) UNRELEASED; urgency=low
 dpkg-shlibdeps to shut up about symbols it can't find.  Build-depend on
 dpkg-dev = 1.14.17.
 
- -- Julien Cristau [EMAIL PROTECTED]  Fri, 21 Mar 2008 22:04:25 +0100
+ -- Timo Aaltonen [EMAIL PROTECTED]  Tue, 01 Jul 2008 19:26:00 +0300
 
 xserver-xorg-input-evdev (1:1.2.0-1) unstable; urgency=low
 

commit b125b834f4ce4877204b9c8e98ad2641e2c7b082
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Sun Jun 22 17:52:58 2008 +0930

evdev 2.0.1

diff --git a/configure.ac b/configure.ac
index c7df2a2..f7db989 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-evdev],
-2.0.0,
+2.0.1,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-evdev)
 

commit 05b20db8dbfb47bc370fe24e50ef563f1879be61
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Sat Jun 21 16:42:12 2008 +0930

No need to finalize MB emulation after EvdevProbe anymore.

Follow-up to 76800bfa75807e49398380b902f6c0f547cd4c0e.
(cherry picked from commit 5a0ea39b79b27b7c3117661a21e7ab5eba3c9b24)

diff --git a/src/evdev.c b/src/evdev.c
index f029e8b..0078881 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1052,7 +1052,6 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
 /* parse the XKB options during kbd setup */
 
 if (EvdevProbe(pInfo)) {
-   EvdevMBEmuFinalize(pInfo);
close(pInfo-fd);
xf86DeleteInput(pInfo, 0);
 return NULL;

commit 43768d59da2c519dde5a8efaf0ff2b12b6c47fcc
Author: Simon Munton [EMAIL PROTECTED]
Date:   Sat Jun 21 10:19:07 2008 +0930

Close file descriptor if EvdevProbe fails.

Signed-off-by: Peter Hutterer [EMAIL PROTECTED]
(cherry picked from commit 373e13ae353d1e0022f8821adc528ebc5411d47d)

diff --git a/src/evdev.c b/src/evdev.c
index fa0545f..f029e8b 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1053,6 +1053,7 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
 
 if (EvdevProbe(pInfo)) {
EvdevMBEmuFinalize(pInfo);
+   close(pInfo-fd);
xf86DeleteInput(pInfo, 0);
 return NULL;
 }

commit 9c524f6963645bf42bbd41d4189d6319020a133d
Author: Keith Packard [EMAIL PROTECTED]
Date:   Fri Jun 20 18:20:55 2008 -0700

Enable middle button emulation at DEVICE_ON instead of DEVICE_INIT.

This ensures that the middle button emulation is re-enabled after VT switch,
otherwise the block handler that deals with the timeouts would not get
re-registered.

Signed-off-by: Keith Packard [EMAIL PROTECTED]
(cherry picked from commit 76800bfa75807e49398380b902f6c0f547cd4c0e)

diff --git a/src/evdev.c b/src/evdev.c
index 65b7185..fa0545f 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -835,6 +835,8 @@ EvdevProc(DeviceIntPtr device, int what)
 xf86Msg(X_WARNING, %s: Grab failed (%s)\n, pInfo-name,
 strerror(errno));
 xf86AddEnabledDevice(pInfo);
+   if (pEvdev-flags  EVDEV_BUTTON_EVENTS)
+   EvdevMBEmuPreInit(pInfo);
device-public.on = TRUE;
break;

@@ -941,7 +943,6 @@ EvdevProbe(InputInfoPtr pInfo)
 
 if (TestBit(BTN_LEFT, key_bitmask)) {
 xf86Msg(X_INFO, %s: Found mouse buttons\n, pInfo-name);
-   EvdevMBEmuPreInit(pInfo);
pEvdev-flags |= EVDEV_BUTTON_EVENTS;
has_buttons = TRUE;
 }

commit 04003a98a9ca1b4b0c32d319fab07ee7afc83c75
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Tue Jun 17 14:01:49 2008 +0930

evdev 2.0.0

diff --git a/configure.ac b/configure.ac
index f366c9c..c7df2a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-evdev],
-1.99.4,
+2.0.0,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-evdev)
 

commit 0443fb430f2481c1f0d0d83730a9145b5794f559
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Tue Jun 17 13:59:15 2008 +0930

Shut up compiler warning implicit declaration of function 'xf86Msg'

diff 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Timo Aaltonen]

 debian/changelog  |
2 
 debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch |   
26 --
 debian/patches/series |
1 
 3 files changed, 29 deletions(-)

New commits:
commit 1e99025632815c565dd24ca3328ff304cb763e50
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Tue Jul 1 20:11:31 2008 +0300

Remove the patch, not needed anymore.

diff --git a/debian/changelog b/debian/changelog
index 68d3c54..f5e3a07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,6 @@ xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
   * Drop the XS- prefix from Vcs-* control fields.
   * New upstream release candidate.
   * Drop evdev_no_flush_on_init.diff, obsolete.
-  * New patch include-the-proper-header-for-XkbSetRulesDflts-and-X.patch, fix
-a 'missing declaration' compiler warning by including the right header.
   * Run dpkg-shlibdeps with --warnings=6.  Drivers reference symbols from
 /usr/bin/Xorg and other modules, and that's not a bug, so we want
 dpkg-shlibdeps to shut up about symbols it can't find.  Build-depend on
diff --git 
a/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch 
b/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
deleted file mode 100644
index 8c80497..000
--- a/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9007585c1fce21e786372c2f1ca1c7776f3eafdb Mon Sep 17 00:00:00 2001
-From: Julien Cristau [EMAIL PROTECTED]
-Date: Thu, 22 May 2008 20:54:02 +0200
-Subject: [PATCH] include the proper header for XkbSetRulesDflts and 
XkbInitKeyboardDeviceStruct
-

- src/evdev.c |3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/src/evdev.c b/src/evdev.c
-index e212c14..18999f4 100644
 a/src/evdev.c
-+++ b/src/evdev.c
-@@ -45,8 +45,7 @@
- #include mipointer.h
- 
- #if defined(XKB)
--/* XXX VERY WRONG.  this is a client side header. */
--#include X11/extensions/XKBstr.h
-+#include xkbsrv.h
- #endif
- 
- #include xf86Module.h
--- 
-1.5.5.1
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0bc726b..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-include-the-proper-header-for-XkbSetRulesDflts-and-X.patch


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 .cvsignore|   
19 
 .gitignore|   
24 
 ChangeLog |  
337 ++
 Makefile.am   |   
11 
 Makefile.in   |   
40 
 aclocal.m4|  
265 +
 config.guess  |   
32 
 config.sub|   
44 
 configure |  
781 -
 configure.ac  |
5 
 debian/changelog  |   
36 
 debian/control|
8 
 debian/patches/evdev_man_illegal_char.patch   |   
12 
 debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch |   
26 
 debian/patches/series |
2 
 debian/rules  |
2 
 debian/xsfbs/xsfbs.mk |   
50 
 debian/xsfbs/xsfbs.sh |
7 
 depcomp   |   
33 
 install-sh|  
228 -
 ltmain.sh |   
58 
 man/.cvsignore|
2 
 man/.gitignore|
3 
 man/Makefile.in   |
6 
 man/evdev.man |  
291 --
 src/.cvsignore|
6 
 src/.gitignore|
6 
 src/Makefile.am   |
3 
 src/Makefile.in   |   
73 
 src/evdev.c   | 
1339 +++---
 src/evdev.h   |  
272 --
 src/evdev_axes.c  |  
930 --
 src/evdev_btn.c   |  
477 ---
 src/evdev_key.c   |  
549 
 34 files changed, 2443 insertions(+), 3534 deletions(-)

New commits:
commit 545d419ad811dae135a9a91dc1d6f0d83b7eca2a
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu May 22 22:37:57 2008 +0200

Run dpkg-shlibdeps with --warnings=6.

Drivers reference symbols from /usr/bin/Xorg and other modules,
and that's not a bug, so we want dpkg-shlibdeps to shut up about
symbols it can't find.
Build-depend on dpkg-dev = 1.14.17.

diff --git a/debian/changelog b/debian/changelog
index c13579e..c27e9eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ xserver-xorg-input-evdev (1:1.99.2-1) UNRELEASED; urgency=low
   * Drop evdev_no_flush_on_init.diff, obsolete.
   * New patch include-the-proper-header-for-XkbSetRulesDflts-and-X.patch, fix
 a 'missing declaration' compiler warning by including the right header.
+  * Run dpkg-shlibdeps with --warnings=6.  Drivers reference symbols from
+/usr/bin/Xorg and other modules, and that's not a bug, so we want
+dpkg-shlibdeps to shut up about symbols it can't find.  Build-depend on
+dpkg-dev = 1.14.17.
 
  -- Julien Cristau [EMAIL PROTECTED]  Fri, 21 Mar 2008 22:04:25 +0100
 
diff --git a/debian/control b/debian/control
index 84ea9bf..757ea46 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow [EMAIL PROTECTED], Drew Parsons [EMAIL 
PROTECTED], Julien Cristau [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5.0.0), pkg-config, quilt, xserver-xorg-dev (= 
2:1.4), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, 
x11proto-kb-dev
+Build-Depends: debhelper (= 5.0.0), pkg-config, quilt, xserver-xorg-dev (= 
2:1.4), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, 
x11proto-kb-dev, dpkg-dev (= 1.14.17)
 Standards-Version: 3.7.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
diff --git a/debian/rules b/debian/rules
index 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 debian/changelog |6 ++
 debian/control   |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit f401e824fa140ff0959c553d58dc5911fc7b3584
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Sep 10 16:30:59 2007 +0200

Build against xserver 1.4.

diff --git a/debian/changelog b/debian/changelog
index db89f9c..864030b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:1.2.0~git20070819-2) experimental; urgency=low
+
+  * Build against xserver 1.4.
+
+ -- Julien Cristau [EMAIL PROTECTED]  Mon, 10 Sep 2007 16:30:28 +0200
+
 xserver-xorg-input-evdev (1:1.2.0~git20070819-1) experimental; urgency=low
 
   * New git snapshot from upstream's master branch.
diff --git a/debian/control b/debian/control
index b71a44b..f29c283 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow [EMAIL PROTECTED], Drew Parsons [EMAIL 
PROTECTED], Julien Cristau [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5.0.0), pkg-config, quilt, xserver-xorg-dev (= 
2:1.3.99.0), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, 
x11proto-kb-dev
+Build-Depends: debhelper (= 5.0.0), pkg-config, quilt, xserver-xorg-dev (= 
2:1.4), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, 
x11proto-kb-dev
 Standards-Version: 3.7.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evdev
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.git


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 ChangeLog  |  381 
 Makefile.in|  131 ++---
 aclocal.m4 |  698 +++--
 config.guess   |   34 +
 config.h.in|9 
 config.sub |   36 +
 configure  | 1162 ++---
 configure.ac   |2 
 debian/changelog   |   34 +
 debian/control |   12 
 debian/copyright   |   52 +-
 debian/rules   |2 
 debian/xsfbs/xsfbs.mk  |7 
 depcomp|   64 ++
 install-sh |  348 +++---
 ltmain.sh  |  233 ++---
 man/Makefile.in|   92 ++-
 man/evdev.man  |   30 -
 missing|   61 +-
 mkinstalldirs  |5 
 src/Makefile.am|2 
 src/Makefile.in|  153 +++---
 src/evdev.c|  458 +++
 src/evdev.h|  241 --
 src/evdev_axes.c   |  810 +-
 src/evdev_brain.c  |  505 -
 src/evdev_btn.c|  326 +
 src/evdev_key.c|  221 ++---
 src/inotify-syscalls.h |   83 ---
 src/inotify.h  |   60 --
 30 files changed, 3718 insertions(+), 2534 deletions(-)

New commits:
commit a1a094ac886d1ce45803704a149eb1b6d0800c82
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Aug 19 17:22:44 2007 +0200

Prepare changelog for upload.

diff --git a/debian/changelog b/debian/changelog
index 0669380..db89f9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,15 @@
-xserver-xorg-input-evdev (1:1.2.0~git20070819-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:1.2.0~git20070819-1) experimental; urgency=low
 
   * New git snapshot from upstream's master branch.
 + manpage typos fixed (closes: #432063).  Thanks, A. Costa!
+  * Build against xserver 1.3.99.0.
   * Update debian/copyright.
   * Generate the Provides field automatically.
   * Add myself to uploaders, and remove Branden with his permission.
   * Drop build-dep on linux-kernel-headers, which is provided by
 build-essential.
 
- -- Julien Cristau [EMAIL PROTECTED]  Sun, 19 Aug 2007 17:20:29 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Sun, 19 Aug 2007 17:22:09 +0200
 
 xserver-xorg-input-evdev (1:1.1.5-3) unstable; urgency=low
 

commit d020d9ec950b618f39d0a13115c9411c5dd9eee4
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Aug 19 17:21:53 2007 +0200

Drop build-dep on linux-kernel-headers.

This functionality is provided by build-essential (via linux-libc-dev).

diff --git a/debian/changelog b/debian/changelog
index 66efabf..0669380 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ xserver-xorg-input-evdev (1:1.2.0~git20070819-1) UNRELEASED; 
urgency=low
   * Update debian/copyright.
   * Generate the Provides field automatically.
   * Add myself to uploaders, and remove Branden with his permission.
+  * Drop build-dep on linux-kernel-headers, which is provided by
+build-essential.
 
- -- Julien Cristau [EMAIL PROTECTED]  Sun, 19 Aug 2007 17:19:50 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Sun, 19 Aug 2007 17:20:29 +0200
 
 xserver-xorg-input-evdev (1:1.1.5-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e8feab0..b71a44b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow [EMAIL PROTECTED], Drew Parsons [EMAIL 
PROTECTED], Julien Cristau [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5.0.0), pkg-config, quilt, xserver-xorg-dev (= 
2:1.3.99.0), linux-kernel-headers, x11proto-core-dev, x11proto-randr-dev, 
x11proto-input-dev, x11proto-kb-dev
+Build-Depends: debhelper (= 5.0.0), pkg-config, quilt, xserver-xorg-dev (= 
2:1.3.99.0), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, 
x11proto-kb-dev
 Standards-Version: 3.7.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evdev
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.git

commit 0e21ab82155a85dd5113ea1576368d0cda7a29d1
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Aug 19 17:20:12 2007 +0200

Add myself to uploaders, and remove Branden with his permission

diff --git a/debian/changelog b/debian/changelog
index 45ab2f4..66efabf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ xserver-xorg-input-evdev (1:1.2.0~git20070819-1) UNRELEASED; 
urgency=low
 + manpage typos fixed (closes: #432063).  Thanks, A. Costa!
   * Update debian/copyright.
   * Generate the Provides field automatically.
+  * Add myself to uploaders, and remove Branden with his permission.
 
- -- Julien Cristau [EMAIL PROTECTED]  Sun, 19 Aug 2007 17:15:25 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Sun, 19 Aug 2007 17:19:50 +0200
 
 xserver-xorg-input-evdev (1:1.1.5-3) unstable; urgency=low
 
diff --git 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Drew Parsons]

 debian/changelog  |5 +++--
 debian/xsfbs/xsfbs.mk |   21 +
 2 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit 21eda3620eefafc823eeeab352097d8a78df036c
Author: Drew Parsons [EMAIL PROTECTED]
Date:   Mon Mar 19 19:52:40 2007 +1100

Upload new version to experimental.

diff --git a/debian/changelog b/debian/changelog
index ac5c71a..0ad2377 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xserver-xorg-input-evdev (1:1.1.5-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:1.1.5-1) experimental; urgency=low
 
+  [ Julien Cristau ]
   * Add link to xserver-xorg-core bug script, so that bugreports contain
 the user's config and log files.
   * Bump dependency on xserver-xorg-core to = 2:1.1.1-11, as previous
@@ -10,7 +11,7 @@ xserver-xorg-input-evdev (1:1.1.5-1) UNRELEASED; urgency=low
   * Make debian/rules clean depend on xsfclean, to make sure that patches are
 unapplied and everything is cleaned up.
 
- -- Julien Cristau [EMAIL PROTECTED]  Thu,  1 Feb 2007 01:58:12 +0100
+ -- Drew Parsons [EMAIL PROTECTED]  Mon, 19 Mar 2007 19:36:42 +1100
 
 xserver-xorg-input-evdev (1:1.1.2-6) unstable; urgency=low
 

commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Mar 2 20:28:15 2007 +0100

Fix copy/paste typo in the input driver provides.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 0343aec..d88c6db 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -359,7 +359,7 @@ VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 
2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)
 SERVER_DEPENDS = xserver-xorg-core (= $(SERVERMINVERS))
 VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI)
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }'  debian/control)
 endif

commit 4a943db2564c4f573ce2f5f676a841267e961f16
Author: David Nusinow [EMAIL PROTECTED]
Date:   Thu Mar 1 22:06:04 2007 -0500

Fix one missed bit from the serverabiver - serverminver rename

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index cfc5496..0343aec 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -366,7 +366,7 @@ endif
 
 .PHONY: serverabi
 serverabi:
-ifeq ($(SERVERABI),)
+ifeq ($(SERVERMINVERS),)
@echo error: xserver-xorg-dev needs to be installed
@exit 1
 else

commit 1344bb9deda5ba54215d0ec5b164706999236b0b
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Feb 28 23:08:17 2007 -0500

Fix typo that prevented the input abi versioning from working.
Good catch Julien

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5e8cf41..cfc5496 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -356,7 +356,7 @@ debian/shlibs.local:
 
 SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2/dev/null)
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
-INPUTABI = $(shell cat /usr/share/xserver-xorg/driverabiver 2/dev/null)
+INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)
 SERVER_DEPENDS = xserver-xorg-core (= $(SERVERMINVERS))
 VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
 INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI)

commit a0c9602f38e9d47d7a76b7b345e7e8bbb29b752f
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue Feb 27 21:50:20 2007 -0500

Add support for X server input ABI versioning

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d54ffd3..5e8cf41 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -355,9 +355,11 @@ debian/shlibs.local:
cat debian/*.shlibs $@
 
 SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2/dev/null)
-SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2/dev/null)
+VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
+INPUTABI = $(shell cat /usr/share/xserver-xorg/driverabiver 2/dev/null)
 SERVER_DEPENDS = xserver-xorg-core (= $(SERVERMINVERS))
-DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
+INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI)
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }'  debian/control)
 endif
@@ -369,7 +371,8 @@ ifeq ($(SERVERABI),)
@exit 1
 else
echo xserver:Depends=$(SERVER_DEPENDS)  debian/$(PACKAGE).substvars
-   echo xviddriver:Provides=$(DRIVER_PROVIDES)  
debian/$(PACKAGE).substvars
+   echo xviddriver:Provides=$(VIDDRIVER_PROVIDES)  
debian/$(PACKAGE).substvars
+   echo xinpdriver:Provides=$(INPDRIVER_PROVIDES)  
debian/$(PACKAGE).substvars
 endif
 
 include debian/xsfbs/xsfbs-autoreconf.mk

commit 00fc799ec3107c0c29286b75e780bef82c1fa137
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Feb 21 22:47:30 2007 -0500

Fix 

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 debian/changelog |6 ++
 debian/control   |4 ++--
 debian/rules |2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 83ac5187d679bf56a6434aa7bbf555b3725373b3
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Feb 18 18:22:24 2007 +0100

Generate the dependency on xserver-xorg-core automatically.

diff --git a/debian/changelog b/debian/changelog
index 0ad2377..bc84979 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:1.1.5-2) UNRELEASED; urgency=low
+
+  * Generate the dependency on xserver-xorg-core automatically.
+
+ -- Julien Cristau [EMAIL PROTECTED]  Mon, 19 Mar 2007 19:20:04 +0100
+
 xserver-xorg-input-evdev (1:1.1.5-1) experimental; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/control b/debian/control
index f25a431..0a9adb5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL 
PROTECTED], Fabio M. Di Nitto [EMAIL PROTECTED], Drew Parsons [EMAIL 
PROTECTED]
-Build-Depends: debhelper (= 5.0.0), pkg-config, quilt, xserver-xorg-dev, 
linux-kernel-headers, x11proto-core-dev, x11proto-randr-dev, 
x11proto-input-dev, x11proto-kb-dev
+Build-Depends: debhelper (= 5.0.0), pkg-config, quilt, xserver-xorg-dev (= 
2:1.2.0-3), linux-kernel-headers, x11proto-core-dev, x11proto-randr-dev, 
x11proto-input-dev, x11proto-kb-dev
 Standards-Version: 3.7.2
 
 Package: xserver-xorg-input-evdev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (= 2:1.1.1-11)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
 Provides: xserver-xorg-input
 Replaces: xserver-xorg ( 6.8.2-35)
 Description: X.Org X server -- evdev input driver
diff --git a/debian/rules b/debian/rules
index 50d8598..bbf772d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,7 @@ install: build
cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build install serverabi
dh_testdir
dh_testroot
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Re: xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Drew Parsons]

 +xserver-xorg-input-evdev (1:1.1.5-2) UNRELEASED; urgency=low
 +
 +  * Generate the dependency on xserver-xorg-core automatically.
 +
 + -- Julien Cristau [EMAIL PROTECTED]  Mon, 19 Mar 2007 19:20:04 +0100
 +

Heh I had a feeling we had a better way of managing it :)

Drew


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

New branch 'debian-experimental' available with the following commits:
commit 40dc5fef91ae4df96c05063e8f2207d72fb34632
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Feb 1 01:43:06 2007 +0100

Add patch to replace ø with \(/o in the evdev(4) manpage.

commit 24b8e714dbde9c3e920c626ed39f841a5193d32d
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Feb 1 01:32:17 2007 +0100

Drop all patches, they are applied upstream.

commit 14643413c8d5aba4588575ffd1d267168ae4532d
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Feb 1 01:23:47 2007 +0100

Add copy of xsfbs.

commit 9eb14571aa9d6be6094cb330777f1014bf3abe44
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Feb 1 01:21:30 2007 +0100

autoreconf

commit fd16e679f670b08dfb36d4063b79e52836351578
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Feb 1 01:10:42 2007 +0100

Add upstream ChangeLog

commit 03813d5bb57d2e394bc960cff48d011fbc7a62be
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Feb 1 01:08:47 2007 +0100

New upstream release (xf86-input-evdev 1.1.5).

commit dcea322f6e160fa1a17f538a63fdbb930226e6f2
Merge: 61b5c875e232c88ddea6c98edb222a2445b4c45b 
e1fe72e7fe663a479a5be1b5e16ecbba52f511a8
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Feb 1 01:06:21 2007 +0100

Merge branch 'upstream-experimental' into debian-experimental

commit 61b5c875e232c88ddea6c98edb222a2445b4c45b
Merge: c3a2b392b6c42546dff63d667f1f3bb6c8a0a558 
eca922bd95fbcf09dd0839e571dc30263c94172f
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Feb 1 01:05:15 2007 +0100

Merge branch 'upstream-experimental' into debian-experimental

Conflicts:

man/Makefile.am


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 debian/changelog |4 +++-
 debian/rules |2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 3c769e4087e4fb834a26393385d85cd0c0d55064
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Feb 1 02:00:20 2007 +0100

debian/rules clean needs to depend on xsfclean.
This makes sure that the quilt stuff is properly cleaned up.

diff --git a/debian/changelog b/debian/changelog
index 5cbabb1..ac5c71a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ xserver-xorg-input-evdev (1:1.1.5-1) UNR
   * New upstream release.
 + Drop all patches, applied upstream.
   * New patch to replace ø with \(/o in the evdev(4) manpage.
+  * Make debian/rules clean depend on xsfclean, to make sure that patches are
+unapplied and everything is cleaned up.
 
- -- Julien Cristau [EMAIL PROTECTED]  Thu,  1 Feb 2007 01:41:45 +0100
+ -- Julien Cristau [EMAIL PROTECTED]  Thu,  1 Feb 2007 01:58:12 +0100
 
 xserver-xorg-input-evdev (1:1.1.2-6) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 462e1f3..50d8598 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,7 @@ build-stamp:
 
touch build-stamp
 
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]