xserver: Branch 'master'

[Drew Parsons]

 hw/xprint/etc/Xsession.d/92xprint-xpserverlist |    8 ++++----
 hw/xprint/etc/Xsession.d/Makefile.am           |    3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
diff-tree 8b4ed47c5d39f219866e3c72fa973c6fc4c70f18 (from d812f486a01a6276aed7b4ebd3cd8eb8ddfe10d3)
Author: Drew Parsons <dparsons at debian.org>
Date:   Thu Sep 21 22:19:44 2006 +1000

    * Install Xprint's Xsession script to $(sysconfdir)/X11/Xsession.d
    * Removing outdated references to CDE and dt, rename script to
      92xprint-xpserverlist.

diff --git a/hw/xprint/etc/Xsession.d/92xprint-xpserverlist b/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
new file mode 100644
index 0000000..60d964a
--- /dev/null
+++ b/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
@@ -0,0 +1,30 @@
+#!/bin/sh 
+#####################################################################
+###  File:              92xprint-xpserverlist
+###
+###  Default Location:  /etc/X11/Xsession.d/
+###
+###  Purpose:           Setup Xprint env vars
+###                     
+###  Description:       This script is invoked by means of the Xsession file
+###                     at user login. 
+###
+###  Invoked by:        /etc/X11/Xsession
+###
+###  (c) Copyright 2003-2004 Roland Mainz <roland.mainz at nrubsig.org>
+###
+###  please send bugfixes or comments to https://bugs.freedesktop.org
+###
+#####################################################################
+
+
+#
+# Obtain list of Xprint servers
+#
+
+if [ -x "/etc/init.d/xprint" ] ; then
+  XPSERVERLIST="`/etc/init.d/xprint get_xpserverlist`"
+  export XPSERVERLIST
+fi
+
+##########################         eof       #####################
diff --git a/hw/xprint/etc/Xsession.d/Makefile.am b/hw/xprint/etc/Xsession.d/Makefile.am
index e0277d9..96a5ee7 100644
--- a/hw/xprint/etc/Xsession.d/Makefile.am
+++ b/hw/xprint/etc/Xsession.d/Makefile.am
@@ -1 +1,2 @@
-EXTRA_DIST = cde_xsessiond_xprint.sh
+xpcdir = $(sysconfdir)/X11/Xsession.d
+dist_xpc_DATA = 92xprint-xpserverlist
diff --git a/hw/xprint/etc/Xsession.d/cde_xsessiond_xprint.sh b/hw/xprint/etc/Xsession.d/cde_xsessiond_xprint.sh
deleted file mode 100644
index 54c431d..0000000
--- a/hw/xprint/etc/Xsession.d/cde_xsessiond_xprint.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh 
-#####################################################################
-###  File:              0018.xprint
-###
-###  Default Location:  /usr/dt/config/Xsession.d/
-###
-###  Purpose:           Setup Xprint env vars
-###                     
-###  Description:       This script is invoked by means of the Xsession file
-###                     at user login. 
-###
-###  Invoked by:        /usr/dt/bin/Xsession
-###
-###  (c) Copyright 2003-2004 Roland Mainz <roland.mainz at nrubsig.org>
-###
-###  please send bugfixes or comments to http://xprint.mozdev.org/
-###
-#####################################################################
-
-
-#
-# Obtain list of Xprint servers
-#
-
-if [ -x "/etc/init.d/xprint" ] ; then
-  XPSERVERLIST="`/etc/init.d/xprint get_xpserverlist`"
-  export XPSERVERLIST
-fi
-
-##########################         eof       #####################