Bug#515214: [PATCH] hal depends -> recommends
demote hal dependency to recommend and add a NEWS entry about it.
---
debian/changelog | 4 ++++
debian/control | 3 +--
debian/xserver-xorg.NEWS | 11 +++++++++++
debian/xserver-xorg.postinst.in | 4 ++++
4 files changed, 20 insertions(+), 2 deletions(-)
mode change 100644 => 100755 debian/xserver-xorg.postinst.in
diff --git a/debian/changelog b/debian/changelog
index bc0a3b5..02f142a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ xorg (1:7.4+2) UNRELEASED; urgency=low
* Don't discuss removal of xserver-xorg in its description.
It remains tied to -core at this point. (closes: #523630).
+
+ * Demote hal Depends: to Recommends:. For that add a NEWS.Debian entry
+ that people have to be careful on upgrades to not lose their input
+ devices (without hal it needs a config option).
-- Julien Cristau <jcristau@debian.org> Fri, 10 Apr 2009 14:12:51 +0100
diff --git a/debian/control b/debian/control
index 350ebb1..cc2b023 100644
--- a/debian/control
+++ b/debian/control
@@ -86,13 +86,12 @@ Depends:
xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc sparc],
xserver-xorg-video-all | xserver-xorg-video-5,
xserver-xorg-input-all | xserver-xorg-input-4,
- hal (>= 0.5.12~git20090406),
console-setup (>= 1.29),
${shlibs:Depends},
${misc:Depends},
xkb-data (>= 1.4),
x11-xkb-utils
-Recommends: libgl1-mesa-dri, udev
+Recommends: libgl1-mesa-dri, udev, hal (>= 0.5.12~git20090406)
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
X.Org X server, as well as providing a configuration infrastructure to manage
diff --git a/debian/xserver-xorg.NEWS b/debian/xserver-xorg.NEWS
index 6987bec..6b6b102 100644
--- a/debian/xserver-xorg.NEWS
+++ b/debian/xserver-xorg.NEWS
@@ -1,3 +1,14 @@
+xserver-xorg (1:7.4+2) unstable; urgency=low
+
+ Starting with this release, hal is no longer a dependency, "only" a
+ recommended package. To ensure working input devices for your X server,
+ either make sure you install hal alongside this package, or add
+ 'Option "AutoAddDevices" "off"' in the ServerLayout section of your
+ /etc/X11/xorg.conf (without the '') and configure input devices as you
+ did in the past.
+
+ -- Joerg Jaspert <joerg@debian.org> Sun, 12 Apr 2009 00:05:02 +0200
+
xserver-xorg (1:7.4+1) unstable; urgency=low
Starting from this version, input devices are no longer configured
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
old mode 100644
new mode 100755
index 7f75de2..be31457
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -270,6 +270,10 @@ fi
debug_echo "Configuring $THIS_PACKAGE."
+if ! [ -x /usr/sbin/hald ] && ! grep -q AutoAddDevices "${XORGCONFIG}"; then
+ bomb "Please either install hal or configure your xorg.conf to work without, see NEWS entry for xserver-xorg version 1:7.4+2"
+fi
+
if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
# BusID
PRIORITY=low
--
1.6.2
Reply to: