xorg: Changes to 'debian-unstable'

[Julien Cristau <jcristau@alioth.debian.org>]

 debian/changelog |    2 ++
 debian/control   |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 3908bf15a55c30affdd0504e66d2c41c6295e257
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Jun 3 02:56:30 2009 +0200

    Add a console-setup-mini alternative to xserver-xorg's Depends
    
    Closes: #527124

diff --git a/debian/changelog b/debian/changelog
index 0c92973..083921a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ xorg (1:7.4+2) UNRELEASED; urgency=low
     Detection of the primary device should happen in the kernel and/or X
     server.  With this change, we don't generate any xorg.conf anymore.
   * On upgrade, remove leftover conffile from beforelight (closes: #454219).
+  * Add a console-setup-mini alternative to xserver-xorg's Depends
+    (closes: #527124).
 
   [ Debconf translations ]
   * Bengali added
diff --git a/debian/control b/debian/control
index 5a8548b..cc2505c 100644
--- a/debian/control
+++ b/debian/control
@@ -87,7 +87,7 @@ Depends:
  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),
+ console-setup (>= 1.29) | console-setup-mini (>= 1.29),
  ${shlibs:Depends},
  ${misc:Depends},
  xkb-data (>= 1.4),