xorg: Changes to 'debian-experimental'
debian/changelog | 8 ++++++++
debian/control | 4 ++--
debian/xserver-xorg.postinst.in | 8 ++++++--
3 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit 74baf0d8e441147d883e123b3bee9ab989af9551
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Nov 30 21:29:33 2009 +0100
Handle upgrades correctly, and trigger udev instead of hal on Linux
* On upgrade, restart hal on kfreebsd and run udevadm trigger on linux to
make sure we can pick up input devices correctly.
* Because of the above, move udev and hal from Recommends back to Depends.
diff --git a/debian/changelog b/debian/changelog
index 0476ee1..dabc2e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.5~3) UNRELEASED; urgency=low
+
+ * On upgrade, restart hal on kfreebsd and run udevadm trigger on linux to
+ make sure we can pick up input devices correctly.
+ * Because of the above, move udev and hal from Recommends back to Depends.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 30 Nov 2009 21:24:02 +0100
+
xorg (1:7.5~2) experimental; urgency=low
* Drop xorg-dev dependency on libxkbui-dev, which has no users.
diff --git a/debian/control b/debian/control
index 064c770..766c6be 100644
--- a/debian/control
+++ b/debian/control
@@ -87,14 +87,14 @@ Depends:
xserver-xorg-video-all | xserver-xorg-video-6,
xserver-xorg-input-all | xserver-xorg-input-7,
xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc sparc],
+ udev [linux-any],
+ hal (>= 0.5.12~git20090406) [kfreebsd-any],
${shlibs:Depends},
${misc:Depends},
xkb-data (>= 1.4),
x11-xkb-utils
Recommends:
libgl1-mesa-dri,
- udev [linux-any],
- hal (>= 0.5.12~git20090406) [kfreebsd-any],
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
X.Org X server. It does not provide the actual server itself.
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index f7ae600..b3f25ed 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -145,8 +145,12 @@ case "$1" in
if dpkg --compare-versions "$2" lt-nl "1:7.3+13"; then
update-rc.d xserver-xorg remove || true
fi
- if dpkg --compare-versions "$2" lt "1:7.4"; then
- invoke-rc.d hal restart >/dev/null
+ if dpkg --compare-versions "$2" lt "1:7.5~3"; then
+ if [ `uname -s` = "Linux" ]; then
+ udevadm trigger --subsystem-match=input --action=change
+ elif [ `uname -s` = "GNU/kFreeBSD" ]; then
+ invoke-rc.d hal restart >/dev/null
+ fi
fi
;;
esac
Reply to: