xorg: Changes to 'debian-unstable'
debian/changelog | 1 +
debian/control | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d4fb8b1c3ac007505c1e08bd6e66eb494cb888bf
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 30 03:39:40 2007 +0200
Allow libgl1 as alternative to libgl1-mesa-glx in xorg's dependencies.
diff --git a/debian/changelog b/debian/changelog
index be3f14d..6c7480e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg (1:7.2-4) UNRELEASED; urgency=low
* Add ${shlibs:Depends} to x11-common's Depends field, because the X server
wrapper is an ELF object... oops.
+ * Allow libgl1 as alternative to libgl1-mesa-glx in xorg's dependencies.
-- Julien Cristau <jcristau@debian.org> Mon, 30 Apr 2007 04:38:04 +0200
diff --git a/debian/control b/debian/control
index d3ccf56..aad0059 100644
--- a/debian/control
+++ b/debian/control
@@ -119,7 +119,7 @@ Description: the X.Org X server -- input driver metapackage
Package: xorg
Architecture: all
-Depends: xserver-xorg, libgl1-mesa-glx, 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, xorg-docs
+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, xorg-docs
Recommends: libgl1-mesa-dri
Provides: x-window-system, x-window-system-core
Description: X.Org X Window System
Reply to: