[PULL] xorg.conf.d additional match options

[Peter Hutterer]

Keith, 

please pull the set of input fixes below from my repo.
Dan's patches add a few new matches for the InputClass matching system,
essentially bringing it up to what the HAL system used to support.

The Xi fix for 25480 is a rather important one, I'm pretty sure that's the
cause for many of the stuck modifier bugs we've been seeing.

The following changes since commit 8e97e5f9425639ad0a084150d0b232cad417595d:
  Keith Packard (1):
        If XTest is always required, then eliminate the XTest devPrivate

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver.git for-keith

Dan Nicholson (11):
      config/hal: don't leak the input.tags property
      config/udev: Add verbose info when fetching udev properties
      config/hal: Missing newline in log message
      xfree86: Constify InputClass functions
      xfree86: Refactor InputClass matching code
      xfree86: Add MatchOS InputClass entry for operating system matching
      xfree86: Match devices based on PnP ID
      xfree86: Match devices based on USB ID
      config: Script to convert HAL fdi settings to InputClass sections
      xfree86: Allow multiple InputClass Match* entries for && matching
      xfree86: Match devices based on current driver setting

Peter Hutterer (2):
      config: remove redundant DBUS API define, require dbus-1 >= 1.0
      Xi: don't copy the modifier key count when copying device classes (#25480)

 Xi/exevents.c                        |    4 -
 config/Makefile.am                   |    2 +-
 config/dbus.c                        |    1 -
 config/fdi2iclass.py                 |  202 +++++++++++++++++++++++++++++++
 config/hal.c                         |   32 +++++-
 config/udev.c                        |   62 +++++++++-
 configure.ac                         |    5 +-
 dix/inpututils.c                     |    6 +
 hw/xfree86/common/xf86Xinput.c       |  222 +++++++++++++++++++++++-----------
 hw/xfree86/doc/man/xorg.conf.man.pre |   71 +++++++++--
 hw/xfree86/parser/InputClass.c       |  191 +++++++++++++++++++++++------
 hw/xfree86/parser/xf86Parser.h       |   20 +++-
 hw/xfree86/parser/xf86tokens.h       |    4 +
 include/dix-config.h.in              |    3 +
 include/input.h                      |    2 +
 test/input.c                         |   24 ++++
 16 files changed, 713 insertions(+), 138 deletions(-)
 create mode 100755 config/fdi2iclass.py