xorg: Changes to 'debian-unstable'
debian/changelog | 9 ++++++++-
debian/control | 4 ++--
2 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 9ae456801563679067298870cc45072801c5129b
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Nov 11 13:20:02 2007 +0100
Replace xorg and xserver-xorg dependencies on xbase-clients and xutils
diff --git a/debian/changelog b/debian/changelog
index a0e3420..ebd4d3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
xorg (1:7.3+5) UNRELEASED; urgency=low
+ [ David Nusinow ]
* Change xlibs-static-dev transitional package from the libs to oldlibs
section
- -- David Nusinow <dnusinow@debian.org> Mon, 05 Nov 2007 15:41:00 -0500
+ [ Brice Goglin ]
+ * Replace xorg dependency on xbase-clients and xutils with the corresponding
+ new x11-*utils packages (without xutils-dev), closes: #445471.
+ * Replace xserver-xorg dependency on xbase-clients with x11-xkb-utils
+ (for xkbcomp).
+
+ -- Brice Goglin <bgoglin@debian.org> Sun, 11 Nov 2007 13:11:05 +0100
xorg (1:7.3+4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ddbb81c..4ae800c 100644
--- a/debian/control
+++ b/debian/control
@@ -82,7 +82,7 @@ Architecture: all
Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common
Replaces: xserver-common
Pre-Depends: x11-common (>= 1:7.3+3)
-Depends: xserver-xorg-core (>= 2:1.4-3), xserver-xorg-video-all | xserver-xorg-video-2, xserver-xorg-input-all | xserver-xorg-input-2, ${misc:Depends}, xkb-data | xkb-data-legacy, xbase-clients
+Depends: xserver-xorg-core (>= 2:1.4-3), xserver-xorg-video-all | xserver-xorg-video-2, xserver-xorg-input-all | xserver-xorg-input-2, ${misc:Depends}, xkb-data | xkb-data-legacy, x11-xkb-utils
Recommends: libgl1-mesa-dri, udev, laptop-detect, xresprobe, discover1 | discover, ${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
@@ -110,7 +110,7 @@ Description: the X.Org X server -- input driver metapackage
Package: xorg
Architecture: all
-Depends: xserver-xorg, libgl1-mesa-glx | libgl1, libglu1-mesa, xfonts-base (>= 1:1.0.0-1), xfonts-100dpi (>= 1:1.0.0-1), xfonts-75dpi (>= 1:1.0.0-1), xfonts-scalable (>= 1:1.0.0-1), xbase-clients (>= 1:1.0.1-1), xutils (>= 1:1.0.1-1), xkb-data, xterm | x-terminal-emulator, sparc-utils | not+sparc
+Depends: xserver-xorg, libgl1-mesa-glx | libgl1, libglu1-mesa, xfonts-base (>= 1:1.0.0-1), xfonts-100dpi (>= 1:1.0.0-1), xfonts-75dpi (>= 1:1.0.0-1), xfonts-scalable (>= 1:1.0.0-1), x11-apps, x11-session-utils, x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils, xauth, xinit, xfonts-utils, xkb-data, xterm | x-terminal-emulator, sparc-utils | not+sparc
Recommends: xorg-docs
Provides: x-window-system, x-window-system-core
Description: X.Org X Window System
Reply to: