diff options
| author | Adam Jackson <ajax@benzedrine.nwnk.net> | 2006-10-11 15:56:45 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@benzedrine.nwnk.net> | 2006-10-11 15:56:45 -0400 |
| commit | 61f3eb816b47f31e856eca32bca7e2e947faf533 (patch) | |
| tree | 712ac5ae1988ddedff4153e0b05f8c08c1f4f70d /hw/xprint | |
| parent | cde68728860179dc84e615ccb378ce992513fd62 (diff) | |
Back out merge of master to 1.2 branch. Undoes 89987ca...
Dear git: please make 'git-revert' work on merge commits kthnxbye.
Diffstat (limited to 'hw/xprint')
| -rw-r--r-- | hw/xprint/etc/Xsession.d/92xprint-xpserverlist | 30 | ||||
| -rw-r--r-- | hw/xprint/etc/Xsession.d/Makefile.am | 3 |
2 files changed, 1 insertions, 32 deletions
diff --git a/hw/xprint/etc/Xsession.d/92xprint-xpserverlist b/hw/xprint/etc/Xsession.d/92xprint-xpserverlist deleted file mode 100644 index 60d964a34..000000000 --- a/hw/xprint/etc/Xsession.d/92xprint-xpserverlist +++ /dev/null @@ -1,30 +0,0 @@ -#!/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@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 96a5ee73b..e0277d9d4 100644 --- a/hw/xprint/etc/Xsession.d/Makefile.am +++ b/hw/xprint/etc/Xsession.d/Makefile.am @@ -1,2 +1 @@ -xpcdir = $(sysconfdir)/X11/Xsession.d -dist_xpc_DATA = 92xprint-xpserverlist +EXTRA_DIST = cde_xsessiond_xprint.sh |