xorg: Changes to 'debian-unstable'
debian/changelog | 4 +++-
debian/control | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 061e280e5a8c0747f747e386e55a549bb5089b19
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Apr 18 17:15:53 2009 -0400
Add libgl1-mesa-dri to the depends of the xorg package
This will ensure that it gets pulled in even if Recommends are disabled.
diff --git a/debian/changelog b/debian/changelog
index da7c3b5..80c8e71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,13 +5,15 @@ xorg (1:7.4+2) UNRELEASED; urgency=low
[ David Nusinow ]
* Don't discuss removal of xserver-xorg in its description.
It remains tied to -core at this point. (closes: #523630).
+ * Add libgl1-mesa-dri to the depends of the xorg package to ensure that
+ it gets pulled in even if Recommends are disabled
[ Julien Cristau ]
* Update the NEWS entry for xserver-xorg 1:7.4+1 to include a warning about
keycode changes breaking Xmodmaps (closes: #523562). Thanks, Manoj
Srivastava!
- -- Julien Cristau <jcristau@debian.org> Fri, 10 Apr 2009 14:12:51 +0100
+ -- David Nusinow <dnusinow@debian.org> Sat, 18 Apr 2009 17:14:13 -0400
xorg (1:7.4+1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 350ebb1..590d225 100644
--- a/debian/control
+++ b/debian/control
@@ -118,7 +118,7 @@ Description: the X.Org X server -- input driver metapackage
Package: xorg
Architecture: any
-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 [sparc]
+Depends: xserver-xorg, libgl1-mesa-glx | libgl1, libgl1-mesa-dri, 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 [sparc]
Recommends: xorg-docs
Provides: x-window-system, x-window-system-core
Description: X.Org X Window System
Reply to: