xserver: Branch 'master'

[Drew Parsons]

 hw/xprint/etc/Xsession.d/Makefile.am |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

New commits:
diff-tree 182e5e0f4ba4c98a34bc52bdf4032ba315fe80ad (from 594d4019c613b0f4bf8f48cc074ecc3c8366f1d7)
Author: Drew Parsons <dparsons at debian.org>
Date:   Tue Sep 12 14:30:46 2006 +1000

    Xprint: revert installation of /etc/X11/Xsession.d/cde_xsessiond_xprint.sh
    pending resolution of #8232.

diff --git a/hw/xprint/etc/Xsession.d/Makefile.am b/hw/xprint/etc/Xsession.d/Makefile.am
index 3ef8e05..e0277d9 100644
--- a/hw/xprint/etc/Xsession.d/Makefile.am
+++ b/hw/xprint/etc/Xsession.d/Makefile.am
@@ -1,2 +1 @@
-xpcdir = /etc/X11/Xsession.d
-dist_xpc_DATA = cde_xsessiond_xprint.sh
+EXTRA_DIST = cde_xsessiond_xprint.sh