debian/changelog | 7 +++++++
debian/local/10-joystick.conf | 6 ++++++
debian/local/66-xorg-joystick.rules | 8 --------
debian/rules | 4 ++--
debian/xserver-xorg-input-joystick.postinst.in | 23 -----------------------
5 files changed, 15 insertions(+), 33 deletions(-)
New commits:
commit e1e68dc4ed6e672a90994f3dc871c8d0117010ee
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Mar 30 16:49:22 2010 +0300
Don't install the udev rule anymore.
diff --git a/debian/changelog b/debian/changelog
index 3751eb4..923de50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-input-joystick (1:1.5.0-3) UNRELEASED; urgency=low
* Install 10-joystick.conf.
+ * Don't install the udev rule anymore.
-- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 26 Mar 2010 10:58:22 +0200
diff --git a/debian/local/66-xorg-joystick.rules
b/debian/local/66-xorg-joystick.rules
deleted file mode 100644
index 4b31ec0..0000000
--- a/debian/local/66-xorg-joystick.rules
+++ /dev/null
@@ -1,8 +0,0 @@
-ACTION!="add|change", GOTO="xorg_joystick_end"
-KERNEL!="event*", GOTO="xorg_joystick_end"
-
-ENV{ID_INPUT_JOYSTICK}!="1", GOTO="xorg_joystick_end"
-
-ENV{x11_driver}="joystick"
-
-LABEL="xorg_joystick_end"
diff --git a/debian/rules b/debian/rules
index 57c6059..ddb12a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,8 +78,6 @@ binary-arch: build install serverabi
dh_installdocs
dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing
--exclude=joystick_drv.la --exclude=usr/share/man/man4
- install -d debian/xserver-xorg-input-joystick/lib/udev/rules.d
- install -m 644 debian/local/66-xorg-joystick.rules
debian/xserver-xorg-input-joystick/lib/udev/rules.d
install -d debian/xserver-xorg-input-joystick/usr/lib/X11/xorg.conf.d
install -m 644 debian/local/10-joystick.conf
debian/xserver-xorg-input-joystick/usr/lib/X11/xorg.conf.d
dh_installman
diff --git a/debian/xserver-xorg-input-joystick.postinst.in
b/debian/xserver-xorg-input-joystick.postinst.in
deleted file mode 100644
index b4c84c0..0000000
--- a/debian/xserver-xorg-input-joystick.postinst.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -e
-
-THIS_PACKAGE=xserver-xorg-input-joystick
-THIS_SCRIPT=postinst
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- configure)
- if dpkg --compare-versions "$2" lt "1:1.5.0-2"; then
- if [ `uname -s` = "Linux" ]; then
- udevadm trigger --subsystem-match=input --action=change
- fi
- fi
-esac
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sw=2 ts=2 tw=80:
commit 185028aaa711520968cdf2ebb25274dbb6a862f1
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Mar 30 16:46:20 2010 +0300
Fix the changelog.
diff --git a/debian/changelog b/debian/changelog
index a548d6c..3751eb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-joystick (1:1.5.0-2.1) UNRELEASED; urgency=low
+xserver-xorg-input-joystick (1:1.5.0-3) UNRELEASED; urgency=low
* Install 10-joystick.conf.
commit f251830b1cb87b8ac0bc74eb83bdd0b2a997ca21
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Fri Mar 26 11:01:40 2010 +0200
Install 10-joystick.conf.
diff --git a/debian/changelog b/debian/changelog
index 5909277..a548d6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-joystick (1:1.5.0-2.1) UNRELEASED; urgency=low
+
+ * Install 10-joystick.conf.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 26 Mar 2010 10:58:22 +0200
+
xserver-xorg-input-joystick (1:1.5.0-2) unstable; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/local/10-joystick.conf b/debian/local/10-joystick.conf
new file mode 100644
index 0000000..95a295a
--- /dev/null
+++ b/debian/local/10-joystick.conf
@@ -0,0 +1,6 @@
+Section "InputClass"
+ Identifier "joystick catchall"
+ MatchIsJoystick "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "joystick"
+EndSection
diff --git a/debian/rules b/debian/rules
index 206bada..57c6059 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,6 +80,8 @@ binary-arch: build install serverabi
dh_install --sourcedir=debian/tmp --list-missing
--exclude=joystick_drv.la --exclude=usr/share/man/man4
install -d debian/xserver-xorg-input-joystick/lib/udev/rules.d
install -m 644 debian/local/66-xorg-joystick.rules
debian/xserver-xorg-input-joystick/lib/udev/rules.d
+ install -d debian/xserver-xorg-input-joystick/usr/lib/X11/xorg.conf.d
+ install -m 644 debian/local/10-joystick.conf
debian/xserver-xorg-input-joystick/usr/lib/X11/xorg.conf.d
dh_installman
dh_link
dh_strip
--
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/e1nwbov-0006ol...@alioth.debian.org
