xorg-server: Changes to 'debian-unstable'

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

 debian/changelog |    6 ++++++
 debian/rules     |    1 +
 2 files changed, 7 insertions(+)

New commits:
commit 3feafe59487186075b0e13a0aadcef55e7bb1458
Author: Julien Cristau <jcristau@debian.org>
Date:   Tue May 13 01:40:43 2014 +0200

    Set shared memory dir to /dev/shm (closes: #747894).

diff --git a/debian/changelog b/debian/changelog
index 07edb74..b4b9318 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.1-2) UNRELEASED; urgency=medium
+
+  * Set shared memory dir to /dev/shm (closes: #747894).
+
+ -- Julien Cristau <jcristau@debian.org>  Tue, 13 May 2014 01:40:21 +0200
+
 xorg-server (2:1.15.1-1) unstable; urgency=low
 
   [ Maarten Lankhorst ]
diff --git a/debian/rules b/debian/rules
index d16bd9a..8cc337b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -102,6 +102,7 @@ confflags += \
 	     --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(SUPPORT))" \
 	     --with-xkb-path=/usr/share/X11/xkb \
 	     --with-xkb-output=/var/lib/xkb \
+	     --with-shared-memory-dir=/dev/shm \
 	     --disable-install-libxf86config \
 	     --enable-mitshm \
 	     --enable-xres \