xorg: Changes to 'debian-unstable'

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

 debian/changelog          |    7 +++++++
 debian/scripts/vars.s390x |    8 ++++++++
 2 files changed, 15 insertions(+)

New commits:
commit 31daee6d5acf73478e5203c7d3542146201bd2b9
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon Aug 15 20:17:45 2011 +0200

    Copy debian/scripts/vars.s390 to debian/scripts/vars.s390x (closes: #637902).
    
    Thanks, Aurélien Jarno!

diff --git a/debian/changelog b/debian/changelog
index 2fbbd56..2cedd60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.6+9) UNRELEASED; urgency=low
+
+  * Copy debian/scripts/vars.s390 to debian/scripts/vars.s390x
+    (closes: #637902).  Thanks, Aurélien Jarno!
+
+ -- Julien Cristau <jcristau@debian.org>  Mon, 15 Aug 2011 20:16:17 +0200
+
 xorg (1:7.6+8) unstable; urgency=high
 
   [ Julien Cristau ]
diff --git a/debian/scripts/vars.s390x b/debian/scripts/vars.s390x
new file mode 100644
index 0000000..525866e
--- /dev/null
+++ b/debian/scripts/vars.s390x
@@ -0,0 +1,8 @@
+
+# This file is NOT a shell script.
+#
+# This file gets included by both debian/rules (make) AND the scripts in
+# debian/scripts (Bourne shell).
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-dummy"
+
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-void"