debian/changelog | 34 +++++++++++++++++++++++
debian/control | 17 +++++++++--
debian/local/05-evdev.conf | 39 +++++++++++++++++++++++++++
debian/local/65-xorg-evdev.rules | 14 ---------
debian/rules | 35 +++++++++++++++++-------
debian/xserver-xorg-input-evdev-udeb.install | 1
debian/xserver-xorg-input-evdev.postinst.in | 21 --------------
7 files changed, 112 insertions(+), 49 deletions(-)
New commits:
commit f07a86ab7964a9bb65f7491cbaea43558e258aea
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Mar 30 23:42:16 2010 +0300
Release 1:2.3.2-5ubuntu1
diff --git a/debian/changelog b/debian/changelog
index 5f8f5cc..1a1505e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-input-evdev (1:2.3.2-5ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.3.2-5ubuntu1) lucid; urgency=low
* Merge from Debian unstable. (LP: #546933)
* control, rules: Don't build the udeb.
- -- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 30 Mar 2010 19:20:42 +0300
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 30 Mar 2010 23:41:56 +0300
xserver-xorg-input-evdev (1:2.3.2-5) unstable; urgency=low
commit 98d6cf9dbcaf83b55ac291af67b7ad76b5fbdd06
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Mar 30 23:41:53 2010 +0300
control, rules: Don't build the udeb.
diff --git a/debian/changelog b/debian/changelog
index 795bb82..5f8f5cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-input-evdev (1:2.3.2-5ubuntu1) UNRELEASED; urgency=low
* Merge from Debian unstable. (LP: #546933)
+ * control, rules: Don't build the udeb.
-- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 30 Mar 2010 19:20:42 +0300
diff --git a/debian/control b/debian/control
index a8677c7..229d0bc 100644
--- a/debian/control
+++ b/debian/control
@@ -39,15 +39,15 @@ Description: X.Org X server -- evdev input driver
.
This package is built from the X.org xf86-input-evdev driver module.
-Package: xserver-xorg-input-evdev-udeb
-XC-Package-Type: udeb
-Section: debian-installer
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends},
- udev-udeb [linux-any],
-Provides: ${xinpdriver:Provides}
-Description: X.Org X server -- evdev input driver
- This is a udeb, or a microdeb, for the debian-installer.
+#Package: xserver-xorg-input-evdev-udeb
+#XC-Package-Type: udeb
+#Section: debian-installer
+#Architecture: any
+#Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends},
+# udev-udeb [linux-any],
+#Provides: ${xinpdriver:Provides}
+#Description: X.Org X server -- evdev input driver
+# This is a udeb, or a microdeb, for the debian-installer.
Package: xserver-xorg-input-evdev-dev
Section: libdevel
diff --git a/debian/rules b/debian/rules
index 0acce07..175eaad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,8 +83,6 @@ binary-arch: build install serverabi
dh_install --sourcedir=debian/tmp --list-missing --exclude=evdev_drv.la
--exclude=usr/share/man/man4
install -d debian/xserver-xorg-input-evdev/usr/lib/X11/xorg.conf.d
install -m 644 debian/local/05-evdev.conf
debian/xserver-xorg-input-evdev/usr/lib/X11/xorg.conf.d
- install -d debian/xserver-xorg-input-evdev-udeb/usr/lib/X11/xorg.conf.d
- install -m 644 debian/local/05-evdev.conf
debian/xserver-xorg-input-evdev-udeb/usr/lib/X11/xorg.conf.d
dh_installman
dh_link
dh_strip
commit d0234f89cf8dbe0973c9165c69b9977b5b950ff9
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Mar 30 21:41:39 2010 +0300
Release to unstable.
diff --git a/debian/changelog b/debian/changelog
index 30c4e85..b2202dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-input-evdev (1:2.3.2-5) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.3.2-5) unstable; urgency=low
* Install 05-evdev.conf in /usr/lib/X11/xorg.conf.d.
* Remove 65-xorg-evdev.rules, obsoleted by the above.
* Drop the postinst, and don't depend on udev.
- -- Timo Aaltonen <tjaal...@ubuntu.com> Sun, 21 Mar 2010 20:51:38 +0200
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 30 Mar 2010 21:40:54 +0300
xserver-xorg-input-evdev (1:2.3.2-4) unstable; urgency=low
commit b09b95b624c6dc34f3df11c1d9127fc4590b619e
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Mar 30 19:21:15 2010 +0300
Update the changelog.
diff --git a/debian/changelog b/debian/changelog
index 930571e..db67f81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.3.2-5ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from Debian unstable. (LP: #546933)
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 30 Mar 2010 19:20:42 +0300
+
xserver-xorg-input-evdev (1:2.3.2-5) UNRELEASED; urgency=low
* Install 05-evdev.conf in /usr/lib/X11/xorg.conf.d.
commit cd5f45bca92f0ebf7611996857ecf78c8de82cde
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Mar 30 17:42:14 2010 +0300
Drop the postinst, and don't depend on udev.
diff --git a/debian/changelog b/debian/changelog
index 9e5a411..30c4e85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-evdev (1:2.3.2-5) UNRELEASED; urgency=low
* Install 05-evdev.conf in /usr/lib/X11/xorg.conf.d.
* Remove 65-xorg-evdev.rules, obsoleted by the above.
+ * Drop the postinst, and don't depend on udev.
-- Timo Aaltonen <tjaal...@ubuntu.com> Sun, 21 Mar 2010 20:51:38 +0200
diff --git a/debian/control b/debian/control
index 3953e61..bee2453 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,6 @@ 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},
- udev [linux-any],
Provides: ${xinpdriver:Provides}
Replaces: xserver-xorg (<< 6.8.2-35)
Description: X.Org X server -- evdev input driver
diff --git a/debian/xserver-xorg-input-evdev.postinst.in
b/debian/xserver-xorg-input-evdev.postinst.in
deleted file mode 100644
index 014c92b..0000000
--- a/debian/xserver-xorg-input-evdev.postinst.in
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-set -e
-
-THIS_PACKAGE=xserver-xorg-input-evdev
-THIS_SCRIPT=postinst
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- configure)
- if dpkg --compare-versions "$2" lt 1:2.3.2-3; then
- udevadm trigger --subsystem-match=input --action=change
- fi
-esac
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sw=2 ts=2 tw=80:
commit 301d89eda34c6b1c91ae854e50870dd2c7cdae93
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Mar 30 17:30:28 2010 +0300
Use tabs in 05-evdev.conf
diff --git a/debian/local/05-evdev.conf b/debian/local/05-evdev.conf
index 877aa4a..0eb9e47 100644
--- a/debian/local/05-evdev.conf
+++ b/debian/local/05-evdev.conf
@@ -4,36 +4,36 @@
# matches everything but joysticks.
Section "InputClass"
- Identifier "evdev pointer catchall"
- MatchIsPointer "on"
- MatchDevicePath "/dev/input/event*"
- Driver "evdev"
+ Identifier "evdev pointer catchall"
+ MatchIsPointer "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "evdev"
EndSection
Section "InputClass"
- Identifier "evdev keyboard catchall"
- MatchIsKeyboard "on"
- MatchDevicePath "/dev/input/event*"
- Driver "evdev"
+ Identifier "evdev keyboard catchall"
+ MatchIsKeyboard "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "evdev"
EndSection
Section "InputClass"
- Identifier "evdev touchpad catchall"
- MatchIsTouchpad "on"
- MatchDevicePath "/dev/input/event*"
- Driver "evdev"
+ Identifier "evdev touchpad catchall"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "evdev"
EndSection
Section "InputClass"
- Identifier "evdev tablet catchall"
- MatchIsTablet "on"
- MatchDevicePath "/dev/input/event*"
- Driver "evdev"
+ Identifier "evdev tablet catchall"
+ MatchIsTablet "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "evdev"
EndSection
Section "InputClass"
- Identifier "evdev touchscreen catchall"
- MatchIsTouchscreen "on"
- MatchDevicePath "/dev/input/event*"
- Driver "evdev"
+ Identifier "evdev touchscreen catchall"
+ MatchIsTouchscreen "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "evdev"
EndSection
commit ce5cdb99182409cdca4a7c742d4967fcdafd97fb
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Mar 30 15:08:10 2010 +0300
Remove 65-xorg-evdev.rules, obsoleted by the above.
diff --git a/debian/changelog b/debian/changelog
index 4921e60..9e5a411 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,7 @@
xserver-xorg-input-evdev (1:2.3.2-5) UNRELEASED; urgency=low
- * 65-xorg-evdev.rules: Check for ID_INPUT_TABLET too, and set x11_driver
- if found.
* Install 05-evdev.conf in /usr/lib/X11/xorg.conf.d.
+ * Remove 65-xorg-evdev.rules, obsoleted by the above.
-- Timo Aaltonen <tjaal...@ubuntu.com> Sun, 21 Mar 2010 20:51:38 +0200
diff --git a/debian/local/65-xorg-evdev.rules b/debian/local/65-xorg-evdev.rules
deleted file mode 100644
index 8d9b84a..0000000
--- a/debian/local/65-xorg-evdev.rules
+++ /dev/null
@@ -1,14 +0,0 @@
-ACTION!="add|change", GOTO="xorg_evdev_end"
-
-# By default, we use the -evdev driver for every mouse, keyboard, touchscreen
-# or touchpad; later rules can then change the driver for specific input
-# devices.
-KERNEL!="event*", GOTO="xorg_evdev_end"
-ENV{ID_INPUT}=="", GOTO="xorg_evdev_end"
-ENV{ID_INPUT_MOUSE}=="?*", ENV{x11_driver}="evdev"
-ENV{ID_INPUT_KEY}=="?*", ENV{x11_driver}="evdev"
-ENV{ID_INPUT_TOUCHSCREEN}=="?*", ENV{x11_driver}="evdev"
-ENV{ID_INPUT_TOUCHPAD}=="?*", ENV{x11_driver}="evdev"
-ENV{ID_INPUT_TABLET}=="?*", ENV{x11_driver}="evdev"
-
-LABEL="xorg_evdev_end"
diff --git a/debian/rules b/debian/rules
index 32ba6a6..0acce07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,10 +81,6 @@ 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/lib/udev/rules.d
- install -m 644 debian/local/65-xorg-evdev.rules
debian/xserver-xorg-input-evdev/lib/udev/rules.d/
- install -d debian/xserver-xorg-input-evdev-udeb/lib/udev/rules.d
- install -m 644 debian/local/65-xorg-evdev.rules
debian/xserver-xorg-input-evdev-udeb/lib/udev/rules.d/
install -d debian/xserver-xorg-input-evdev/usr/lib/X11/xorg.conf.d
install -m 644 debian/local/05-evdev.conf
debian/xserver-xorg-input-evdev/usr/lib/X11/xorg.conf.d
install -d debian/xserver-xorg-input-evdev-udeb/usr/lib/X11/xorg.conf.d
commit 941e6cdbe1baaf60aa3f07da39a1642357a02a81
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Mar 30 14:35:09 2010 +0300
Install 05-evdev.conf in /usr/lib/X11/xorg.conf.d.
diff --git a/debian/changelog b/debian/changelog
index 405c8fd..4921e60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-evdev (1:2.3.2-5) UNRELEASED; urgency=low
* 65-xorg-evdev.rules: Check for ID_INPUT_TABLET too, and set x11_driver
if found.
+ * Install 05-evdev.conf in /usr/lib/X11/xorg.conf.d.
-- Timo Aaltonen <tjaal...@ubuntu.com> Sun, 21 Mar 2010 20:51:38 +0200
diff --git a/debian/local/05-evdev.conf b/debian/local/05-evdev.conf
new file mode 100644
index 0000000..877aa4a
--- /dev/null
+++ b/debian/local/05-evdev.conf
@@ -0,0 +1,39 @@
+# Catchall classes for input devices
+# We don't simply match on any device since that also adds accelerometers
+# and other devices that we don't really want to use. The list below
+# matches everything but joysticks.
+
+Section "InputClass"
+ Identifier "evdev pointer catchall"
+ MatchIsPointer "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "evdev"
+EndSection
+
+Section "InputClass"
+ Identifier "evdev keyboard catchall"
+ MatchIsKeyboard "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "evdev"
+EndSection
+
+Section "InputClass"
+ Identifier "evdev touchpad catchall"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "evdev"
+EndSection
+
+Section "InputClass"
+ Identifier "evdev tablet catchall"
+ MatchIsTablet "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "evdev"
+EndSection
+
+Section "InputClass"
+ Identifier "evdev touchscreen catchall"
+ MatchIsTouchscreen "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "evdev"
+EndSection
diff --git a/debian/rules b/debian/rules
index c1aa6ff..32ba6a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,6 +85,10 @@ binary-arch: build install serverabi
install -m 644 debian/local/65-xorg-evdev.rules
debian/xserver-xorg-input-evdev/lib/udev/rules.d/
install -d debian/xserver-xorg-input-evdev-udeb/lib/udev/rules.d
install -m 644 debian/local/65-xorg-evdev.rules
debian/xserver-xorg-input-evdev-udeb/lib/udev/rules.d/
+ install -d debian/xserver-xorg-input-evdev/usr/lib/X11/xorg.conf.d
+ install -m 644 debian/local/05-evdev.conf
debian/xserver-xorg-input-evdev/usr/lib/X11/xorg.conf.d
+ install -d debian/xserver-xorg-input-evdev-udeb/usr/lib/X11/xorg.conf.d
+ install -m 644 debian/local/05-evdev.conf
debian/xserver-xorg-input-evdev-udeb/usr/lib/X11/xorg.conf.d
dh_installman
dh_link
dh_strip
commit 39c4405782957190024e8e38dd09c6163d172c99
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Sun Mar 21 20:53:18 2010 +0200
65-xorg-evdev.rules: Check for ID_INPUT_TABLET too, and set x11_driver if
found.
diff --git a/debian/changelog b/debian/changelog
index 734e679..405c8fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-evdev (1:2.3.2-5) UNRELEASED; urgency=low
+
+ * 65-xorg-evdev.rules: Check for ID_INPUT_TABLET too, and set x11_driver
+ if found.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Sun, 21 Mar 2010 20:51:38 +0200
+
xserver-xorg-input-evdev (1:2.3.2-4) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/local/65-xorg-evdev.rules b/debian/local/65-xorg-evdev.rules
index d423b38..8d9b84a 100644
--- a/debian/local/65-xorg-evdev.rules
+++ b/debian/local/65-xorg-evdev.rules
@@ -9,5 +9,6 @@ ENV{ID_INPUT_MOUSE}=="?*", ENV{x11_driver}="evdev"
ENV{ID_INPUT_KEY}=="?*", ENV{x11_driver}="evdev"
ENV{ID_INPUT_TOUCHSCREEN}=="?*", ENV{x11_driver}="evdev"
ENV{ID_INPUT_TOUCHPAD}=="?*", ENV{x11_driver}="evdev"
+ENV{ID_INPUT_TABLET}=="?*", ENV{x11_driver}="evdev"
LABEL="xorg_evdev_end"
commit ed3d0d75ccccd4abef2ec7475f9742466f5910a9
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Mar 12 01:03:23 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 5d5067a..734e679 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.3.2-4) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.3.2-4) unstable; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -15,7 +15,7 @@ xserver-xorg-input-evdev (1:2.3.2-4) UNRELEASED; urgency=low
* Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
* Add myself to Uploaders.
- -- Robert Hooker <sarv...@ubuntu.com> Sun, 24 Jan 2010 14:44:34 -0500
+ -- Cyril Brulebois <k...@debian.org> Fri, 12 Mar 2010 01:02:58 +0100
xserver-xorg-input-evdev (1:2.3.2-3) unstable; urgency=low
commit 624b8f0ef947b66084e979aba8bc467d87cf340b
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Mar 12 01:02:56 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index a83572b..5d5067a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ xserver-xorg-input-evdev (1:2.3.2-4) UNRELEASED; urgency=low
* Add udeb needed for the graphical installer:
xserver-xorg-input-evdev-udeb.
* Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
+ * Add myself to Uploaders.
-- Robert Hooker <sarv...@ubuntu.com> Sun, 24 Jan 2010 14:44:34 -0500
diff --git a/debian/control b/debian/control
index 06a3377..3953e61 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: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>, Brice Goglin <bgog...@debian.org>
+Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>, Brice Goglin <bgog...@debian.org>, Cyril Brulebois
<k...@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
commit ad20edab760c95f53f27adccf5ec20e14c00205f
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Mar 12 01:00:02 2010 +0100
Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index f26b4e7..a83572b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xserver-xorg-input-evdev (1:2.3.2-4) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Add udeb needed for the graphical installer:
xserver-xorg-input-evdev-udeb.
+ * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
-- Robert Hooker <sarv...@ubuntu.com> Sun, 24 Jan 2010 14:44:34 -0500
diff --git a/debian/control b/debian/control
index 3765dc6..06a3377 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.3
+Standards-Version: 3.8.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 79e63613fce4b887eca26d9a0b9b7274cf7e4eee
Author: Cyril Brulebois <k...@debian.org>
Date: Sun Feb 28 00:05:02 2010 +0100
Use XC-Package-Type to save some memory.
diff --git a/debian/control b/debian/control
index 69f91f6..3765dc6 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Description: X.Org X server -- evdev input driver
This package is built from the X.org xf86-input-evdev driver module.
Package: xserver-xorg-input-evdev-udeb
-Package-Type: udeb
+XC-Package-Type: udeb
Section: debian-installer
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends},
commit 879e1eedc9b607363bd02083784f586b8483927e
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Feb 2 22:34:08 2010 +0000
Also install 65-xorg-evdev.rules
diff --git a/debian/rules b/debian/rules
index 2acc6ae..c1aa6ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,6 +83,8 @@ binary-arch: build install serverabi
dh_install --sourcedir=debian/tmp --list-missing --exclude=evdev_drv.la
--exclude=usr/share/man/man4
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/
+ install -d debian/xserver-xorg-input-evdev-udeb/lib/udev/rules.d
+ install -m 644 debian/local/65-xorg-evdev.rules
debian/xserver-xorg-input-evdev-udeb/lib/udev/rules.d/
dh_installman
dh_link
dh_strip
commit 6289aacef6f289d3554e4ed4cf652914616c0802
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Feb 6 22:57:49 2010 +0000
Add udeb needed for the graphical installer: xserver-xorg-input-evdev-udeb.
diff --git a/debian/changelog b/debian/changelog
index d823557..f26b4e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ xserver-xorg-input-evdev (1:2.3.2-4) UNRELEASED; urgency=low
[ Robert Hooker ]
* Build xserver-xorg-input-evdev-dev on arch: all.
+ [ Cyril Brulebois ]
+ * Add udeb needed for the graphical installer:
+ xserver-xorg-input-evdev-udeb.
+
-- Robert Hooker <sarv...@ubuntu.com> Sun, 24 Jan 2010 14:44:34 -0500
xserver-xorg-input-evdev (1:2.3.2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 1565072..69f91f6 100644
--- a/debian/control
+++ b/debian/control
@@ -39,6 +39,16 @@ Description: X.Org X server -- evdev input driver
.
This package is built from the X.org xf86-input-evdev driver module.
+Package: xserver-xorg-input-evdev-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends},
+ udev-udeb [linux-any],
+Provides: ${xinpdriver:Provides}
+Description: X.Org X server -- evdev input driver
+ This is a udeb, or a microdeb, for the debian-installer.
+
Package: xserver-xorg-input-evdev-dev
Section: libdevel
Architecture: all
diff --git a/debian/xserver-xorg-input-evdev-udeb.install
b/debian/xserver-xorg-input-evdev-udeb.install
new file mode 100644
index 0000000..4ac2576
--- /dev/null
+++ b/debian/xserver-xorg-input-evdev-udeb.install
@@ -0,0 +1 @@
+usr/lib/xorg/modules/input/*.so
commit 2eff57cb9613e862075e3fc7b2fee53f4e42399c
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Mar 9 00:58:35 2010 +0100
65-xorg-evdev.rules: only set x11_driver for event devices.
No point setting the driver to evdev for devices it doesn't support.
diff --git a/debian/changelog b/debian/changelog
index c99565a..d823557 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-input-evdev (1:2.3.2-4) UNRELEASED; urgency=low
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
+ * 65-xorg-evdev.rules: only set x11_driver for event devices.
[ Robert Hooker ]
* Build xserver-xorg-input-evdev-dev on arch: all.
diff --git a/debian/local/65-xorg-evdev.rules b/debian/local/65-xorg-evdev.rules
index ea4a9bb..d423b38 100644
--- a/debian/local/65-xorg-evdev.rules
+++ b/debian/local/65-xorg-evdev.rules
@@ -3,6 +3,7 @@ ACTION!="add|change", GOTO="xorg_evdev_end"
# By default, we use the -evdev driver for every mouse, keyboard, touchscreen
# or touchpad; later rules can then change the driver for specific input
# devices.
+KERNEL!="event*", GOTO="xorg_evdev_end"
ENV{ID_INPUT}=="", GOTO="xorg_evdev_end"
ENV{ID_INPUT_MOUSE}=="?*", ENV{x11_driver}="evdev"
ENV{ID_INPUT_KEY}=="?*", ENV{x11_driver}="evdev"
commit 02df52780654ba076a1c230e241ce8c71ccf3d97
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Sun Jan 24 15:41:47 2010 -0500
debian/rules: Adjust build for xserver-xorg-input-evdev-dev being arch: all.
diff --git a/debian/rules b/debian/rules
index 356b9da..2acc6ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,6 +73,7 @@ install: build
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-dependent files here.
+binary-arch: DH_OPTIONS=-s
binary-arch: build install serverabi
dh_testdir
dh_testroot
@@ -94,8 +95,22 @@ binary-arch: build install serverabi
dh_builddeb
# Build architecture-independent files here.
+binary-indep: DH_OPTIONS=-i
binary-indep: build install
-# Nothing to do
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installchangelogs
+ dh_install --sourcedir=debian/tmp
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
commit 699c6499475855d17a666e029217849ea1f8e3bb
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Sun Jan 24 14:45:03 2010 -0500
debian/control: Build xserver-xorg-input-evdev-dev on arch: all.
diff --git a/debian/changelog b/debian/changelog
index d31d1fc..c99565a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
xserver-xorg-input-evdev (1:2.3.2-4) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
- -- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:29 +0000
+ [ Robert Hooker ]
+ * Build xserver-xorg-input-evdev-dev on arch: all.
+
+ -- Robert Hooker <sarv...@ubuntu.com> Sun, 24 Jan 2010 14:44:34 -0500
xserver-xorg-input-evdev (1:2.3.2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 84e0726..1565072 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Description: X.Org X server -- evdev input driver
Package: xserver-xorg-input-evdev-dev
Section: libdevel
-Architecture: any
+Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: X.Org X server -- evdev input driver (development headers)
This package provides the development headers for the evdev input driver
commit 6960c1d5d0fbb350d3906b02031bf0230b2463de
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 23 01:46:34 2010 +0100
Remove myself from Uploaders
diff --git a/debian/changelog b/debian/changelog
index ac03b39..d31d1fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-evdev (1:2.3.2-4) UNRELEASED; urgency=low
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
+ * Remove myself from Uploaders
-- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:29 +0000
diff --git a/debian/control b/debian/control
index c184fec..84e0726 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: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>, Julien Cristau <jcris...@debian.org>, Brice Goglin
<bgog...@debian.org>
+Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>, Brice Goglin <bgog...@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
commit 9e18884ecfa93696fce4037c5a068da77d440f56
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 16 16:48:48 2010 +0000
Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good
reason. Thanks, Colin Watson!
diff --git a/debian/changelog b/debian/changelog
index 8902c90..ac03b39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-evdev (1:2.3.2-4) UNRELEASED; urgency=low
+
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
+
+ -- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:29 +0000
+
xserver-xorg-input-evdev (1:2.3.2-3) unstable; urgency=low
* 65-xorg-evdev.rules: instead of blacklisting joysticks, explicitly
diff --git a/debian/rules b/debian/rules
index 78555f7..356b9da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,17 +35,17 @@ confflags += --disable-static
configure: $(STAMP_DIR)/patch
autoreconf -vfi
-obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
- mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
- cd obj-$(DEB_BUILD_GNU_TYPE) && \
+build/config.status: configure
+ mkdir -p build
+ cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)"
build: build-stamp
-build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
+build-stamp: build/config.status
dh_testdir
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
>$@
clean: xsfclean
@@ -57,7 +57,7 @@ clean: xsfclean
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
- rm -rf obj-*
+ rm -rf build
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
config.h.in
@@ -70,7 +70,7 @@ install: build
dh_clean -k
dh_installdirs
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp
install
+ cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-dependent files here.
binary-arch: build install serverabi
--
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/e1nwj5v-0000h8...@alioth.debian.org
