xserver-xorg-input-joystick: Changes to 'debian-experimental'
debian/changelog | 8 ++++++++
debian/control | 19 ++++++++++++++++++-
debian/local/66-xorg-joystick.rules | 8 ++++++++
debian/rules | 2 ++
debian/xserver-xorg-input-joystick-dev.install | 2 ++
debian/xserver-xorg-input-joystick.postinst.in | 23 +++++++++++++++++++++++
6 files changed, 61 insertions(+), 1 deletion(-)
New commits:
commit 394fdd2a27cbda9cf1df707d3e44a4fe1a111f76
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Dec 8 16:43:39 2009 +0200
Add xserver-xorg-input-joystick-dev for the header and .pc files.
diff --git a/debian/changelog b/debian/changelog
index a4119ef..2e69904 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-joystick (1:1.5.0-2) UNRELEASED; urgency=low
* Install a udev rules file to autoload the driver.
* Run udevadm trigger on postinst, and depend on udev [linux-any].
+ * Add xserver-xorg-input-joystick-dev for the header and .pc files.
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 08 Dec 2009 16:32:07 +0200
diff --git a/debian/control b/debian/control
index f987c80..6ba8288 100644
--- a/debian/control
+++ b/debian/control
@@ -36,3 +36,19 @@ Description: X.Org X server -- joystick input driver
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
.
This package is built from the X.org xf86-input-joystick driver module.
+
+Package: xserver-xorg-input-joystick
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: X.Org X server -- joystick input driver (development headers)
+ This package provides the development headers for the joystick input
+ driver found in xserver-xorg-input-joystick. Non-developers likely have
+ little use for this package.
+ .
+ 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-joystick driver module.
diff --git a/debian/xserver-xorg-input-joystick-dev.install b/debian/xserver-xorg-input-joystick-dev.install
new file mode 100644
index 0000000..605b936
--- /dev/null
+++ b/debian/xserver-xorg-input-joystick-dev.install
@@ -0,0 +1,2 @@
+usr/include/xorg/*
+usr/lib/pkgconfig/xorg-joystick.pc
commit 98586eac671d77e94cc2419fe1e1dce515c0b44c
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Dec 8 16:38:48 2009 +0200
Run udevadm trigger on postinst, and depend on udev [linux-any].
diff --git a/debian/changelog b/debian/changelog
index 23df76b..a4119ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-input-joystick (1:1.5.0-2) UNRELEASED; urgency=low
* Install a udev rules file to autoload the driver.
+ * Run udevadm trigger on postinst, and depend on udev [linux-any].
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 08 Dec 2009 16:32:07 +0200
diff --git a/debian/control b/debian/control
index b6d8529..f987c80 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-joystic
Package: xserver-xorg-input-joystick
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends},
+ udev [linux-any],
Provides: ${xinpdriver:Provides}
Replaces: xserver-xorg (<< 6.8.2-35)
Description: X.Org X server -- joystick input driver
diff --git a/debian/xserver-xorg-input-joystick.postinst.in b/debian/xserver-xorg-input-joystick.postinst.in
new file mode 100644
index 0000000..b4c84c0
--- /dev/null
+++ b/debian/xserver-xorg-input-joystick.postinst.in
@@ -0,0 +1,23 @@
+#!/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 dccb9d5fd6e9b57851b5a92ca48ecdc42efeae55
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Dec 8 16:34:53 2009 +0200
Install a udev rules file to autoload the driver.
diff --git a/debian/changelog b/debian/changelog
index 190bb9d..23df76b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-joystick (1:1.5.0-2) UNRELEASED; urgency=low
+
+ * Install a udev rules file to autoload the driver.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 08 Dec 2009 16:32:07 +0200
+
xserver-xorg-input-joystick (1:1.5.0-1) experimental; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/local/66-xorg-joystick.rules b/debian/local/66-xorg-joystick.rules
new file mode 100644
index 0000000..4b31ec0
--- /dev/null
+++ b/debian/local/66-xorg-joystick.rules
@@ -0,0 +1,8 @@
+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 d4b208a..532d383 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,6 +77,8 @@ 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
+ dh_install -d debian/xserver-xorg-input-joystick/lib/udev/rules.d
+ dh_install -m 644 debian/local/66-xorg-joystick.rules debian/xserver-xorg-input-joystick/lib/udev/rules.d
dh_installman
dh_link
dh_strip
Reply to: