[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

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



 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 <jcristau@debian.org>
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 <tepsipakki@ubuntu.com>  Fri, 12 Sep 2008 14:52:54 +0300
+ -- Julien Cristau <jcristau@debian.org>  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 <jcristau@debian.org>
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 <tepsipakki@ubuntu.com>  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 <jcristau@debian.org>
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 <tepsipakki@ubuntu.com>  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 0000000..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="string">evdev</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="string">evdev</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


Reply to: