xserver: Branch 'master' - 5 commits

[Keith Packard]

Rebased ref, commits from common ancestor:
commit 3ef51c5c74297937002668b0c507fa88550db67e
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Sep 16 10:03:49 2016 -0700

    Bump version to 1.18.99.2
    
    Prepare for 1.19 RC1
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 4b2b4f6..190e473 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.18.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2015-11-09"
-RELEASE_NAME="Ouzo"
+AC_INIT([xorg-server], 1.18.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2016-09-16"
+RELEASE_NAME="Marionberry Pie"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 86038dfd42d6f6da9646ef2f87b2ab8ccba98e02
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Sep 16 10:56:15 2016 -0700

    os: Add 'ospoll.h' to Makefile.am
    
    Distribute this source file.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/os/Makefile.am b/os/Makefile.am
index d97ba30..b5fb9d0 100644
--- a/os/Makefile.am
+++ b/os/Makefile.am
@@ -23,6 +23,7 @@ libos_la_SOURCES = 	\
 	osdep.h		\
 	osinit.c	\
 	ospoll.c	\
+	ospoll.h	\
 	utils.c		\
 	xdmauth.c	\
 	xsha1.c		\
commit 56972d007dcde93693cb9e39931978b744942e5b
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Sep 16 10:55:27 2016 -0700

    include: Add 'xserver_poll.h' to Makefile.am
    
    Make sure this file is included in the tarball.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/include/Makefile.am b/include/Makefile.am
index 05f8d24..cbc4a7c 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -60,6 +60,7 @@ sdk_HEADERS =		\
 	xkbsrv.h	\
 	xkbstr.h        \
 	xkbrules.h      \
+	xserver_poll.h	\
 	xserver-properties.h
 
 nodist_sdk_HEADERS = xorg-server.h
commit 61b159f5a79130a9661064d3f0143e5d6107985a
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Sep 16 10:54:37 2016 -0700

    hw/xwin: Add 'dri' to DIST_SUBDIRS
    
    This creates the needed Makefile.in files during 'make dist' or 'make
    distcheck'
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index 50b4d9f..0846230 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -197,4 +197,4 @@ relink:
 	$(AM_V_at)rm -f XWin$(EXEEXT) && $(MAKE) XWin$(EXEEXT)
 
 SUBDIRS = man $(GLX_DIR) winclipboard .
-DIST_SUBDIRS = man glx winclipboard .
+DIST_SUBDIRS = man dri glx winclipboard .
commit 93f474e49b24abc673cb9cf5ea16fac296dce312
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Sep 16 10:43:09 2016 -0700

    Remove 'dixfontstubs.h' from include EXTRA_DIST
    
    This file was removed when moving to the new libXfont API, but
    accidentally left in EXTRA_DIST.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/include/Makefile.am b/include/Makefile.am
index b9cf584..05f8d24 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -70,7 +70,7 @@ AM_CFLAGS = $(DIX_CFLAGS)
 EXTRA_DIST = 	\
 	busfault.h dbus-core.h \
 	dix-config-apple-verbatim.h \
-	dixfontstubs.h eventconvert.h eventstr.h inpututils.h \
+	eventconvert.h eventstr.h inpututils.h \
 	probes.h \
 	protocol-versions.h \
 	swaprep.h \