xorg: Changes to 'debian-experimental'
debian/changelog | 4 ++++
debian/control | 10 +++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 39443c583f5fc16c475a48138808224441104eec
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 19 19:27:52 2008 +0100
xserver-xorg Depends on hal.
diff --git a/debian/changelog b/debian/changelog
index 8fb1cd7..7666d76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
xorg (1:7.4~5) UNRELEASED; urgency=low
+ [ Loic Minier ]
* Also upgrade Driver i810 or via lines which have trailing comments.
* Shut up rmdir errors with 2>/dev/null in all maintainer scripts when
trying to remove dirs; this might confuse debconf.
+ [ Julien Cristau ]
+ * xserver-xorg Depends on hal.
+
-- Loic Minier <lool@dooz.org> Wed, 15 Oct 2008 21:52:39 +0200
xorg (1:7.4~4) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 9b14e37..d451698 100644
--- a/debian/control
+++ b/debian/control
@@ -85,6 +85,7 @@ Depends:
xserver-xorg-core (>= 2:1.5),
xserver-xorg-video-all | xserver-xorg-video-4,
xserver-xorg-input-all | xserver-xorg-input-2.1,
+ hal,
${shlibs:Depends},
${misc:Depends},
xkb-data | xkb-data-legacy,
commit 7f940975117b8e876d4dcda9d7daeb824bdf8406
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 19 19:26:43 2008 +0100
Wrap Depends for xserver-xorg
diff --git a/debian/control b/debian/control
index 7a60dc2..9b14e37 100644
--- a/debian/control
+++ b/debian/control
@@ -81,7 +81,14 @@ Package: xserver-xorg
Architecture: any
Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common (<< 7), x11-common (<< 1:7.3+11)
Replaces: xserver-common (<< 7), x11-common (<< 1:7.3+11)
-Depends: xserver-xorg-core (>= 2:1.5), xserver-xorg-video-all | xserver-xorg-video-4, xserver-xorg-input-all | xserver-xorg-input-2.1, ${shlibs:Depends}, ${misc:Depends}, xkb-data | xkb-data-legacy, x11-xkb-utils
+Depends:
+ xserver-xorg-core (>= 2:1.5),
+ xserver-xorg-video-all | xserver-xorg-video-4,
+ xserver-xorg-input-all | xserver-xorg-input-2.1,
+ ${shlibs:Depends},
+ ${misc:Depends},
+ xkb-data | xkb-data-legacy,
+ x11-xkb-utils
Recommends: libgl1-mesa-dri, udev, ${F:XServer-Xorg-Detect-Depends}
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
Reply to: