xserver: Branch 'master' - 2 commits

[Keith Packard]

 Makefile.am           |   12 +++++++++++-
 composite/compalloc.c |    1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
diff-tree b2f9ca6ac400d426d7a1ef0162f7e7ce28288dd1 (from 561989f2f0fc31e3d3bf8df978a9cb3d4c85af59)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Tue Jul 10 21:33:34 2007 -0700

    Redirect fix: Manual + Automatic - Manual = Automatic
    
    A window with redirect manual *and* redirect automatic which loses the
    manual redirecting client becomes redirect automatic.

diff --git a/composite/compalloc.c b/composite/compalloc.c
index 1a7e4a0..f555411 100644
--- a/composite/compalloc.c
+++ b/composite/compalloc.c
@@ -220,6 +220,7 @@ compFreeClientWindow (WindowPtr pWin, XI
     {
 	DamageRegister (&pWin->drawable, cw->damage);
 	cw->damageRegistered = TRUE;
+	pWin->redirectDraw = RedirectDrawAutomatic;
 	DamageDamageRegion (&pWin->drawable, &pWin->borderSize);
     }
     if (wasMapped && !pWin->mapped)
diff-tree 561989f2f0fc31e3d3bf8df978a9cb3d4c85af59 (from e316fa59fea8b7b18cdf3a227890351a9567ec65)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Tue Jul 10 21:06:51 2007 -0700

    Generate ChangeLog file for make dist.
    
    Copy Makefile.am snippet which generates a complete git change history to
    the ChangeLog file during the distribution generation process.

diff --git a/Makefile.am b/Makefile.am
index f35539e..e382d58 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,7 +64,17 @@ aclocal_DATA = xorg-server.m4
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xorg-server.pc
 
-EXTRA_DIST = xorg-server.pc.in xorg-server.m4
+EXTRA_DIST = xorg-server.pc.in xorg-server.m4 ChangeLog autogen.sh
+
+MAINTAINERCLEANFILES=ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || \
+	(touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
 
 DIST_SUBDIRS = \
 	doc \