xserver: Branch 'server-1.16-branch' - 2 commits

[Julien Cristau]

 configure.ac            |    4 ++--
 hw/xwayland/Makefile.am |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0e0951ce3eb33242934df9b683f8f5ca4fd501af
Author: Julien Cristau <jcristau at debian.org>
Date:   Sun Sep 21 10:56:53 2014 +0200

    Bump to 1.16.1
    
    Signed-off-by: Julien Cristau <jcristau at debian.org>

diff --git a/configure.ac b/configure.ac
index d93eb21..c556721 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.16.0.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2014-09-15"
+AC_INIT([xorg-server], 1.16.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2014-09-21"
 RELEASE_NAME="Marionberry Pie"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
commit b501462e5da776e28a8e16d8573a6d17d7ebe15e
Author: Julien Cristau <jcristau at debian.org>
Date:   Wed Sep 17 07:41:27 2014 +0200

    xwayland: always include drm.xml in tarballs
    
    Move drm.xml out of the automake conditional so make dist includes it
    even if glamor-egl is disabled.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83960
    
    Signed-off-by: Julien Cristau <jcristau at debian.org>
    Reviewed-by: Eric Anholt <eric at anholt.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit af40913797e6595fb5466c2ff3110e9526a37b9f)

diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
index dc16b8b..4e0e1bb 100644
--- a/hw/xwayland/Makefile.am
+++ b/hw/xwayland/Makefile.am
@@ -39,8 +39,6 @@ nodist_Xwayland_SOURCES =			\
 
 CLEANFILES = $(nodist_Xwayland_SOURCES)
 
-EXTRA_DIST = drm.xml
-
 xwayland-glamor.c : $(nodist_Xwayland_SOURCES)
 
 glamor_lib = $(top_builddir)/glamor/libglamor.la
@@ -48,6 +46,8 @@ glamor_lib = $(top_builddir)/glamor/libglamor.la
 Xwayland_LDADD += $(GLAMOR_LIBS) $(GBM_LIBS) -lEGL -lGL
 endif
 
+EXTRA_DIST = drm.xml
+
 
 relink:
 	$(AM_V_at)rm -f Xwayland$(EXEEXT) && $(MAKE) Xwayland$(EXEEXT)