From 96dbf4dcb1e04571363422a97649fc929b35beb8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 22 Jan 2012 00:20:07 -0600 Subject: Second part of prior commit --- ubuntu/maverick/tdebase/debian/kdm-trinity-np.pam | 11 -- .../tdebase/debian/kdm-trinity.README.Debian | 91 --------- ubuntu/maverick/tdebase/debian/kdm-trinity.conf | 48 ----- ubuntu/maverick/tdebase/debian/kdm-trinity.config | 87 -------- ubuntu/maverick/tdebase/debian/kdm-trinity.dirs | 2 - ubuntu/maverick/tdebase/debian/kdm-trinity.install | 51 ----- ubuntu/maverick/tdebase/debian/kdm-trinity.links | 1 - .../maverick/tdebase/debian/kdm-trinity.logrotate | 9 - .../maverick/tdebase/debian/kdm-trinity.manpages | 6 - ubuntu/maverick/tdebase/debian/kdm-trinity.pam | 11 -- .../maverick/tdebase/debian/kdm-trinity.postinst | 125 ------------ ubuntu/maverick/tdebase/debian/kdm-trinity.postrm | 38 ---- ubuntu/maverick/tdebase/debian/kdm-trinity.preinst | 29 --- ubuntu/maverick/tdebase/debian/kdm-trinity.prerm | 176 ----------------- .../maverick/tdebase/debian/kdm-trinity.templates | 32 --- ubuntu/maverick/tdebase/debian/kdm-trinity.txt | 189 ------------------ ubuntu/maverick/tdebase/debian/local/kdm.options | 8 - ubuntu/maverick/tdebase/debian/local/kdm.options.5 | 87 -------- ubuntu/maverick/tdebase/debian/local/tdm.options | 8 + ubuntu/maverick/tdebase/debian/local/tdm.options.5 | 87 ++++++++ .../tdebase/debian/man/genkdmconf-trinity.1 | 91 --------- .../tdebase/debian/man/gentdmconf-trinity.1 | 91 +++++++++ ubuntu/maverick/tdebase/debian/man/kdm-trinity.1 | 116 ----------- .../tdebase/debian/man/kdm_config-trinity.1 | 22 --- .../tdebase/debian/man/kdm_greet-trinity.1 | 22 --- .../maverick/tdebase/debian/man/kdmctl-trinity.1 | 220 --------------------- ubuntu/maverick/tdebase/debian/man/tdm-trinity.1 | 116 +++++++++++ .../tdebase/debian/man/tdm_config-trinity.1 | 22 +++ .../tdebase/debian/man/tdm_greet-trinity.1 | 22 +++ .../maverick/tdebase/debian/man/tdmctl-trinity.1 | 220 +++++++++++++++++++++ .../debian/patches/disable_default_kdm_theme.diff | 14 -- .../debian/patches/disable_default_tdm_theme.diff | 14 ++ .../patches/kubuntu_9921_kdm_bulletproof_x.diff | 64 ------ .../patches/kubuntu_9921_tdm_bulletproof_x.diff | 64 ++++++ .../tdebase/debian/tdebase-doc-html.doc-base.kdm | 10 - .../tdebase/debian/tdebase-doc-html.doc-base.tdm | 10 + ubuntu/maverick/tdebase/debian/tdm-trinity-np.pam | 11 ++ .../tdebase/debian/tdm-trinity.README.Debian | 91 +++++++++ ubuntu/maverick/tdebase/debian/tdm-trinity.conf | 48 +++++ ubuntu/maverick/tdebase/debian/tdm-trinity.config | 87 ++++++++ ubuntu/maverick/tdebase/debian/tdm-trinity.dirs | 2 + ubuntu/maverick/tdebase/debian/tdm-trinity.install | 51 +++++ ubuntu/maverick/tdebase/debian/tdm-trinity.links | 1 + .../maverick/tdebase/debian/tdm-trinity.logrotate | 9 + .../maverick/tdebase/debian/tdm-trinity.manpages | 6 + ubuntu/maverick/tdebase/debian/tdm-trinity.pam | 11 ++ .../maverick/tdebase/debian/tdm-trinity.postinst | 125 ++++++++++++ ubuntu/maverick/tdebase/debian/tdm-trinity.postrm | 38 ++++ ubuntu/maverick/tdebase/debian/tdm-trinity.preinst | 29 +++ ubuntu/maverick/tdebase/debian/tdm-trinity.prerm | 176 +++++++++++++++++ .../maverick/tdebase/debian/tdm-trinity.templates | 32 +++ ubuntu/maverick/tdebase/debian/tdm-trinity.txt | 189 ++++++++++++++++++ 52 files changed, 1560 insertions(+), 1560 deletions(-) delete mode 100644 ubuntu/maverick/tdebase/debian/kdm-trinity-np.pam delete mode 100644 ubuntu/maverick/tdebase/debian/kdm-trinity.README.Debian delete mode 100755 ubuntu/maverick/tdebase/debian/kdm-trinity.conf delete mode 100644 ubuntu/maverick/tdebase/debian/kdm-trinity.config delete mode 100644 ubuntu/maverick/tdebase/debian/kdm-trinity.dirs delete mode 100644 ubuntu/maverick/tdebase/debian/kdm-trinity.install delete mode 100644 ubuntu/maverick/tdebase/debian/kdm-trinity.links delete mode 100644 ubuntu/maverick/tdebase/debian/kdm-trinity.logrotate delete mode 100644 ubuntu/maverick/tdebase/debian/kdm-trinity.manpages delete mode 100644 ubuntu/maverick/tdebase/debian/kdm-trinity.pam delete mode 100644 ubuntu/maverick/tdebase/debian/kdm-trinity.postinst delete mode 100644 ubuntu/maverick/tdebase/debian/kdm-trinity.postrm delete mode 100644 ubuntu/maverick/tdebase/debian/kdm-trinity.preinst delete mode 100644 ubuntu/maverick/tdebase/debian/kdm-trinity.prerm delete mode 100644 ubuntu/maverick/tdebase/debian/kdm-trinity.templates delete mode 100644 ubuntu/maverick/tdebase/debian/kdm-trinity.txt delete mode 100644 ubuntu/maverick/tdebase/debian/local/kdm.options delete mode 100644 ubuntu/maverick/tdebase/debian/local/kdm.options.5 create mode 100644 ubuntu/maverick/tdebase/debian/local/tdm.options create mode 100644 ubuntu/maverick/tdebase/debian/local/tdm.options.5 delete mode 100644 ubuntu/maverick/tdebase/debian/man/genkdmconf-trinity.1 create mode 100644 ubuntu/maverick/tdebase/debian/man/gentdmconf-trinity.1 delete mode 100644 ubuntu/maverick/tdebase/debian/man/kdm-trinity.1 delete mode 100644 ubuntu/maverick/tdebase/debian/man/kdm_config-trinity.1 delete mode 100644 ubuntu/maverick/tdebase/debian/man/kdm_greet-trinity.1 delete mode 100644 ubuntu/maverick/tdebase/debian/man/kdmctl-trinity.1 create mode 100644 ubuntu/maverick/tdebase/debian/man/tdm-trinity.1 create mode 100644 ubuntu/maverick/tdebase/debian/man/tdm_config-trinity.1 create mode 100644 ubuntu/maverick/tdebase/debian/man/tdm_greet-trinity.1 create mode 100644 ubuntu/maverick/tdebase/debian/man/tdmctl-trinity.1 delete mode 100644 ubuntu/maverick/tdebase/debian/patches/disable_default_kdm_theme.diff create mode 100644 ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff delete mode 100644 ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff create mode 100644 ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff delete mode 100644 ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdm create mode 100644 ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdm create mode 100644 ubuntu/maverick/tdebase/debian/tdm-trinity-np.pam create mode 100644 ubuntu/maverick/tdebase/debian/tdm-trinity.README.Debian create mode 100755 ubuntu/maverick/tdebase/debian/tdm-trinity.conf create mode 100644 ubuntu/maverick/tdebase/debian/tdm-trinity.config create mode 100644 ubuntu/maverick/tdebase/debian/tdm-trinity.dirs create mode 100644 ubuntu/maverick/tdebase/debian/tdm-trinity.install create mode 100644 ubuntu/maverick/tdebase/debian/tdm-trinity.links create mode 100644 ubuntu/maverick/tdebase/debian/tdm-trinity.logrotate create mode 100644 ubuntu/maverick/tdebase/debian/tdm-trinity.manpages create mode 100644 ubuntu/maverick/tdebase/debian/tdm-trinity.pam create mode 100644 ubuntu/maverick/tdebase/debian/tdm-trinity.postinst create mode 100644 ubuntu/maverick/tdebase/debian/tdm-trinity.postrm create mode 100644 ubuntu/maverick/tdebase/debian/tdm-trinity.preinst create mode 100644 ubuntu/maverick/tdebase/debian/tdm-trinity.prerm create mode 100644 ubuntu/maverick/tdebase/debian/tdm-trinity.templates create mode 100644 ubuntu/maverick/tdebase/debian/tdm-trinity.txt (limited to 'ubuntu/maverick/tdebase/debian') diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity-np.pam b/ubuntu/maverick/tdebase/debian/kdm-trinity-np.pam deleted file mode 100644 index 4cada235b..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity-np.pam +++ /dev/null @@ -1,11 +0,0 @@ -# -# /etc/pam.d/tdm-np - specify the PAM behaviour of tdm for passwordless logins -# -auth required pam_nologin.so -auth required pam_env.so readenv=1 -auth required pam_env.so readenv=1 envfile=/etc/default/locale -session required pam_limits.so -@include common-account -@include common-password -@include common-session -auth required pam_permit.so diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.README.Debian b/ubuntu/maverick/tdebase/debian/kdm-trinity.README.Debian deleted file mode 100644 index 60a81e267..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.README.Debian +++ /dev/null @@ -1,91 +0,0 @@ -TDM in Debian -============= - -This package comes with a copy of the TDM handbook in docbook format. -To read it, run "khelpcenter help:/tdm" from a command-line or go to the -URL "help:/tdm" in konqueror. - -By default, the use of special graphical themes with TDM is disabled. -If you wish to use the 'Circles' theme that comes with the tdm package, or -any other theme that you have installed, you should research the -'UseTheme' and 'Theme' fields in /etc/trinity/tdm/tdmrc. This can be done -by browsing this URL in Konqueror: - -help:/tdm/tdm-files.html#tdmrc-greeter - -TDM Customization -================= - -We provide a way to override theme-related values normally set in the -master configuration file (tdmrc): - * USEBACKGROUND - * BACKGROUNDCFG - * USETHEME - * THEME - * AUTOLOGINAGAIN - * AUTOLOGINDELAY - * AUTOLOGINLOCKED - * AUTOLOGINUSER - -and background configuration file (backgroundrc): - * WALLPAPER - -You just need to create a file with overridden value(s) and put it in -tdm override directory (default is /etc/default/tdm.d). - -================================================ -Below this is direct from the xdm package README -================================================ - -Debian README for the xdm package: - -Newcomers to the X Window System should first read the file -/opt/trinity/share/doc/x11-common/FAQ.gz. You can view this file with your -favorite pager program after decompressing it. For example: - $ zcat /opt/trinity/share/doc/x11-common/FAQ.gz | pager - -The default configuration for the X display manager (xdm) under Debian -GNU/Linux presumes that one wishes xdm to manage one local session. (In -other words, the xdm login screen occupies one virtual console -automatically at boot.) If one does not wish to run a local X server, the -following line should be commented out of /etc/X11/xdm/Xservers: - -:0 local /usr/bin/X11/X vt7 -deferglyphs 16 - -Several configuration files are shipped with the xdm package; they reside -in the /etc/X11/xdm/ directory. Extensive documentation about the xdm -configuration files may be found in the xdm(1) manual page. - -xdm-config contains X resources specific to xdm itself. See the X(1) -manual page for more information about X resources, and the xdm(1) manual -pages for documentation of the available xdm resources. - -Xresources contains X resources that are designed to be specfic to sessions -running under xdm. Note that this file does contain the resource entries -for xdm itself -- those are contained in the file xdm-config. See the X(1) -manual page for more information about X resources. - -The above three files, despite being X resource files, are not placed in the -/etc/X11/Xresources directory (see /opt/trinity/share/doc/xbase/README.Debian) because -they should not be used automatically in all X sessions; the /etc/X11/Xsession -script merges in the resources of all files found in /etc/X11/Xresources, and -this action would be inappropriate for these resource files. - -Xservers contains entries to start the X server(s) on the local machine, and -on any remote X terminals that do not support XDMCP. This file is internally -documented. - -Xaccess determines what hosts on the network may use the services of the -running xdm daemon. This file is internally documented. Note that as of -version 3.3.4-1 of the xdm package, all remote XDMCP access is turned off -by default. - -Xstartup is a shell script which is run (as root) after a user has logged in -on a server. - -Xreset is a shell script which is run (as root) after a user's X session ends on -a server. - -xdm.options contains configuration options for xdm that are specific to the -Debian GNU/Linux system. See the xdm.options(5) manual page for more -information. diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.conf b/ubuntu/maverick/tdebase/debian/kdm-trinity.conf deleted file mode 100755 index 7ea5ac479..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.conf +++ /dev/null @@ -1,48 +0,0 @@ -# tdm-trinity - K Display Manager -# -# The display manager service manages the X servers running on the -# system, providing login and auto-login services - -description "K Display Manager for Trinity" -author "Richard Johnson and Timothy Pearson" - -start on (filesystem - and (started hal or started hal-trinity) - and (graphics-device-added fb0 PRIMARY_DEVICE_FOR_DISPLAY=1 - or drm-device-added card0 PRIMARY_DEVICE_FOR_DISPLAY=1 - or stopped udevtrigger)) -stop on runlevel [016] - -emits starting-dm - -respawn - -script - [ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/opt/trinity/bin/tdm" ] - - # Check kernel command-line for inhibitors - for ARG in $(cat /proc/cmdline) - do - case "${ARG}" in - text|-s|s|S|single) - exit 0 - ;; - esac - done - - if [ -r /etc/default/locale ]; then - . /etc/default/locale - export LANG LANGUAGE - elif [ -r /etc/environment ]; then - . /etc/environment - export LANG LANGUAGE - fi - - TDEDIRS=/opt/trinity/ - PATH=/opt/trinity/bin:/bin:/usr/bin:/sbin:/usr/sbin - - initctl emit starting-dm DM=tdm-trinity - - exec /opt/trinity/bin/tdm - -end script diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.config b/ubuntu/maverick/tdebase/debian/kdm-trinity.config deleted file mode 100644 index 1d73249f7..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.config +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh -# Debian tdm package configuration script -# stolen from the xdm scripts -# Copyright 2000--2003 Branden Robinson. -# Licensed under the GNU General Public License, version 2. See the file -# /usr/share/common-licenses/GPL or . - -set -e - -# source debconf library -. /usr/share/debconf/confmodule - -THIS_PACKAGE=tdm-trinity - -# set default display manager -DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager - -OWNERS= -if db_metaget shared/default-x-display-manager owners; then - OWNERS="$RET" -fi - -CHOICES= -if db_metaget shared/default-x-display-manager choices; then - CHOICES="$RET" -fi - -if [ "$OWNERS" != "$CHOICES" ]; then - # FIXME - redo this part uses shell-lib.sh from xfree86 - # observe "X display managers now available are \"$OWNERS\"" - db_subst shared/default-x-display-manager choices "$OWNERS" - db_fset shared/default-x-display-manager seen false -fi - -# debconf is not a registry; use the current contents of the default display -# manager file to pre-answer the question if possible -if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then - CURRENT_DEFAULT=$(grep -v '^[[:space:]]*#' \ - "$DEFAULT_DISPLAY_MANAGER_FILE" | - head -n 1) - # both the binaries for tdm and tdm-kde4 share the same basename - # so we need to check if it's tdm-kde4 or another display manager - if [ "$CURRENT_DEFAULT" = "/usr/lib/kde4/bin/tdm" ]; then - CURRENT_DEFAULT=${THIS_PACKAGE}-kde4 - else - CURRENT_DEFAULT=$(basename $CURRENT_DEFAULT) - fi - if [ -n "$CURRENT_DEFAULT" ]; then -# if ! which "$CURRENT_DEFAULT" > /dev/null 2>&1; then -# echo . - # FIXME - redo this part uses shell-lib.sh from xfree86 - #observe "default display manager \"$CURRENT_DEFAULT\" specified in" \ - # "$DEFAULT_DISPLAY_MANAGER_FILE does not exist or is not" \ - # "executable" -# fi - db_set shared/default-x-display-manager "$CURRENT_DEFAULT" - fi -else - CURRENT_DEFAULT= - if db_get shared/default-x-display-manager; then - CURRENT_DEFAULT="$RET" - fi -fi - -db_input high shared/default-x-display-manager || true -db_go - -# using this display manager? -NEW_DEFAULT= -if db_get shared/default-x-display-manager; then - NEW_DEFAULT="$RET" -fi - -# move the default display manager file if we're going to change it -if [ -n "$NEW_DEFAULT" ]; then - if [ "$NEW_DEFAULT" != "$CURRENT_DEFAULT" ]; then - if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then - # FIXME - redo this part uses shell-lib.sh from xfree86 - # observe "preparing to change default X display manager from" \ - # "\"$CURRENT_DEFAULT\" to \"$NEW_DEFAULT\"" - mv "$DEFAULT_DISPLAY_MANAGER_FILE" \ - "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" - fi - fi -fi - -exit 0 diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.dirs b/ubuntu/maverick/tdebase/debian/kdm-trinity.dirs deleted file mode 100644 index 2060b348d..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.dirs +++ /dev/null @@ -1,2 +0,0 @@ -etc/default/tdm-trinity.d -var/lib/tdm-trinity diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.install b/ubuntu/maverick/tdebase/debian/kdm-trinity.install deleted file mode 100644 index 289fa03af..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.install +++ /dev/null @@ -1,51 +0,0 @@ -debian/local/tdm.options etc/trinity/tdm/ -debian/tmp/etc/trinity/tdm/tdmrc -debian/tmp/etc/trinity/tdm/Xaccess -debian/tmp/etc/trinity/tdm/Xreset -debian/tmp/etc/trinity/tdm/Xsession -debian/tmp/etc/trinity/tdm/Xsetup -debian/tmp/etc/trinity/tdm/Xstartup -debian/tmp/etc/trinity/tdm/Xwilling -debian/tmp/opt/trinity/bin/gentdmconf -debian/tmp/opt/trinity/bin/tdm -debian/tmp/opt/trinity/bin/tdm_config -debian/tmp/opt/trinity/bin/tdmctl -debian/tmp/opt/trinity/bin/tdm_greet -debian/tmp/opt/trinity/bin/krootimage -debian/tmp/opt/trinity/share/apps/tdm/pics/kdelogo-crystal.png -debian/tmp/opt/trinity/share/apps/tdm/pics/kdelogo.png -debian/tmp/opt/trinity/share/apps/tdm/pics/shutdown.jpg -debian/tmp/opt/trinity/share/apps/tdm/pics/users/default1.png -debian/tmp/opt/trinity/share/apps/tdm/pics/users/default2.png -debian/tmp/opt/trinity/share/apps/tdm/pics/users/default3.png -debian/tmp/opt/trinity/share/apps/tdm/pics/users/root1.png -debian/tmp/opt/trinity/share/apps/tdm/sessions/9wm.desktop -debian/tmp/opt/trinity/share/apps/tdm/sessions/aewm.desktop -debian/tmp/opt/trinity/share/apps/tdm/sessions/amaterus.desktop -debian/tmp/opt/trinity/share/apps/tdm/sessions/asclassic.desktop -debian/tmp/opt/trinity/share/apps/tdm/sessions/ctwm.desktop -debian/tmp/opt/trinity/share/apps/tdm/sessions/evilwm.desktop -debian/tmp/opt/trinity/share/apps/tdm/sessions/flwm.desktop -debian/tmp/opt/trinity/share/apps/tdm/sessions/lwm.desktop -debian/tmp/opt/trinity/share/apps/tdm/sessions/matchbox.desktop -debian/tmp/opt/trinity/share/apps/tdm/sessions/mwm.desktop -debian/tmp/opt/trinity/share/apps/tdm/sessions/olvwm.desktop -debian/tmp/opt/trinity/share/apps/tdm/sessions/olwm.desktop -debian/tmp/opt/trinity/share/apps/tdm/sessions/oroborus.desktop -debian/tmp/opt/trinity/share/apps/tdm/sessions/pwm.desktop -debian/tmp/opt/trinity/share/apps/tdm/sessions/twm.desktop -debian/tmp/opt/trinity/share/apps/tdm/sessions/ude.desktop -debian/tmp/opt/trinity/share/apps/tdm/sessions/vtwm.desktop -debian/tmp/opt/trinity/share/apps/tdm/sessions/wm2.desktop -debian/tmp/opt/trinity/share/apps/tdm/themes/circles/background.svg -debian/tmp/opt/trinity/share/apps/tdm/themes/circles/circles.xml -debian/tmp/opt/trinity/share/apps/tdm/themes/circles/flower.png -debian/tmp/opt/trinity/share/apps/tdm/themes/circles/GdmGreeterTheme.desktop -debian/tmp/opt/trinity/share/apps/tdm/themes/circles/help.png -debian/tmp/opt/trinity/share/apps/tdm/themes/circles/options.png -debian/tmp/opt/trinity/share/apps/tdm/themes/circles/screenshot.png -debian/tmp/opt/trinity/share/apps/tdm/themes/o2_enterprise -debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/common -debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/index.docbook -debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/tdmrc-ref.docbook diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.links b/ubuntu/maverick/tdebase/debian/kdm-trinity.links deleted file mode 100644 index d39f29e96..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.links +++ /dev/null @@ -1 +0,0 @@ -opt/trinity/share/apps/tdm/pics/users/default1.png opt/trinity/share/apps/tdm/faces/.default.face diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.logrotate b/ubuntu/maverick/tdebase/debian/kdm-trinity.logrotate deleted file mode 100644 index 990e7c479..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/tdm-trinity.log { - rotate 7 - daily - compress - delaycompress - copytruncate - missingok - notifempty -} diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.manpages b/ubuntu/maverick/tdebase/debian/kdm-trinity.manpages deleted file mode 100644 index 690a0f462..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.manpages +++ /dev/null @@ -1,6 +0,0 @@ -debian/man/gentdmconf-trinity.1 -debian/man/tdm-trinity.1 -debian/man/tdm_config-trinity.1 -debian/man/tdmctl-trinity.1 -debian/man/tdm_greet-trinity.1 -debian/man/krootimage-trinity.1 diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.pam b/ubuntu/maverick/tdebase/debian/kdm-trinity.pam deleted file mode 100644 index d40a52277..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.pam +++ /dev/null @@ -1,11 +0,0 @@ -# -# /etc/pam.d/tdm-trinity - specify the PAM behaviour of tdm -# -auth required pam_nologin.so -auth required pam_env.so readenv=1 -auth required pam_env.so readenv=1 envfile=/etc/default/locale -@include common-auth -session required pam_limits.so -@include common-account -@include common-password -@include common-session diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.postinst b/ubuntu/maverick/tdebase/debian/kdm-trinity.postinst deleted file mode 100644 index 5f1aab168..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.postinst +++ /dev/null @@ -1,125 +0,0 @@ -#! /bin/sh - -set -e - -# source debconf library -. /usr/share/debconf/confmodule - -# debconf is not a registry, so we only fiddle with the default file if it -# does not exist -DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager -if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then - DEFAULT_DISPLAY_MANAGER= - if db_get shared/default-x-display-manager; then - DEFAULT_DISPLAY_MANAGER="$RET" - fi - if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then - DAEMON_NAME= - if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then - DAEMON_NAME="$RET" - fi - if [ ! -n "$DAEMON_NAME" ]; then - # if we were unable to determine the name of the selected daemon (for - # instance, if the selected default display manager doesn't provide a - # daemon_name question), guess - DAEMON_NAME=$(which "$DEFAULT_DISPLAY_MANAGER" 2>/dev/null) - if [ ! -n "$DAEMON_NAME" ]; then - echo . - # FIXME - redo this part uses shell-lib.sh from xfree86 - #warn "unable to determine path to default X display manager" \ - # "$DEFAULT_DISPLAY_MANAGER; not updating" \ - # "$DEFAULT_DISPLAY_MANAGER_FILE" - fi - fi - if [ -n "$DAEMON_NAME" ]; then - # FIXME - redo this part uses shell-lib.sh from xfree86 - #observe "committing change of default X display manager" - echo "$DAEMON_NAME" > "$DEFAULT_DISPLAY_MANAGER_FILE" - fi - fi -fi - -# remove the displaced old default display manager file if it exists -if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then - rm "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" -fi - -# restarting the daemon may cause output to stdout -db_stop - -# don't start tdm if we are upgrading without stopping it -NOSTART= -if [ -e /var/run/tdm-trinity.upgrade ]; then - NOSTART=yes -fi -# or if we're currently in X on the display it attempts to manage by default -for HOST in "" \ - "localhost" \ - "$(hostname 2> /dev/null)" \ - "$(hostname -f 2> /dev/null)"; do - if echo "$DISPLAY" | grep -q "^$HOST:0.*"; then - NOSTART=yes - break - fi -done -# or if it's already running -if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/tdm.pid --name tdm-trinity; then - NOSTART=yes -fi -# or if the options file says not to -if ! grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options; then - NOSTART=yes -fi - - -# md5sum of the stock Xservers shipped with KDE 3.3.2, which shipped with Sarge -SARGEXSERVERS=d3ab063f564492e0e31830f56ccd350e - -CONFIGLEVEL=`grep -s ^ConfigVersion= /etc/trinity/tdm/tdmrc | sed s/^ConfigVersion=//` - -if [ -e /etc/trinity/tdm/tdmrc ]; then - if dpkg --compare-versions "$CONFIGLEVEL" ge "2.3"; then - TDMRCUPDATED=yes - fi -fi - -if [ -e /etc/trinity/tdm/Xservers ]; then - if [ `md5sum /etc/trinity/tdm/Xservers | sed s/\ .*$//` = $SARGEXSERVERS ]; then - XSERVERSUNCHANGED=yes - fi -fi - -# With KDE 3.4, /etc/trinity/tdm/Xservers is no longer required, so we remove it, if -# the user has updated their tdmrc (if they haven't, tdm notices and keeps using -# Xservers), and if it wasn't touched, i.e. there are no local changes the user -# will want to merge into tdmrc. - -case "$1" in - - configure) - - if [ ! -z $TDMRCUPDATED ] && [ ! -z $XSERVERSUNCHANGED ]; then - echo "Removing obsolete /etc/trinity/tdm/Xservers (detected no user changes)." - rm -f /etc/trinity/tdm/Xservers - elif [ ! -z $TDMRCUPDATED ] && [ -e /etc/trinity/tdm/Xservers ]; then - echo "Note that /etc/trinity/tdm/Xservers is no longer used by TDM." - echo "You must merge your changes (if any) into /etc/trinity/tdm/tdmrc manually." - echo "Otherwise, /etc/trinity/tdm/Xservers is safe to remove." - fi - - rm -f /etc/init.d/tdm-trinity - ln -s /lib/init/upstart-job /etc/init.d/tdm-trinity - - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; - -esac - -exit 0 diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.postrm b/ubuntu/maverick/tdebase/debian/kdm-trinity.postrm deleted file mode 100644 index 3dfb32123..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.postrm +++ /dev/null @@ -1,38 +0,0 @@ -#! /bin/sh -e - -case "$1" in - purge) - rm -rf /var/log/tdm-trinity.log* - ;; - - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -if [ "$1" = "abort-install" -o "$1" = "abort-upgrade" ]; then - # roll back displacement of default display manager file - if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then - # FIXME - redo this part uses shell-lib.sh from xfree86 - #observe "rolling back change of default X display manager" - mv "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" "$DEFAULT_DISPLAY_MANAGER_FILE" - fi -fi - -if [ "$1" = "purge" ]; then - for DIR in /var/lib/tdm-trinity; do - if [ -d "$DIR" ]; then - rm -rf "$DIR" - fi - done - rm -f /var/log/tdm-trinity.log* -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.preinst b/ubuntu/maverick/tdebase/debian/kdm-trinity.preinst deleted file mode 100644 index 09163c460..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.preinst +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh -e - -case "$1" in - - upgrade) - rm -f /etc/trinity/debian/tdm-update-menu.sh - rm -f /etc/trinity/debian/tdm.options - rm -f /etc/trinity/tdm/pixmaps/XFree86bw.xpm - rm -f /etc/trinity/tdm/pixmaps/XFree86.xpm - rm -f /etc/trinity/tdm/Xresources - rm -f /etc/menu-methods/tdm - ;; - - install) - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; - -esac - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.prerm b/ubuntu/maverick/tdebase/debian/kdm-trinity.prerm deleted file mode 100644 index 1ca8de60e..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.prerm +++ /dev/null @@ -1,176 +0,0 @@ -#! /bin/sh -# prerm script for tdm-trinity -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -# debconf may not be available if some massive purging is going on -HAVE_DEBCONF= -if [ -e /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule - HAVE_DEBCONF=yes -fi - -case "$1" in - # we NEVER want to unconditionally stop tdm; see below - upgrade|failed-upgrade) - REMOVING= - ;; - - remove|deconfigure) - REMOVING=yes - rm -f /etc/init.d/tdm-trinity - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -STOP= -# are we supposed to restart on upgrade? if REMOVING tdm, we don't care what -# the user says, we have to stop the daemon -if grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options || - [ -n "$REMOVING" ]; then - # is there an tdm process running? - if start-stop-daemon --stop --quiet --signal 0 --name tdm-trinity; then - # any children? - PARENTS=$(pidof /usr/bin/tdm-trinity || true) - CHILDREN= - if [ -n "$PARENTS" ]; then - for PROCESS in $PARENTS; do - # make sure we got numbers back - [ $PROCESS -eq $PROCESS ] 2> /dev/null || - exit - # FIXME - redo this part uses shell-lib.sh from xfree86 - # die "pidof returned non-numeric value" - # we could use grep -q here if ps would ignore SIGPIPE :-P - if (ps axj | grep "^ *$PROCESS" > /dev/null 2>&1); then - CHILDREN=yes - fi - done - if [ -n "$CHILDREN" ]; then - if [ -n "$HAVE_DEBCONF" ]; then - # ask the question - db_input high tdm/stop_running_server_with_children || true - db_go - # what did the user say? - ANSWER= - if db_get tdm/stop_running_server_with_children; then - ANSWER="$RET" - fi - if [ "$ANSWER" = "true" ]; then - STOP=yes - fi - # forget that we have seen the question; this is the sort of - # non-configuration question that should be asked every time - db_fset tdm/stop_running_server_with_children seen false - fi - else - STOP=yes - fi - fi - fi -fi - -if [ -n "$STOP" ]; then - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d tdm-trinity stop || true - else - /etc/init.d/tdm-trinity stop || true - fi -else - if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ]; then - touch /var/run/tdm-trinity.upgrade - fi -fi - -DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager - -if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then - if [ -n "$HAVE_DEBCONF" ]; then - # disown this question - db_unregister shared/default-x-display-manager || true - # does the question still exist? - if db_get shared/default-x-display-manager; then - if db_metaget shared/default-x-display-manager owners; then - # FIXME - redo this part uses shell-lib.sh from xfree86 - #observe "X display managers now available are \"$OWNERS\"" - db_subst shared/default-x-display-manager choices "$RET" - fi - DEFAULT_DISPLAY_MANAGER= - if db_get shared/default-x-display-manager; then - DEFAULT_DISPLAY_MANAGER="$RET" - fi - # are we removing the currently selected display manager? - if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then - if [ "tdm-trinity" = "$DEFAULT_DISPLAY_MANAGER" ]; then - if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then - if db_get "$DEFAULT_DISPLAY_MANAGER/daemon_name"; then - # does the display manager file reference the current default? if - # so, remove it because it will now be wrong - if [ -n "$RET" ]; then - if [ "$(cat "$DEFAULT_DISPLAY_MANAGER_FILE")" = "$RET" ]; then - rm "$DEFAULT_DISPLAY_MANAGER_FILE" - fi - fi - fi - fi - # ask the user to choose a new default - db_fset shared/default-x-display-manager seen false - db_input critical shared/default-x-display-manager || true - db_go - # if the default display manager file doesn't exist, write it with - # the path to the new default display manager - if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then - DEFAULT_DISPLAY_MANAGER= - if db_get shared/default-x-display-manager; then - DEFAULT_DISPLAY_MANAGER="$RET" - fi - if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then - # FIXME - redo this part uses shell-lib.sh from xfree86 - #warn "new default display manager has been selected; please be" \ - # "sure to run \"dpkg-reconfigure $RET\" to ensure that it" \ - # "is configured" - DAEMON_NAME= - if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then - DAEMON_NAME="$RET" - fi - if [ ! -n "$DAEMON_NAME" ]; then - # if we were unable to determine the name of the selected daemon (for - # instance, if the selected default display manager doesn't provide a - # daemon_name question), guess - DAEMON_NAME=$(which "$DEFAULT_DISPLAY_MANAGER" 2>/dev/null) - if [ ! -n "$DAEMON_NAME" ]; then - echo . - # FIXME - redo this part uses shell-lib.sh from xfree86 - #warn "unable to determine path to default X display manager" \ - # "$DEFAULT_DISPLAY_MANAGER; not updating" \ - # "$DEFAULT_DISPLAY_MANAGER_FILE" - fi - fi - if [ -n "$DAEMON_NAME" ]; then - echo "$DAEMON_NAME" > "$DEFAULT_DISPLAY_MANAGER_FILE" - fi - fi - fi - fi - fi - fi - fi -fi - -exit 0 diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.templates b/ubuntu/maverick/tdebase/debian/kdm-trinity.templates deleted file mode 100644 index 564181f78..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.templates +++ /dev/null @@ -1,32 +0,0 @@ -Template: shared/default-x-display-manager -Type: select -Choices: ${choices} -_Description: Default display manager: - A display manager is a program that provides graphical login capabilities for - the X Window System. - . - Only one display manager can manage a given X server, but multiple display - manager packages are installed. Please select which display manager should - run by default. - . - Multiple display managers can run simultaneously if they are configured to - manage different servers; to achieve this, configure the display managers - accordingly, edit each of their init scripts in /etc/init.d, and disable the - check for a default display manager. - -Template: tdm-trinity/daemon_name -Type: string -Default: /opt/trinity/bin/tdm -Description: internal use only - This template is never shown to the user and does not require translation. - -Template: tdm-trinity/stop_running_server_with_children -Type: boolean -Default: false -_Description: Stop the tdm-trinity daemon? - The K Desktop manager (tdm-trinity) daemon is typically stopped on package upgrade - and removal, but it appears to be managing at least one running X session. - . - If tdm is stopped now, any X sessions it manages will be terminated. - Otherwise, the new version will take effect the next time the daemon - is restarted. diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.txt b/ubuntu/maverick/tdebase/debian/kdm-trinity.txt deleted file mode 100644 index c51d4aa73..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.txt +++ /dev/null @@ -1,189 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: x-display-manager tdm-trinity -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs -# Should-Start: console-screen -# Should-Stop: console-screen -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: X display manager for Trinity -# Description: TDM manages a collection of X servers, which may be on the local host or remote machines. -### END INIT INFO -# /etc/init.d/tdm-trinity: start or stop the X display manager -# Script originally stolen from the xdm package -# -# description: K Display Manager -# -set -e - -# To start tdm-trinity even if it is not the default display manager, change -# HEED_DEFAULT_DISPLAY_MANAGER to "false." -HEED_DEFAULT_DISPLAY_MANAGER=true -DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager - -TDEDIRS=/opt/trinity/ -PATH=/opt/trinity/bin:/bin:/usr/bin:/sbin:/usr/sbin -DAEMON=/opt/trinity/bin/tdm -PIDFILE=/var/run/tdm.pid -UPGRADEFILE=/var/run/tdm.upgrade - -# parameters to support tdm customization -TDMRC=/etc/trinity/tdm/tdmrc -BACKGROUNDRC=/etc/trinity/tdm/backgroundrc - -#if configuration is changed by tdmtheme or other tools, don't do magick -if grep -q "Theme=@@@ToBeReplacedByDesktopBase@@@" ${TDMRC} && grep -q "Wallpaper=default_blue.jpg" ${BACKGROUNDRC} -then - - - -TDMOVERRIDEDIR=/etc/default/tdm-trinity.d -TDMCFGDIR=/var/run/tdm-trinity -TDMCFG=$TDMCFGDIR/tdmrc -BACKGROUNDCFG=$TDMCFGDIR/backgroundrc - -test -x $DAEMON || exit 0 - -# uncomment, if you want auto-logon to be runlevel-dependant -#test "$runlevel" || { runlevel=`runlevel`; runlevel=${runlevel#* }; } -#test "$runlevel" = 4 && ARG=-autolog || ARG=-noautolog - -# uncomment, if you want tons of debug info in your syslog -#ARG="$ARG -debug 255" - -# we use an alternative tdm master configuration file -ARG="$ARG -config $TDMCFG" - -# we source overrides. run-parts sorts the list in a predictable order -if [ -d "$TDMOVERRIDEDIR" ]; then - for part in $(run-parts --list "$TDMOVERRIDEDIR" 2>/dev/null || true); do - . "$part" - done -fi - -# we generate tdm configuration files -gentdmconf --in $TDMCFGDIR 1> /dev/null - -# we update tdm configuration files (only overridden values) -[ -n "$USEBACKGROUND" ] && sed -i "s|^#\?UseBackground=.*|UseBackground=$USEBACKGROUND|" $TDMCFG -[ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $TDMCFG -[ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $TDMCFG -[ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $TDMCFG -[ -n "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG - - -fi -# autologin overrides are useful for live debian environment -if [ -n "$AUTOLOGINUSER" ]; then - sed -i "s|^#\?AutoLoginEnable=.*|AutoLoginEnable=true|" $TDMCFG - sed -i "s|^#\?AutoLoginUser=.*|AutoLoginUser=$AUTOLOGINUSER|" $TDMCFG -fi -[ -n "$AUTOLOGINDELAY" ] && sed -i "s|^#\?AutoLoginDelay=.*|AutoLoginDelay=$AUTOLOGINDELAY|" $TDMCFG -[ -n "$AUTOLOGINAGAIN" ] && sed -i "s|^#\?AutoLoginAgain=.*|AutoLoginAgain=$AUTOLOGINAGAIN|" $TDMCFG -[ -n "$AUTOLOGINLOCKED" ] && sed -i "s|^#\?AutoLoginLocked=.*|AutoLoginLocked=$AUTOLOGINLOCKED|" $TDMCFG - -# If we upgraded the daemon, we can't use the --exec argument to -# start-stop-daemon since the inode will have changed. The risk here is that -# in a situation where the daemon died, its pidfile was not cleaned up, and -# some other process is now running under that pid, start-stop-daemon will send -# signals to an innocent process. However, this seems like a corner case. -# C'est la vie! -if [ -e $UPGRADEFILE ]; then - SSD_ARGS="--pidfile $PIDFILE --startas $DAEMON" -else - SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON" -fi - -stillrunning () { - if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then - true - else - # if the daemon does not remove its own pidfile, we will - rm -f $PIDFILE $UPGRADEFILE - false - fi; -} - -case "$1" in - start) - if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] && - [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && - [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then - echo "Not starting K Display Manager (tdm-trinity); it is not the default display manager." - else - echo -n "Starting K Display Manager: tdm-trinity" - start-stop-daemon --start --quiet $SSD_ARGS -- $ARG || echo -n " already running" - echo "." - fi - ;; - - restart) - /etc/init.d/tdm-trinity stop - if [ -f $PIDFILE ]; then - if stillrunning; then - exit 1 - fi - fi - /etc/init.d/tdm-trinity start - ;; - - reload) - echo -n "Reloading K Display Manager configuration..." - if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then - echo "done." - else - echo "tdm-trinity not running." - fi - ;; - - force-reload) - /etc/init.d/tdm-trinity reload - ;; - - stop) - echo -n "Stopping K Display Manager: tdm-trinity" - if [ ! -f $PIDFILE ]; then - echo " not running ($PIDFILE not found)." - exit 0 - else - DAEMONPID=$(cat $PIDFILE | tr -d '[:blank:]') - KILLCOUNT=1 - if [ ! -e $UPGRADEFILE ]; then - if start-stop-daemon --stop --quiet $SSD_ARGS; then - # give tdm's signal handler a second to catch its breath - sleep 1 - else - echo -n " not running" - fi - fi - while [ $KILLCOUNT -le 5 ]; do - if stillrunning; then - kill $DAEMONPID - else - break - fi - sleep 1 - KILLCOUNT=$(( $KILLCOUNT + 1 )) - done - if stillrunning; then - echo -n " not responding to TERM signal (pid $DAEMONPID)" - else - rm -f $UPGRADEFILE - fi - fi - echo "." - - # Launches usplash on shutdown - if ( `grep -q '\( \|^\)splash\( \|$\)' /proc/cmdline` && `which usplash_down >/dev/null` ) ; then - usplash_down - fi - ;; - - *) - echo "Usage: /etc/init.d/tdm-trinity {start|stop|restart|reload|force-reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/ubuntu/maverick/tdebase/debian/local/kdm.options b/ubuntu/maverick/tdebase/debian/local/kdm.options deleted file mode 100644 index 05725ae34..000000000 --- a/ubuntu/maverick/tdebase/debian/local/kdm.options +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/trinity/tdm/tdm.options -# -# configuration options for tdm -# See tdm.options(5) for an explanation of the available options. - -no-ignore-nologin -no-restart-on-upgrade -use-sessreg diff --git a/ubuntu/maverick/tdebase/debian/local/kdm.options.5 b/ubuntu/maverick/tdebase/debian/local/kdm.options.5 deleted file mode 100644 index 446271273..000000000 --- a/ubuntu/maverick/tdebase/debian/local/kdm.options.5 +++ /dev/null @@ -1,87 +0,0 @@ -.\" $Id: tdm.options.5,v 1.2 2004/02/27 22:45:20 ccheney Exp $ -.\" -.\" Copyright 1998, 2002, 2003 Branden Robinson . -.\" -.\" This is free software; you may redistribute it and/or modify -.\" it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; version 2. -.\" -.\" This is distributed in the hope that it will be useful, but -.\" WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License with -.\" the Debian operating system, in /usr/share/common-licenses/GPL; if -.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, -.\" Suite 330, Boston, MA 02111-1307 USA -.TH tdm.options 5 "2003\-09\-18" "Debian Project" -.SH NAME -tdm.options \- configuration options for X display manager -.SH DESCRIPTION -.I /etc/trinity/tdm/tdm.options -contains a set of flags that determine some of the behavior of the -X display manager -.BR tdm (1). -.PP -.I /etc/trinity/tdm/tdm.options -may contain comments, which begin with a hash mark and end at the next -newline, just like comments in shell scripts. The rest of the file -consists of options which are expressed as words separated by hyphens, with -only one option per line. If an option is present with the \(oqno\-\(cq -prefix, or absent, it is disabled, otherwise it is considered enabled. -.PP -Available options are: -.TP -.B ignore\-nologin -Normally, the contents of the /etc/nologin file will be displayed using -.BR xmessage (1x) -(if -.B xmessage -is available), and the user will be returned to the tdm login screen after -the xmessage is dismissed. If this option is enabled, tdm starts a session -as usual (after the xmessage is dismissed, if xmessage is available). -.TP -.B restart\-on\-upgrade -Enable this option with caution on \(oqproduction\(cq machines; it causes -the tdm daemon to be stopped and restarted on upgrade, even if the process -has children (which means it is managing X sessions). Typically when a -package that contains a daemon is being installed or upgraded, its -maintainer scripts stop a running daemon process before installing the new -binary, and restart it after the new binary is installed. Stopping tdm -causes immediate termination of any sessions it manages; in some situations -this could be an unwelcome surprise (for instance, for remote tdm users who -had no idea the administrator was performing system maintenance). On the -other hand, for machines that stay up for long periods of time, leaving the -old daemon running can be a bad idea if the new version has, for instance, -a fix for a security vulnerability (overwriting tdm's executable on the -file system has no effect on the copy of tdm in memory). The tdm -pre\-removal script checks to see if the tdm process has any children; if -it does, it is possible that someone's session would be killed by stopping -tdm, so a warning is issued and an opportunity to abort the upgrade of tdm -is provided. If this option is disabled (the Debian default), tdm will be -not be stopped or started during an install or upgrade; the administrator -will have to do so by hand (with \(oq/etc/init.d/tdm restart\(cq, or by -rebooting the system) before the newly installed tdm binary is used. -.TP -.B use\-sessreg -If this option is enabled (the Debian default), the sessreg program will be -invoked to register X sessions managed by tdm in the utmp and wtmp files. -Otherwise, it is not, and the utmp and wtmp files will have no record of -tdm sessions. -.PP -Users of older versions of the Debian system should note that the -\(oqrun\-xconsole\(cq option has been removed. Shell scripts named -.I /etc/trinity/tdm/Xsetup -and -.I /etc/trinity/tdm/Xreset -can be edited to disable or modify the running of xconsole on the tdm -greeter screen; see the -.B tdm -manual page for more information. -.SH AUTHOR -This manpage was written by Branden Robinson for the Debian Project. -.SH SEE ALSO -.BR sessreg (1x), -.BR xmessage (1x), -.BR tdm (1x) diff --git a/ubuntu/maverick/tdebase/debian/local/tdm.options b/ubuntu/maverick/tdebase/debian/local/tdm.options new file mode 100644 index 000000000..05725ae34 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/local/tdm.options @@ -0,0 +1,8 @@ +# /etc/trinity/tdm/tdm.options +# +# configuration options for tdm +# See tdm.options(5) for an explanation of the available options. + +no-ignore-nologin +no-restart-on-upgrade +use-sessreg diff --git a/ubuntu/maverick/tdebase/debian/local/tdm.options.5 b/ubuntu/maverick/tdebase/debian/local/tdm.options.5 new file mode 100644 index 000000000..446271273 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/local/tdm.options.5 @@ -0,0 +1,87 @@ +.\" $Id: tdm.options.5,v 1.2 2004/02/27 22:45:20 ccheney Exp $ +.\" +.\" Copyright 1998, 2002, 2003 Branden Robinson . +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; version 2. +.\" +.\" This is distributed in the hope that it will be useful, but +.\" WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License with +.\" the Debian operating system, in /usr/share/common-licenses/GPL; if +.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, +.\" Suite 330, Boston, MA 02111-1307 USA +.TH tdm.options 5 "2003\-09\-18" "Debian Project" +.SH NAME +tdm.options \- configuration options for X display manager +.SH DESCRIPTION +.I /etc/trinity/tdm/tdm.options +contains a set of flags that determine some of the behavior of the +X display manager +.BR tdm (1). +.PP +.I /etc/trinity/tdm/tdm.options +may contain comments, which begin with a hash mark and end at the next +newline, just like comments in shell scripts. The rest of the file +consists of options which are expressed as words separated by hyphens, with +only one option per line. If an option is present with the \(oqno\-\(cq +prefix, or absent, it is disabled, otherwise it is considered enabled. +.PP +Available options are: +.TP +.B ignore\-nologin +Normally, the contents of the /etc/nologin file will be displayed using +.BR xmessage (1x) +(if +.B xmessage +is available), and the user will be returned to the tdm login screen after +the xmessage is dismissed. If this option is enabled, tdm starts a session +as usual (after the xmessage is dismissed, if xmessage is available). +.TP +.B restart\-on\-upgrade +Enable this option with caution on \(oqproduction\(cq machines; it causes +the tdm daemon to be stopped and restarted on upgrade, even if the process +has children (which means it is managing X sessions). Typically when a +package that contains a daemon is being installed or upgraded, its +maintainer scripts stop a running daemon process before installing the new +binary, and restart it after the new binary is installed. Stopping tdm +causes immediate termination of any sessions it manages; in some situations +this could be an unwelcome surprise (for instance, for remote tdm users who +had no idea the administrator was performing system maintenance). On the +other hand, for machines that stay up for long periods of time, leaving the +old daemon running can be a bad idea if the new version has, for instance, +a fix for a security vulnerability (overwriting tdm's executable on the +file system has no effect on the copy of tdm in memory). The tdm +pre\-removal script checks to see if the tdm process has any children; if +it does, it is possible that someone's session would be killed by stopping +tdm, so a warning is issued and an opportunity to abort the upgrade of tdm +is provided. If this option is disabled (the Debian default), tdm will be +not be stopped or started during an install or upgrade; the administrator +will have to do so by hand (with \(oq/etc/init.d/tdm restart\(cq, or by +rebooting the system) before the newly installed tdm binary is used. +.TP +.B use\-sessreg +If this option is enabled (the Debian default), the sessreg program will be +invoked to register X sessions managed by tdm in the utmp and wtmp files. +Otherwise, it is not, and the utmp and wtmp files will have no record of +tdm sessions. +.PP +Users of older versions of the Debian system should note that the +\(oqrun\-xconsole\(cq option has been removed. Shell scripts named +.I /etc/trinity/tdm/Xsetup +and +.I /etc/trinity/tdm/Xreset +can be edited to disable or modify the running of xconsole on the tdm +greeter screen; see the +.B tdm +manual page for more information. +.SH AUTHOR +This manpage was written by Branden Robinson for the Debian Project. +.SH SEE ALSO +.BR sessreg (1x), +.BR xmessage (1x), +.BR tdm (1x) diff --git a/ubuntu/maverick/tdebase/debian/man/genkdmconf-trinity.1 b/ubuntu/maverick/tdebase/debian/man/genkdmconf-trinity.1 deleted file mode 100644 index ce3c46d8b..000000000 --- a/ubuntu/maverick/tdebase/debian/man/genkdmconf-trinity.1 +++ /dev/null @@ -1,91 +0,0 @@ -.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH GENTDMCONF 1 "June 2006" "K Desktop Environment" "generate configuration files for tdm" -.SH NAME -gentdmconf -\- generate configuration files for tdm -.SH SYNOPSIS -\fBgentdmconf\fP -.RB [ \-\-in -.IR /path/to/new/tdm\-config\-dir ] -.RS 11 -.RB [ \-\-old\-xdm -.IR /path/to/old/xdm\-dir ] -.br -.RB [ \-\-old\-kde -.IR /path/to/old/kde\-config\-dir ] -.br -.RB [ \-\-no\-old ] -.RB [ \-\-no\-old\-xdm ] -.RB [ \-\-no\-old\-kde ] -.RB [ \-\-old\-scripts ] -.br -.RB [ \-\-no\-old\-scripts ] -.RB [ \-\-old\-confs ] -.RB [ \-\-no\-backup ] -.br -.RB [ \-\-no\-in\-notice ] -.RE - -.SH DESCRIPTION -\fBgentdmconf\fP is used to generate configuration files for \fBtdm\fP. -.br -If an older xdm/tdm configuration is found, its config files are "absorbed"; -if it lives in the new target directory, its scripts are reused (and possibly -modified) as well, otherwise the scripts are ignored and default scripts are -installed. -.SH OPTIONS -.TP -.BI \-\-in \ /path/to/new/tdm\-config\-dir -In which directory to put the new configuration. You can use this to support a $(DESTDIR), but not to change the final location of the installation \- the paths inside the files are not affected. -.br -Default is \fI/etc/trinity/tdm\fP. -.TP -.BI \-\-old\-xdm \ /path/to/old/xdm\-dir -Where to look for the config files of an \fBxdm\fP / older \fBtdm\fP. Default is to scan -.IR /etc/X11/tdm , \ $XLIBDIR/tdm , \ /etc/X11/xdm , \ $XLIBDIR/xdm ; -there in turn look for \fItdm\-config\fP and \fIxdm\-config\fP. -.br -Note that you possibly need to use \fB\-\-no\-old\-kde\fP to make this take effect. -.TP -.BI \-\-old\-kde \ /path/to/old/kde\-config\-dir -Where to look for the \fItdmrc\fP of an older \fBtdm\fP. -.br -.RI Default\ is\ to\ scan\ /etc/trinity \ and\ { /usr,/usr/local , -.RI { /opt,/usr/local }{ trinity,kde,kde2,kde1 }} /share/config . -.TP -.B \-\-no\-old -Don't look at older xdm/tdm configurations, just create default config. -.TP -.B \-\-no\-old\-xdm -Don't look at older xdm configurations. -.TP -.B \-\-no\-old\-kde -Don't look at older tdm configurations. -.TP -.B \-\-old\-scripts -Directly use all scripts from the older xdm/tdm configuration. -.TP -.B \-\-no\-old\-scripts -Don't use scripts from the older xdm/tdm configuration even if it lives in the new target directory. -.TP -.B \-\-old\-confs -Directly use all ancillary config files from the older xdm/tdm configuration. This is usually a bad idea. -.TP -.B \-\-no\-backup -Overwrite/delete old config files instead of backing them up. -.TP -.B \-\-no\-in\-notice -Don't put the notice about \fB\-\-in\fP being used into the generated README. -.SH SEE ALSO -.BR tdm (1) -.SH AUTHORS -.nf -Oswald Buddenhagen - -.br -.fi -Please use http://bugs.kde.org to report bugs; do not mail the author directly. -.PP -This manual page was written by Holger Hartmann for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. -.PP -On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/ubuntu/maverick/tdebase/debian/man/gentdmconf-trinity.1 b/ubuntu/maverick/tdebase/debian/man/gentdmconf-trinity.1 new file mode 100644 index 000000000..ce3c46d8b --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/man/gentdmconf-trinity.1 @@ -0,0 +1,91 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH GENTDMCONF 1 "June 2006" "K Desktop Environment" "generate configuration files for tdm" +.SH NAME +gentdmconf +\- generate configuration files for tdm +.SH SYNOPSIS +\fBgentdmconf\fP +.RB [ \-\-in +.IR /path/to/new/tdm\-config\-dir ] +.RS 11 +.RB [ \-\-old\-xdm +.IR /path/to/old/xdm\-dir ] +.br +.RB [ \-\-old\-kde +.IR /path/to/old/kde\-config\-dir ] +.br +.RB [ \-\-no\-old ] +.RB [ \-\-no\-old\-xdm ] +.RB [ \-\-no\-old\-kde ] +.RB [ \-\-old\-scripts ] +.br +.RB [ \-\-no\-old\-scripts ] +.RB [ \-\-old\-confs ] +.RB [ \-\-no\-backup ] +.br +.RB [ \-\-no\-in\-notice ] +.RE + +.SH DESCRIPTION +\fBgentdmconf\fP is used to generate configuration files for \fBtdm\fP. +.br +If an older xdm/tdm configuration is found, its config files are "absorbed"; +if it lives in the new target directory, its scripts are reused (and possibly +modified) as well, otherwise the scripts are ignored and default scripts are +installed. +.SH OPTIONS +.TP +.BI \-\-in \ /path/to/new/tdm\-config\-dir +In which directory to put the new configuration. You can use this to support a $(DESTDIR), but not to change the final location of the installation \- the paths inside the files are not affected. +.br +Default is \fI/etc/trinity/tdm\fP. +.TP +.BI \-\-old\-xdm \ /path/to/old/xdm\-dir +Where to look for the config files of an \fBxdm\fP / older \fBtdm\fP. Default is to scan +.IR /etc/X11/tdm , \ $XLIBDIR/tdm , \ /etc/X11/xdm , \ $XLIBDIR/xdm ; +there in turn look for \fItdm\-config\fP and \fIxdm\-config\fP. +.br +Note that you possibly need to use \fB\-\-no\-old\-kde\fP to make this take effect. +.TP +.BI \-\-old\-kde \ /path/to/old/kde\-config\-dir +Where to look for the \fItdmrc\fP of an older \fBtdm\fP. +.br +.RI Default\ is\ to\ scan\ /etc/trinity \ and\ { /usr,/usr/local , +.RI { /opt,/usr/local }{ trinity,kde,kde2,kde1 }} /share/config . +.TP +.B \-\-no\-old +Don't look at older xdm/tdm configurations, just create default config. +.TP +.B \-\-no\-old\-xdm +Don't look at older xdm configurations. +.TP +.B \-\-no\-old\-kde +Don't look at older tdm configurations. +.TP +.B \-\-old\-scripts +Directly use all scripts from the older xdm/tdm configuration. +.TP +.B \-\-no\-old\-scripts +Don't use scripts from the older xdm/tdm configuration even if it lives in the new target directory. +.TP +.B \-\-old\-confs +Directly use all ancillary config files from the older xdm/tdm configuration. This is usually a bad idea. +.TP +.B \-\-no\-backup +Overwrite/delete old config files instead of backing them up. +.TP +.B \-\-no\-in\-notice +Don't put the notice about \fB\-\-in\fP being used into the generated README. +.SH SEE ALSO +.BR tdm (1) +.SH AUTHORS +.nf +Oswald Buddenhagen + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/ubuntu/maverick/tdebase/debian/man/kdm-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kdm-trinity.1 deleted file mode 100644 index 4add90a82..000000000 --- a/ubuntu/maverick/tdebase/debian/man/kdm-trinity.1 +++ /dev/null @@ -1,116 +0,0 @@ -.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH TDM 1 "June 2006" "K Desktop Environment" "KDE Display Manager" -.SH NAME -tdm -\- KDE Display Manager -.SH SYNOPSIS -\fBtdm\fP [options] [tty] -.SH DESCRIPTION -\fBtdm\fP is the KDE display manager also known as login manager. It shows a graphical login screen for username and password. After authenticating the user it starts a session. -.br -\fBtdm\fP can be configured for remote login via XDMCP. XDMCP is the "X Display Manager Control Protocol" which is used to set up connections between remote systems over the network. -.sp 1 -\fBtdm\fP is a derivative of \fBxdm\fP. \fBman 1 xdm\fP may provide useful information (requires installed \fBxdm\fP). For X-related problems try \fBman 7x X\fP and \fBman 1 startx\fP. -.SH OPTIONS -.TP -.B \-daemon -Daemonize even when started by init -.TP -.B \-nodaemon -Don't daemonize even when started from command line -.TP -.BI \-config\ file -Use alternative master configuration file -.TP -.BR \-xrm \ res -Override frontend\-specific resource -.TP -.BI \-error\ file -Use alternative log file -.TP -.BR \-debug \ num -Debug option bitfield: -.RS 11 -0x1 \- core log -.br -0x2 \- config reader log -.br -0x4 \- greeter log -.br -0x8 \- IPC log -.br -0x10 \- session sub-daemon post-fork delay -.br -0x20 \- config reader post-start delay -.br -0x40 \- greeter post-start delay -.br -0x80 \- don't use syslog -.br -0x100 \- core Xauth log -.br -0x400 \- valgrind config reader and greeter -.br -0x800 \- strace config reader and greeter -.RE -.SH FILES -.TP -.I /etc/trinity/tdm/backgroundrc -configuration file with background settings -.TP -.I /etc/trinity/tdm/tdm.options -options for X display manager tdm -.TP -.I /etc/trinity/tdm/tdmrc -the tdm configuration file -.TP -.I /etc/trinity/tdm/Xaccess -access control file for XDMCP connections -.TP -.I /etc/trinity/tdm/Xservers -list of local X-servers -.TP -.I /etc/trinity/tdm/Xreset -script to run as root after session exits -.TP -.I /etc/trinity/tdm/Xsession -script to run as user after login of user -.TP -.I /etc/trinity/tdm/Xsetup -script to run as root before the login dialog appears -.sp 1 -this script can be edited to disable or modify the running of \fBxconsole\fP on the tdm greeter screen -.TP -.I /etc/trinity/tdm/Xstartup -script to run as root before session starts -.TP -.I /etc/trinity/tdm/Xwilling -output of this script is displayed in the chooser window -.SH SEE ALSO -.BR tdm.options (5),\ tdmctl (1),\ tdm_config (1),\ tdm_greet (1),\ startx (1),\ X (7x),\ xconsole (1),\ xdm (1) -.TP -.I /opt/trinity/share/doc/tdm/README.gz -Information about \fBtdm\fP and its options -.sp 1 -.RE -Full user documentation is available through the KDE Help Center. You can also enter the URL -.BR help:/tdm/ -directly into konqueror or you can run -.BR "khelpcenter help:/tdm/" -from the command\-line. -.br -.SH AUTHORS -.nf -Steffen Hansen -.br -Thomas Tanghus -.br -Oswald Buddenhagen - -.br -.fi -Please use http://bugs.kde.org to report bugs; do not mail the authors directly. -.PP -This manual page was written by Holger Hartmann for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. -.PP -On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/ubuntu/maverick/tdebase/debian/man/kdm_config-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kdm_config-trinity.1 deleted file mode 100644 index d9325214a..000000000 --- a/ubuntu/maverick/tdebase/debian/man/kdm_config-trinity.1 +++ /dev/null @@ -1,22 +0,0 @@ -.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH TDM_CONFIG 1 "June 2006" "K Desktop Environment" "helper program" -.SH NAME -tdm_config -\- helper programm for tdm to read configuration files -.SH SYNOPSIS -\fBtdm_config\fP -.SH DESCRIPTION -\fBtdm_config\fP is a helper program for \fBtdm\fP to read configuration files. -.SH SEE ALSO -\fBtdm\fP(1) -.SH AUTHORS -.nf -Oswald Buddenhagen - -.br -.fi -Please use http://bugs.kde.org to report bugs; do not mail the author directly. -.PP -This manual page was written by Holger Hartmann for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. -.PP -On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/ubuntu/maverick/tdebase/debian/man/kdm_greet-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kdm_greet-trinity.1 deleted file mode 100644 index c33f57d5f..000000000 --- a/ubuntu/maverick/tdebase/debian/man/kdm_greet-trinity.1 +++ /dev/null @@ -1,22 +0,0 @@ -.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH TDM_GREET 1 "June 2006" "K Desktop Environment" "KDE greeter module" -.SH NAME -tdm_greet -\- KDE greeter module for tdm -.SH SYNOPSIS -\fBtdm_greet\fP -.SH DESCRIPTION -\fBtdm_greet\fP is a KDE greeter module for \fBtdm\fP. It shows the login dialog. -.SH SEE ALSO -.BR tdm (1) -.SH AUTHORS -.nf -Oswald Buddenhagen - -.br -.fi -Please use http://bugs.kde.org to report bugs; do not mail the author directly. -.PP -This manual page was written by Holger Hartmann for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. -.PP -On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/ubuntu/maverick/tdebase/debian/man/kdmctl-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kdmctl-trinity.1 deleted file mode 100644 index a1a0bb622..000000000 --- a/ubuntu/maverick/tdebase/debian/man/kdmctl-trinity.1 +++ /dev/null @@ -1,220 +0,0 @@ -.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH TDMCTL 1 "June 2006" "K Desktop Environment" "TDM remote control application" -.SH NAME -tdmctl -\- tdm remote control application -.SH SYNOPSIS -\fBtdmctl\fP [options] [command [command arguments]] -.SH DESCRIPTION -\fBtdmctl\fP is an application to remote\-control \fBtdm\fP. It makes use of UNIX domain sockets. -.sp 1 -There are two types of sockets: the global one (dmctl) and the per\-display ones (dmctl\-). The global one's subdir is owned by root, the subdirs of the per\-display ones' are owned by the user currently owning the session (root or the logged in user). -.sp 1 -The directory in which the sockets are located is determined this way: -.RS 3 -\- the \fB\-s\fP option is examined -.br -\- the $DM_CONTROL variable is examined -.br -\- the tdm config file is searched for the FifoDir key -.br -.RI \- /var/run/xdmctl \ and\ /var/run \ are\ tried -.RE -.sp 1 -If $DISPLAY is set (or \fB\-d\fP was specified) and \fB\-g\fP was not specified, the -display\-specific control socket will be used, otherwise the global one. -.sp 1 -Tokens in the command and the reply are tab\-separated. -Command arguments can be specified as separate command line parameters, -in which case they are simply concatenated with tabs in between. -.sp 1 -If the command is '\-', \fBtdmctl\fP reads commands from stdin. -The default command is 'caps'. -.SH OPTIONS -.SS -.SS Options: -.TP -.B \-h \-help -print help message. -.TP -.B \-g \-global -Use global control socket even if $DISPLAY is set -.TP -.B \-d \-display -Override $DISPLAY -.TP -.B \-s \-sockets -Override $DM_CONTROL -.TP -.B \-c \-config -Use alternative tdm config file -.SS Commands: -.br -.SS Global commands: -.TP -.B login -display (now|schedule) user password [session_arguments] -.br - login user at specified display. if "now" is specified, a possibly running session is killed, otherwise the login is done after the session exits. -.br -session_arguments are printf\-like escaped contents for \fI.dmrc\fP. Unlisted keys will default to previously saved values. -.SS Per\-display commands: -.TP -.B lock -The display is marked as locked. If the X\-Server crashes in this state, no auto\-relogin will be performed even if the option is on. -.TP -.B unlock -Reverse the effect of "lock": re\-enable auto\-relogin. -.TP -.B suicide -The currently running session is forcibly terminated. No auto\-relogin is attempted, but a scheduled "login" command will be executed. -.SS Commands for all sockets: -.TP -.B caps -Returns a list of this socket's capabilities: -.IP " \- tdm" -identifies tdm, in case some other DM implements this protocol, too. -.IP " \- list, activate, lock, suicide, login" -the respective command is supported. -.IP " \- bootoptions" -the "listbootoptions" command and the "=" option to "shutdown" are supported. -.IP " \- shutdown " -"shutdown" is supported and allowed to the listed users (comma\-separated). "*" means all authenticated users. -.IP " \- shutdown" -"shutdown" is supported and allowed to everybody. -.IP " \- nuke " -forced shutdown is allowed to the listed users. -.IP " \- nuke" -forced shutdown is allowed to everybody. -.IP " \- reserve " -reserve displays are configured and are available at this time. -.TP -\fBlist\fP [all|alllocal] -.br -Return a list of running sessions. By default all active sessions are listed. If "all" is specified, passive sessions are listed as well. If "alllocal" is specified, passive sessions are listed as well, but all incoming remote sessions are skipped. -.sp 1 -Each session entry is a comma\-separated tuple of: -.RS 7 -\- Display or TTY name -.br -\- VT name for local sessions -.br -\- Logged in user's name, empty for passive sessions and outgoing -.br - remote sessions (local chooser mode) -.br -\- Session type or remote host for outgoing remote sessions, -.br - empty for passive sessions -.br -\- A flag field: -.RS 5 -\- "t" for tty sessions -.br -\- "*" for the display belonging to the requesting socket -.br -\- "!" for sessions that cannot be killed by the requesting -.br - socket -.br -\- New flags might be added later -.br -.RE -\- New fields might be added later -.RE -.TP -\fBreserve\fP [timeout in seconds] -.br -Start a reserve login screen. If nobody logs in within the specified amount of time (one minute by default), the display is removed again. When the session on the display exits, the display is removed, too. -.br -Permitted only on sockets of local displays and the global socket. -.TP -\fBactivate\fP (vt|display) -.br -Switch to a particular VT (virtual terminal). The VT may be specified either directly (e.g., vt3) or by a display using it (e.g., :2). -.br -Permitted only on sockets of local displays and the global socket. -.TP -.B listbootoptions -List available boot options. -.br -=> "ok" list default current default and current are indices into the list and are \-1 if unset or undeterminable. -.TP -\fBshutdown\fP (reboot|halt) [=bootchoice] -.br - (ask|trynow|forcenow|schedule|start -.br - (\-1|end (force|forcemy|cancel))) -.br -.RS 7 -Request a system shutdown, either a reboot or a halt/poweroff. -.sp 1 -An OS choice for the next boot may be specified from the list returned by "listbootoptions". -.sp 1 -Shutdowns requested from per\-display sockets are executed when the current session on that display exits. Such a request may pop up a dialog asking for confirmation and/or authentication. -.sp 1 -start is the time for which the shutdown is scheduled. If it starts with a plus\-sign, the current time is added. Zero means immediately. -.sp 1 -end is the latest time at which the shutdown should be performed if active sessions are still running. If it starts with a plus\-sign, the start time is added. Minus one means wait infinitely. If end is through and active sessions are still running, \fBTDM\fP can do one of the following: -.RS 3 -- "cancel" \- give up the shutdown. -.br -- "force" \- shut down nonetheless. -.br -- "forcemy" \- shut down nonetheless if all active sessions -.br - belong to the requesting user. Only for per\-display sockets. -.RE -.sp 1 -start and end are specified in seconds since the UNIX epoch. -.sp 1 -"trynow" is a synonym for "0 0 cancel", "forcenow" for "0 0 force" and "schedule" for "0 \-1". -.sp 1 -"ask" attempts an immediate shutdown and interacts with the user if active sessions are still running. Only for per\-display sockets. -.RE -.TP -\fBshutdown cancel\fP [local|global] -.br -Cancel a scheduled shutdown. The global socket always cancels the currently pending shutdown, while per\-display sockets default to cancelling their queued request. -.TP -\fBshutdown status\fP -Return a list with information about shutdowns. -.br -The entries are comma\-separated tuples of: -.RS 10 -\- ("global"|"local") \- pending vs. queued shutdown. A local -.br - entry can be returned only by a per\-display socket. -.br -\- ("halt"|"reboot") -.br -\- start -.br -\- end -.br -\- ("ask"|"force"|"forcemy"|"cancel") -.br -\- Numeric user ID of the requesting user, \-1 for the global -.br - socket. -.br -\- The next boot OS choice or "\-" for none. -.br -\- New fields might be added later. -.RE -.SH SEE ALSO -.BR tdm (1) -.TP -.I /opt/trinity/share/doc/tdm/README.gz -Information about the command sockets (and \fBtdm\fP) -.SH AUTHORS -.nf -Oswald Buddenhagen - -.br -.fi -Please use http://bugs.kde.org to report bugs; do not mail the authors directly. -.PP -This manual page was written by Holger Hartmann for the Debian Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. -.PP -On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/ubuntu/maverick/tdebase/debian/man/tdm-trinity.1 b/ubuntu/maverick/tdebase/debian/man/tdm-trinity.1 new file mode 100644 index 000000000..4add90a82 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/man/tdm-trinity.1 @@ -0,0 +1,116 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH TDM 1 "June 2006" "K Desktop Environment" "KDE Display Manager" +.SH NAME +tdm +\- KDE Display Manager +.SH SYNOPSIS +\fBtdm\fP [options] [tty] +.SH DESCRIPTION +\fBtdm\fP is the KDE display manager also known as login manager. It shows a graphical login screen for username and password. After authenticating the user it starts a session. +.br +\fBtdm\fP can be configured for remote login via XDMCP. XDMCP is the "X Display Manager Control Protocol" which is used to set up connections between remote systems over the network. +.sp 1 +\fBtdm\fP is a derivative of \fBxdm\fP. \fBman 1 xdm\fP may provide useful information (requires installed \fBxdm\fP). For X-related problems try \fBman 7x X\fP and \fBman 1 startx\fP. +.SH OPTIONS +.TP +.B \-daemon +Daemonize even when started by init +.TP +.B \-nodaemon +Don't daemonize even when started from command line +.TP +.BI \-config\ file +Use alternative master configuration file +.TP +.BR \-xrm \ res +Override frontend\-specific resource +.TP +.BI \-error\ file +Use alternative log file +.TP +.BR \-debug \ num +Debug option bitfield: +.RS 11 +0x1 \- core log +.br +0x2 \- config reader log +.br +0x4 \- greeter log +.br +0x8 \- IPC log +.br +0x10 \- session sub-daemon post-fork delay +.br +0x20 \- config reader post-start delay +.br +0x40 \- greeter post-start delay +.br +0x80 \- don't use syslog +.br +0x100 \- core Xauth log +.br +0x400 \- valgrind config reader and greeter +.br +0x800 \- strace config reader and greeter +.RE +.SH FILES +.TP +.I /etc/trinity/tdm/backgroundrc +configuration file with background settings +.TP +.I /etc/trinity/tdm/tdm.options +options for X display manager tdm +.TP +.I /etc/trinity/tdm/tdmrc +the tdm configuration file +.TP +.I /etc/trinity/tdm/Xaccess +access control file for XDMCP connections +.TP +.I /etc/trinity/tdm/Xservers +list of local X-servers +.TP +.I /etc/trinity/tdm/Xreset +script to run as root after session exits +.TP +.I /etc/trinity/tdm/Xsession +script to run as user after login of user +.TP +.I /etc/trinity/tdm/Xsetup +script to run as root before the login dialog appears +.sp 1 +this script can be edited to disable or modify the running of \fBxconsole\fP on the tdm greeter screen +.TP +.I /etc/trinity/tdm/Xstartup +script to run as root before session starts +.TP +.I /etc/trinity/tdm/Xwilling +output of this script is displayed in the chooser window +.SH SEE ALSO +.BR tdm.options (5),\ tdmctl (1),\ tdm_config (1),\ tdm_greet (1),\ startx (1),\ X (7x),\ xconsole (1),\ xdm (1) +.TP +.I /opt/trinity/share/doc/tdm/README.gz +Information about \fBtdm\fP and its options +.sp 1 +.RE +Full user documentation is available through the KDE Help Center. You can also enter the URL +.BR help:/tdm/ +directly into konqueror or you can run +.BR "khelpcenter help:/tdm/" +from the command\-line. +.br +.SH AUTHORS +.nf +Steffen Hansen +.br +Thomas Tanghus +.br +Oswald Buddenhagen + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/ubuntu/maverick/tdebase/debian/man/tdm_config-trinity.1 b/ubuntu/maverick/tdebase/debian/man/tdm_config-trinity.1 new file mode 100644 index 000000000..d9325214a --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/man/tdm_config-trinity.1 @@ -0,0 +1,22 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH TDM_CONFIG 1 "June 2006" "K Desktop Environment" "helper program" +.SH NAME +tdm_config +\- helper programm for tdm to read configuration files +.SH SYNOPSIS +\fBtdm_config\fP +.SH DESCRIPTION +\fBtdm_config\fP is a helper program for \fBtdm\fP to read configuration files. +.SH SEE ALSO +\fBtdm\fP(1) +.SH AUTHORS +.nf +Oswald Buddenhagen + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/ubuntu/maverick/tdebase/debian/man/tdm_greet-trinity.1 b/ubuntu/maverick/tdebase/debian/man/tdm_greet-trinity.1 new file mode 100644 index 000000000..c33f57d5f --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/man/tdm_greet-trinity.1 @@ -0,0 +1,22 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH TDM_GREET 1 "June 2006" "K Desktop Environment" "KDE greeter module" +.SH NAME +tdm_greet +\- KDE greeter module for tdm +.SH SYNOPSIS +\fBtdm_greet\fP +.SH DESCRIPTION +\fBtdm_greet\fP is a KDE greeter module for \fBtdm\fP. It shows the login dialog. +.SH SEE ALSO +.BR tdm (1) +.SH AUTHORS +.nf +Oswald Buddenhagen + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/ubuntu/maverick/tdebase/debian/man/tdmctl-trinity.1 b/ubuntu/maverick/tdebase/debian/man/tdmctl-trinity.1 new file mode 100644 index 000000000..a1a0bb622 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/man/tdmctl-trinity.1 @@ -0,0 +1,220 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH TDMCTL 1 "June 2006" "K Desktop Environment" "TDM remote control application" +.SH NAME +tdmctl +\- tdm remote control application +.SH SYNOPSIS +\fBtdmctl\fP [options] [command [command arguments]] +.SH DESCRIPTION +\fBtdmctl\fP is an application to remote\-control \fBtdm\fP. It makes use of UNIX domain sockets. +.sp 1 +There are two types of sockets: the global one (dmctl) and the per\-display ones (dmctl\-). The global one's subdir is owned by root, the subdirs of the per\-display ones' are owned by the user currently owning the session (root or the logged in user). +.sp 1 +The directory in which the sockets are located is determined this way: +.RS 3 +\- the \fB\-s\fP option is examined +.br +\- the $DM_CONTROL variable is examined +.br +\- the tdm config file is searched for the FifoDir key +.br +.RI \- /var/run/xdmctl \ and\ /var/run \ are\ tried +.RE +.sp 1 +If $DISPLAY is set (or \fB\-d\fP was specified) and \fB\-g\fP was not specified, the +display\-specific control socket will be used, otherwise the global one. +.sp 1 +Tokens in the command and the reply are tab\-separated. +Command arguments can be specified as separate command line parameters, +in which case they are simply concatenated with tabs in between. +.sp 1 +If the command is '\-', \fBtdmctl\fP reads commands from stdin. +The default command is 'caps'. +.SH OPTIONS +.SS +.SS Options: +.TP +.B \-h \-help +print help message. +.TP +.B \-g \-global +Use global control socket even if $DISPLAY is set +.TP +.B \-d \-display +Override $DISPLAY +.TP +.B \-s \-sockets +Override $DM_CONTROL +.TP +.B \-c \-config +Use alternative tdm config file +.SS Commands: +.br +.SS Global commands: +.TP +.B login +display (now|schedule) user password [session_arguments] +.br + login user at specified display. if "now" is specified, a possibly running session is killed, otherwise the login is done after the session exits. +.br +session_arguments are printf\-like escaped contents for \fI.dmrc\fP. Unlisted keys will default to previously saved values. +.SS Per\-display commands: +.TP +.B lock +The display is marked as locked. If the X\-Server crashes in this state, no auto\-relogin will be performed even if the option is on. +.TP +.B unlock +Reverse the effect of "lock": re\-enable auto\-relogin. +.TP +.B suicide +The currently running session is forcibly terminated. No auto\-relogin is attempted, but a scheduled "login" command will be executed. +.SS Commands for all sockets: +.TP +.B caps +Returns a list of this socket's capabilities: +.IP " \- tdm" +identifies tdm, in case some other DM implements this protocol, too. +.IP " \- list, activate, lock, suicide, login" +the respective command is supported. +.IP " \- bootoptions" +the "listbootoptions" command and the "=" option to "shutdown" are supported. +.IP " \- shutdown " +"shutdown" is supported and allowed to the listed users (comma\-separated). "*" means all authenticated users. +.IP " \- shutdown" +"shutdown" is supported and allowed to everybody. +.IP " \- nuke " +forced shutdown is allowed to the listed users. +.IP " \- nuke" +forced shutdown is allowed to everybody. +.IP " \- reserve " +reserve displays are configured and are available at this time. +.TP +\fBlist\fP [all|alllocal] +.br +Return a list of running sessions. By default all active sessions are listed. If "all" is specified, passive sessions are listed as well. If "alllocal" is specified, passive sessions are listed as well, but all incoming remote sessions are skipped. +.sp 1 +Each session entry is a comma\-separated tuple of: +.RS 7 +\- Display or TTY name +.br +\- VT name for local sessions +.br +\- Logged in user's name, empty for passive sessions and outgoing +.br + remote sessions (local chooser mode) +.br +\- Session type or remote host for outgoing remote sessions, +.br + empty for passive sessions +.br +\- A flag field: +.RS 5 +\- "t" for tty sessions +.br +\- "*" for the display belonging to the requesting socket +.br +\- "!" for sessions that cannot be killed by the requesting +.br + socket +.br +\- New flags might be added later +.br +.RE +\- New fields might be added later +.RE +.TP +\fBreserve\fP [timeout in seconds] +.br +Start a reserve login screen. If nobody logs in within the specified amount of time (one minute by default), the display is removed again. When the session on the display exits, the display is removed, too. +.br +Permitted only on sockets of local displays and the global socket. +.TP +\fBactivate\fP (vt|display) +.br +Switch to a particular VT (virtual terminal). The VT may be specified either directly (e.g., vt3) or by a display using it (e.g., :2). +.br +Permitted only on sockets of local displays and the global socket. +.TP +.B listbootoptions +List available boot options. +.br +=> "ok" list default current default and current are indices into the list and are \-1 if unset or undeterminable. +.TP +\fBshutdown\fP (reboot|halt) [=bootchoice] +.br + (ask|trynow|forcenow|schedule|start +.br + (\-1|end (force|forcemy|cancel))) +.br +.RS 7 +Request a system shutdown, either a reboot or a halt/poweroff. +.sp 1 +An OS choice for the next boot may be specified from the list returned by "listbootoptions". +.sp 1 +Shutdowns requested from per\-display sockets are executed when the current session on that display exits. Such a request may pop up a dialog asking for confirmation and/or authentication. +.sp 1 +start is the time for which the shutdown is scheduled. If it starts with a plus\-sign, the current time is added. Zero means immediately. +.sp 1 +end is the latest time at which the shutdown should be performed if active sessions are still running. If it starts with a plus\-sign, the start time is added. Minus one means wait infinitely. If end is through and active sessions are still running, \fBTDM\fP can do one of the following: +.RS 3 +- "cancel" \- give up the shutdown. +.br +- "force" \- shut down nonetheless. +.br +- "forcemy" \- shut down nonetheless if all active sessions +.br + belong to the requesting user. Only for per\-display sockets. +.RE +.sp 1 +start and end are specified in seconds since the UNIX epoch. +.sp 1 +"trynow" is a synonym for "0 0 cancel", "forcenow" for "0 0 force" and "schedule" for "0 \-1". +.sp 1 +"ask" attempts an immediate shutdown and interacts with the user if active sessions are still running. Only for per\-display sockets. +.RE +.TP +\fBshutdown cancel\fP [local|global] +.br +Cancel a scheduled shutdown. The global socket always cancels the currently pending shutdown, while per\-display sockets default to cancelling their queued request. +.TP +\fBshutdown status\fP +Return a list with information about shutdowns. +.br +The entries are comma\-separated tuples of: +.RS 10 +\- ("global"|"local") \- pending vs. queued shutdown. A local +.br + entry can be returned only by a per\-display socket. +.br +\- ("halt"|"reboot") +.br +\- start +.br +\- end +.br +\- ("ask"|"force"|"forcemy"|"cancel") +.br +\- Numeric user ID of the requesting user, \-1 for the global +.br + socket. +.br +\- The next boot OS choice or "\-" for none. +.br +\- New fields might be added later. +.RE +.SH SEE ALSO +.BR tdm (1) +.TP +.I /opt/trinity/share/doc/tdm/README.gz +Information about the command sockets (and \fBtdm\fP) +.SH AUTHORS +.nf +Oswald Buddenhagen + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann for the Debian Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_default_kdm_theme.diff b/ubuntu/maverick/tdebase/debian/patches/disable_default_kdm_theme.diff deleted file mode 100644 index 20cb49429..000000000 --- a/ubuntu/maverick/tdebase/debian/patches/disable_default_kdm_theme.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- tdm/config.def -+++ tdm/config.def -@@ -2614,8 +2614,8 @@ - - Key: UseTheme - Type: bool --Default: true -+Default: false - User: greeter --Instance: */true -+Instance: #*/true - Comment: & - Description: - Whether the greeter should be themed. diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff b/ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff new file mode 100644 index 000000000..20cb49429 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff @@ -0,0 +1,14 @@ +--- tdm/config.def ++++ tdm/config.def +@@ -2614,8 +2614,8 @@ + + Key: UseTheme + Type: bool +-Default: true ++Default: false + User: greeter +-Instance: */true ++Instance: #*/true + Comment: & + Description: + Whether the greeter should be themed. diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff deleted file mode 100644 index c312b6fb7..000000000 --- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff +++ /dev/null @@ -1,64 +0,0 @@ ---- tdebase-3.5.8/tdm/backend/dm.c 2008-02-13 23:59:17.000000000 +0200 -+++ tdebase-3.5.8/tdm/backend/dm.c 2008-02-14 11:22:41.000000000 +0200 -@@ -996,9 +996,14 @@ ReapChildren( void ) - /* don't kill again */ - break; - case running: -- if (startingServer == d && d->serverStatus != ignore) { -- if (d->serverStatus == starting && waitCode( status ) != 47) -- LogError( "X server died during startup\n" ); -+ LogError("X server terminated: [%d, %d, %d]\n", -+ (startingServer == d), -+ (d->serverStatus), -+ (waitCode(status))); -+ -+ if (startingServer == d /*&& d->serverStatus != ignore*/) { -+ if (/*d->serverStatus == starting &&*/ waitCode( status ) != 47) -+ LogError( "X server died during startup\n" ); - StartServerFailed(); - break; - } ---- tdebase-3.5.8/tdm/backend/server.c 2008-02-13 23:59:17.000000000 +0200 -+++ tdebase-3.5.8/tdm/backend/server.c 2008-02-14 11:41:20.000000000 +0200 -@@ -48,6 +48,10 @@ from the copyright holder. - struct display *startingServer; - time_t serverTimeout = TO_INF; - -+#define SERVER_ATTEMPTS 3 -+ -+char* failsafeXServer[] = {"/etc/gdm/failsafeXServer", 0}; -+ - char ** - PrepServerArgv( struct display *d, const char *args ) - { -@@ -128,6 +132,7 @@ StartServer( struct display *d ) - { - startingServer = d; - d->startTries = 0; -+ d->serverAttempts = SERVER_ATTEMPTS; - StartServerOnce(); - } - -@@ -150,6 +155,7 @@ void - StartServerSuccess() - { - struct display *d = startingServer; -+ LogError("StartServerSucces\n"); - d->serverStatus = ignore; - serverTimeout = TO_INF; - Debug( "X server ready, starting session\n" ); -@@ -161,9 +167,14 @@ StartServerFailed() - { - struct display *d = startingServer; - if (!d->serverAttempts || d->startTries < d->serverAttempts) { -+ LogError("Failed to start X server. Starting failsafe X server.\n"); -+ -+ runAndWait(failsafeXServer, 0); -+ - d->serverStatus = pausing; - serverTimeout = d->openDelay + now; - } else { -+ LogError("StartServerFailed\n"); - d->serverStatus = ignore; - serverTimeout = TO_INF; - startingServer = 0; diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff new file mode 100644 index 000000000..c312b6fb7 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff @@ -0,0 +1,64 @@ +--- tdebase-3.5.8/tdm/backend/dm.c 2008-02-13 23:59:17.000000000 +0200 ++++ tdebase-3.5.8/tdm/backend/dm.c 2008-02-14 11:22:41.000000000 +0200 +@@ -996,9 +996,14 @@ ReapChildren( void ) + /* don't kill again */ + break; + case running: +- if (startingServer == d && d->serverStatus != ignore) { +- if (d->serverStatus == starting && waitCode( status ) != 47) +- LogError( "X server died during startup\n" ); ++ LogError("X server terminated: [%d, %d, %d]\n", ++ (startingServer == d), ++ (d->serverStatus), ++ (waitCode(status))); ++ ++ if (startingServer == d /*&& d->serverStatus != ignore*/) { ++ if (/*d->serverStatus == starting &&*/ waitCode( status ) != 47) ++ LogError( "X server died during startup\n" ); + StartServerFailed(); + break; + } +--- tdebase-3.5.8/tdm/backend/server.c 2008-02-13 23:59:17.000000000 +0200 ++++ tdebase-3.5.8/tdm/backend/server.c 2008-02-14 11:41:20.000000000 +0200 +@@ -48,6 +48,10 @@ from the copyright holder. + struct display *startingServer; + time_t serverTimeout = TO_INF; + ++#define SERVER_ATTEMPTS 3 ++ ++char* failsafeXServer[] = {"/etc/gdm/failsafeXServer", 0}; ++ + char ** + PrepServerArgv( struct display *d, const char *args ) + { +@@ -128,6 +132,7 @@ StartServer( struct display *d ) + { + startingServer = d; + d->startTries = 0; ++ d->serverAttempts = SERVER_ATTEMPTS; + StartServerOnce(); + } + +@@ -150,6 +155,7 @@ void + StartServerSuccess() + { + struct display *d = startingServer; ++ LogError("StartServerSucces\n"); + d->serverStatus = ignore; + serverTimeout = TO_INF; + Debug( "X server ready, starting session\n" ); +@@ -161,9 +167,14 @@ StartServerFailed() + { + struct display *d = startingServer; + if (!d->serverAttempts || d->startTries < d->serverAttempts) { ++ LogError("Failed to start X server. Starting failsafe X server.\n"); ++ ++ runAndWait(failsafeXServer, 0); ++ + d->serverStatus = pausing; + serverTimeout = d->openDelay + now; + } else { ++ LogError("StartServerFailed\n"); + d->serverStatus = ignore; + serverTimeout = TO_INF; + startingServer = 0; diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdm b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdm deleted file mode 100644 index 4be02569c..000000000 --- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdm +++ /dev/null @@ -1,10 +0,0 @@ -Document: tdebase-doc-html-tdm -Title: TDM Handbook -Author: Oswald Buddenhagen -Abstract: This document describes TDM, the KDE Display Manager, an X session manager. -Section: System - -Format: HTML -Index: /opt/trinity/share/doc/kde/HTML/en/tdm/index.html -Files: /opt/trinity/share/doc/kde/HTML/en/tdm/*.html - diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdm b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdm new file mode 100644 index 000000000..4be02569c --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdm @@ -0,0 +1,10 @@ +Document: tdebase-doc-html-tdm +Title: TDM Handbook +Author: Oswald Buddenhagen +Abstract: This document describes TDM, the KDE Display Manager, an X session manager. +Section: System + +Format: HTML +Index: /opt/trinity/share/doc/kde/HTML/en/tdm/index.html +Files: /opt/trinity/share/doc/kde/HTML/en/tdm/*.html + diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity-np.pam b/ubuntu/maverick/tdebase/debian/tdm-trinity-np.pam new file mode 100644 index 000000000..4cada235b --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity-np.pam @@ -0,0 +1,11 @@ +# +# /etc/pam.d/tdm-np - specify the PAM behaviour of tdm for passwordless logins +# +auth required pam_nologin.so +auth required pam_env.so readenv=1 +auth required pam_env.so readenv=1 envfile=/etc/default/locale +session required pam_limits.so +@include common-account +@include common-password +@include common-session +auth required pam_permit.so diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.README.Debian b/ubuntu/maverick/tdebase/debian/tdm-trinity.README.Debian new file mode 100644 index 000000000..60a81e267 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.README.Debian @@ -0,0 +1,91 @@ +TDM in Debian +============= + +This package comes with a copy of the TDM handbook in docbook format. +To read it, run "khelpcenter help:/tdm" from a command-line or go to the +URL "help:/tdm" in konqueror. + +By default, the use of special graphical themes with TDM is disabled. +If you wish to use the 'Circles' theme that comes with the tdm package, or +any other theme that you have installed, you should research the +'UseTheme' and 'Theme' fields in /etc/trinity/tdm/tdmrc. This can be done +by browsing this URL in Konqueror: + +help:/tdm/tdm-files.html#tdmrc-greeter + +TDM Customization +================= + +We provide a way to override theme-related values normally set in the +master configuration file (tdmrc): + * USEBACKGROUND + * BACKGROUNDCFG + * USETHEME + * THEME + * AUTOLOGINAGAIN + * AUTOLOGINDELAY + * AUTOLOGINLOCKED + * AUTOLOGINUSER + +and background configuration file (backgroundrc): + * WALLPAPER + +You just need to create a file with overridden value(s) and put it in +tdm override directory (default is /etc/default/tdm.d). + +================================================ +Below this is direct from the xdm package README +================================================ + +Debian README for the xdm package: + +Newcomers to the X Window System should first read the file +/opt/trinity/share/doc/x11-common/FAQ.gz. You can view this file with your +favorite pager program after decompressing it. For example: + $ zcat /opt/trinity/share/doc/x11-common/FAQ.gz | pager + +The default configuration for the X display manager (xdm) under Debian +GNU/Linux presumes that one wishes xdm to manage one local session. (In +other words, the xdm login screen occupies one virtual console +automatically at boot.) If one does not wish to run a local X server, the +following line should be commented out of /etc/X11/xdm/Xservers: + +:0 local /usr/bin/X11/X vt7 -deferglyphs 16 + +Several configuration files are shipped with the xdm package; they reside +in the /etc/X11/xdm/ directory. Extensive documentation about the xdm +configuration files may be found in the xdm(1) manual page. + +xdm-config contains X resources specific to xdm itself. See the X(1) +manual page for more information about X resources, and the xdm(1) manual +pages for documentation of the available xdm resources. + +Xresources contains X resources that are designed to be specfic to sessions +running under xdm. Note that this file does contain the resource entries +for xdm itself -- those are contained in the file xdm-config. See the X(1) +manual page for more information about X resources. + +The above three files, despite being X resource files, are not placed in the +/etc/X11/Xresources directory (see /opt/trinity/share/doc/xbase/README.Debian) because +they should not be used automatically in all X sessions; the /etc/X11/Xsession +script merges in the resources of all files found in /etc/X11/Xresources, and +this action would be inappropriate for these resource files. + +Xservers contains entries to start the X server(s) on the local machine, and +on any remote X terminals that do not support XDMCP. This file is internally +documented. + +Xaccess determines what hosts on the network may use the services of the +running xdm daemon. This file is internally documented. Note that as of +version 3.3.4-1 of the xdm package, all remote XDMCP access is turned off +by default. + +Xstartup is a shell script which is run (as root) after a user has logged in +on a server. + +Xreset is a shell script which is run (as root) after a user's X session ends on +a server. + +xdm.options contains configuration options for xdm that are specific to the +Debian GNU/Linux system. See the xdm.options(5) manual page for more +information. diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.conf b/ubuntu/maverick/tdebase/debian/tdm-trinity.conf new file mode 100755 index 000000000..7ea5ac479 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.conf @@ -0,0 +1,48 @@ +# tdm-trinity - K Display Manager +# +# The display manager service manages the X servers running on the +# system, providing login and auto-login services + +description "K Display Manager for Trinity" +author "Richard Johnson and Timothy Pearson" + +start on (filesystem + and (started hal or started hal-trinity) + and (graphics-device-added fb0 PRIMARY_DEVICE_FOR_DISPLAY=1 + or drm-device-added card0 PRIMARY_DEVICE_FOR_DISPLAY=1 + or stopped udevtrigger)) +stop on runlevel [016] + +emits starting-dm + +respawn + +script + [ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/opt/trinity/bin/tdm" ] + + # Check kernel command-line for inhibitors + for ARG in $(cat /proc/cmdline) + do + case "${ARG}" in + text|-s|s|S|single) + exit 0 + ;; + esac + done + + if [ -r /etc/default/locale ]; then + . /etc/default/locale + export LANG LANGUAGE + elif [ -r /etc/environment ]; then + . /etc/environment + export LANG LANGUAGE + fi + + TDEDIRS=/opt/trinity/ + PATH=/opt/trinity/bin:/bin:/usr/bin:/sbin:/usr/sbin + + initctl emit starting-dm DM=tdm-trinity + + exec /opt/trinity/bin/tdm + +end script diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.config b/ubuntu/maverick/tdebase/debian/tdm-trinity.config new file mode 100644 index 000000000..1d73249f7 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.config @@ -0,0 +1,87 @@ +#!/bin/sh +# Debian tdm package configuration script +# stolen from the xdm scripts +# Copyright 2000--2003 Branden Robinson. +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +set -e + +# source debconf library +. /usr/share/debconf/confmodule + +THIS_PACKAGE=tdm-trinity + +# set default display manager +DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager + +OWNERS= +if db_metaget shared/default-x-display-manager owners; then + OWNERS="$RET" +fi + +CHOICES= +if db_metaget shared/default-x-display-manager choices; then + CHOICES="$RET" +fi + +if [ "$OWNERS" != "$CHOICES" ]; then + # FIXME - redo this part uses shell-lib.sh from xfree86 + # observe "X display managers now available are \"$OWNERS\"" + db_subst shared/default-x-display-manager choices "$OWNERS" + db_fset shared/default-x-display-manager seen false +fi + +# debconf is not a registry; use the current contents of the default display +# manager file to pre-answer the question if possible +if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then + CURRENT_DEFAULT=$(grep -v '^[[:space:]]*#' \ + "$DEFAULT_DISPLAY_MANAGER_FILE" | + head -n 1) + # both the binaries for tdm and tdm-kde4 share the same basename + # so we need to check if it's tdm-kde4 or another display manager + if [ "$CURRENT_DEFAULT" = "/usr/lib/kde4/bin/tdm" ]; then + CURRENT_DEFAULT=${THIS_PACKAGE}-kde4 + else + CURRENT_DEFAULT=$(basename $CURRENT_DEFAULT) + fi + if [ -n "$CURRENT_DEFAULT" ]; then +# if ! which "$CURRENT_DEFAULT" > /dev/null 2>&1; then +# echo . + # FIXME - redo this part uses shell-lib.sh from xfree86 + #observe "default display manager \"$CURRENT_DEFAULT\" specified in" \ + # "$DEFAULT_DISPLAY_MANAGER_FILE does not exist or is not" \ + # "executable" +# fi + db_set shared/default-x-display-manager "$CURRENT_DEFAULT" + fi +else + CURRENT_DEFAULT= + if db_get shared/default-x-display-manager; then + CURRENT_DEFAULT="$RET" + fi +fi + +db_input high shared/default-x-display-manager || true +db_go + +# using this display manager? +NEW_DEFAULT= +if db_get shared/default-x-display-manager; then + NEW_DEFAULT="$RET" +fi + +# move the default display manager file if we're going to change it +if [ -n "$NEW_DEFAULT" ]; then + if [ "$NEW_DEFAULT" != "$CURRENT_DEFAULT" ]; then + if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then + # FIXME - redo this part uses shell-lib.sh from xfree86 + # observe "preparing to change default X display manager from" \ + # "\"$CURRENT_DEFAULT\" to \"$NEW_DEFAULT\"" + mv "$DEFAULT_DISPLAY_MANAGER_FILE" \ + "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" + fi + fi +fi + +exit 0 diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.dirs b/ubuntu/maverick/tdebase/debian/tdm-trinity.dirs new file mode 100644 index 000000000..2060b348d --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.dirs @@ -0,0 +1,2 @@ +etc/default/tdm-trinity.d +var/lib/tdm-trinity diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.install b/ubuntu/maverick/tdebase/debian/tdm-trinity.install new file mode 100644 index 000000000..289fa03af --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.install @@ -0,0 +1,51 @@ +debian/local/tdm.options etc/trinity/tdm/ +debian/tmp/etc/trinity/tdm/tdmrc +debian/tmp/etc/trinity/tdm/Xaccess +debian/tmp/etc/trinity/tdm/Xreset +debian/tmp/etc/trinity/tdm/Xsession +debian/tmp/etc/trinity/tdm/Xsetup +debian/tmp/etc/trinity/tdm/Xstartup +debian/tmp/etc/trinity/tdm/Xwilling +debian/tmp/opt/trinity/bin/gentdmconf +debian/tmp/opt/trinity/bin/tdm +debian/tmp/opt/trinity/bin/tdm_config +debian/tmp/opt/trinity/bin/tdmctl +debian/tmp/opt/trinity/bin/tdm_greet +debian/tmp/opt/trinity/bin/krootimage +debian/tmp/opt/trinity/share/apps/tdm/pics/kdelogo-crystal.png +debian/tmp/opt/trinity/share/apps/tdm/pics/kdelogo.png +debian/tmp/opt/trinity/share/apps/tdm/pics/shutdown.jpg +debian/tmp/opt/trinity/share/apps/tdm/pics/users/default1.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/default2.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/default3.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/root1.png +debian/tmp/opt/trinity/share/apps/tdm/sessions/9wm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/aewm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/amaterus.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/asclassic.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/ctwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/evilwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/flwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/lwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/matchbox.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/mwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/olvwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/olwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/oroborus.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/pwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/twm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/ude.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/vtwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/wm2.desktop +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/background.svg +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/circles.xml +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/flower.png +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/GdmGreeterTheme.desktop +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/help.png +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/options.png +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/screenshot.png +debian/tmp/opt/trinity/share/apps/tdm/themes/o2_enterprise +debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/common +debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/index.docbook +debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/tdmrc-ref.docbook diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.links b/ubuntu/maverick/tdebase/debian/tdm-trinity.links new file mode 100644 index 000000000..d39f29e96 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.links @@ -0,0 +1 @@ +opt/trinity/share/apps/tdm/pics/users/default1.png opt/trinity/share/apps/tdm/faces/.default.face diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.logrotate b/ubuntu/maverick/tdebase/debian/tdm-trinity.logrotate new file mode 100644 index 000000000..990e7c479 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.logrotate @@ -0,0 +1,9 @@ +/var/log/tdm-trinity.log { + rotate 7 + daily + compress + delaycompress + copytruncate + missingok + notifempty +} diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.manpages b/ubuntu/maverick/tdebase/debian/tdm-trinity.manpages new file mode 100644 index 000000000..690a0f462 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.manpages @@ -0,0 +1,6 @@ +debian/man/gentdmconf-trinity.1 +debian/man/tdm-trinity.1 +debian/man/tdm_config-trinity.1 +debian/man/tdmctl-trinity.1 +debian/man/tdm_greet-trinity.1 +debian/man/krootimage-trinity.1 diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.pam b/ubuntu/maverick/tdebase/debian/tdm-trinity.pam new file mode 100644 index 000000000..d40a52277 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.pam @@ -0,0 +1,11 @@ +# +# /etc/pam.d/tdm-trinity - specify the PAM behaviour of tdm +# +auth required pam_nologin.so +auth required pam_env.so readenv=1 +auth required pam_env.so readenv=1 envfile=/etc/default/locale +@include common-auth +session required pam_limits.so +@include common-account +@include common-password +@include common-session diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst b/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst new file mode 100644 index 000000000..5f1aab168 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst @@ -0,0 +1,125 @@ +#! /bin/sh + +set -e + +# source debconf library +. /usr/share/debconf/confmodule + +# debconf is not a registry, so we only fiddle with the default file if it +# does not exist +DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager +if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then + DEFAULT_DISPLAY_MANAGER= + if db_get shared/default-x-display-manager; then + DEFAULT_DISPLAY_MANAGER="$RET" + fi + if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then + DAEMON_NAME= + if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then + DAEMON_NAME="$RET" + fi + if [ ! -n "$DAEMON_NAME" ]; then + # if we were unable to determine the name of the selected daemon (for + # instance, if the selected default display manager doesn't provide a + # daemon_name question), guess + DAEMON_NAME=$(which "$DEFAULT_DISPLAY_MANAGER" 2>/dev/null) + if [ ! -n "$DAEMON_NAME" ]; then + echo . + # FIXME - redo this part uses shell-lib.sh from xfree86 + #warn "unable to determine path to default X display manager" \ + # "$DEFAULT_DISPLAY_MANAGER; not updating" \ + # "$DEFAULT_DISPLAY_MANAGER_FILE" + fi + fi + if [ -n "$DAEMON_NAME" ]; then + # FIXME - redo this part uses shell-lib.sh from xfree86 + #observe "committing change of default X display manager" + echo "$DAEMON_NAME" > "$DEFAULT_DISPLAY_MANAGER_FILE" + fi + fi +fi + +# remove the displaced old default display manager file if it exists +if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then + rm "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" +fi + +# restarting the daemon may cause output to stdout +db_stop + +# don't start tdm if we are upgrading without stopping it +NOSTART= +if [ -e /var/run/tdm-trinity.upgrade ]; then + NOSTART=yes +fi +# or if we're currently in X on the display it attempts to manage by default +for HOST in "" \ + "localhost" \ + "$(hostname 2> /dev/null)" \ + "$(hostname -f 2> /dev/null)"; do + if echo "$DISPLAY" | grep -q "^$HOST:0.*"; then + NOSTART=yes + break + fi +done +# or if it's already running +if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/tdm.pid --name tdm-trinity; then + NOSTART=yes +fi +# or if the options file says not to +if ! grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options; then + NOSTART=yes +fi + + +# md5sum of the stock Xservers shipped with KDE 3.3.2, which shipped with Sarge +SARGEXSERVERS=d3ab063f564492e0e31830f56ccd350e + +CONFIGLEVEL=`grep -s ^ConfigVersion= /etc/trinity/tdm/tdmrc | sed s/^ConfigVersion=//` + +if [ -e /etc/trinity/tdm/tdmrc ]; then + if dpkg --compare-versions "$CONFIGLEVEL" ge "2.3"; then + TDMRCUPDATED=yes + fi +fi + +if [ -e /etc/trinity/tdm/Xservers ]; then + if [ `md5sum /etc/trinity/tdm/Xservers | sed s/\ .*$//` = $SARGEXSERVERS ]; then + XSERVERSUNCHANGED=yes + fi +fi + +# With KDE 3.4, /etc/trinity/tdm/Xservers is no longer required, so we remove it, if +# the user has updated their tdmrc (if they haven't, tdm notices and keeps using +# Xservers), and if it wasn't touched, i.e. there are no local changes the user +# will want to merge into tdmrc. + +case "$1" in + + configure) + + if [ ! -z $TDMRCUPDATED ] && [ ! -z $XSERVERSUNCHANGED ]; then + echo "Removing obsolete /etc/trinity/tdm/Xservers (detected no user changes)." + rm -f /etc/trinity/tdm/Xservers + elif [ ! -z $TDMRCUPDATED ] && [ -e /etc/trinity/tdm/Xservers ]; then + echo "Note that /etc/trinity/tdm/Xservers is no longer used by TDM." + echo "You must merge your changes (if any) into /etc/trinity/tdm/tdmrc manually." + echo "Otherwise, /etc/trinity/tdm/Xservers is safe to remove." + fi + + rm -f /etc/init.d/tdm-trinity + ln -s /lib/init/upstart-job /etc/init.d/tdm-trinity + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +exit 0 diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.postrm b/ubuntu/maverick/tdebase/debian/tdm-trinity.postrm new file mode 100644 index 000000000..3dfb32123 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.postrm @@ -0,0 +1,38 @@ +#! /bin/sh -e + +case "$1" in + purge) + rm -rf /var/log/tdm-trinity.log* + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +if [ "$1" = "abort-install" -o "$1" = "abort-upgrade" ]; then + # roll back displacement of default display manager file + if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then + # FIXME - redo this part uses shell-lib.sh from xfree86 + #observe "rolling back change of default X display manager" + mv "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" "$DEFAULT_DISPLAY_MANAGER_FILE" + fi +fi + +if [ "$1" = "purge" ]; then + for DIR in /var/lib/tdm-trinity; do + if [ -d "$DIR" ]; then + rm -rf "$DIR" + fi + done + rm -f /var/log/tdm-trinity.log* +fi + +#DEBHELPER# + +exit 0 diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.preinst b/ubuntu/maverick/tdebase/debian/tdm-trinity.preinst new file mode 100644 index 000000000..09163c460 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.preinst @@ -0,0 +1,29 @@ +#! /bin/sh -e + +case "$1" in + + upgrade) + rm -f /etc/trinity/debian/tdm-update-menu.sh + rm -f /etc/trinity/debian/tdm.options + rm -f /etc/trinity/tdm/pixmaps/XFree86bw.xpm + rm -f /etc/trinity/tdm/pixmaps/XFree86.xpm + rm -f /etc/trinity/tdm/Xresources + rm -f /etc/menu-methods/tdm + ;; + + install) + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# + +exit 0 diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.prerm b/ubuntu/maverick/tdebase/debian/tdm-trinity.prerm new file mode 100644 index 000000000..1ca8de60e --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.prerm @@ -0,0 +1,176 @@ +#! /bin/sh +# prerm script for tdm-trinity +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +# debconf may not be available if some massive purging is going on +HAVE_DEBCONF= +if [ -e /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + HAVE_DEBCONF=yes +fi + +case "$1" in + # we NEVER want to unconditionally stop tdm; see below + upgrade|failed-upgrade) + REMOVING= + ;; + + remove|deconfigure) + REMOVING=yes + rm -f /etc/init.d/tdm-trinity + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +STOP= +# are we supposed to restart on upgrade? if REMOVING tdm, we don't care what +# the user says, we have to stop the daemon +if grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options || + [ -n "$REMOVING" ]; then + # is there an tdm process running? + if start-stop-daemon --stop --quiet --signal 0 --name tdm-trinity; then + # any children? + PARENTS=$(pidof /usr/bin/tdm-trinity || true) + CHILDREN= + if [ -n "$PARENTS" ]; then + for PROCESS in $PARENTS; do + # make sure we got numbers back + [ $PROCESS -eq $PROCESS ] 2> /dev/null || + exit + # FIXME - redo this part uses shell-lib.sh from xfree86 + # die "pidof returned non-numeric value" + # we could use grep -q here if ps would ignore SIGPIPE :-P + if (ps axj | grep "^ *$PROCESS" > /dev/null 2>&1); then + CHILDREN=yes + fi + done + if [ -n "$CHILDREN" ]; then + if [ -n "$HAVE_DEBCONF" ]; then + # ask the question + db_input high tdm/stop_running_server_with_children || true + db_go + # what did the user say? + ANSWER= + if db_get tdm/stop_running_server_with_children; then + ANSWER="$RET" + fi + if [ "$ANSWER" = "true" ]; then + STOP=yes + fi + # forget that we have seen the question; this is the sort of + # non-configuration question that should be asked every time + db_fset tdm/stop_running_server_with_children seen false + fi + else + STOP=yes + fi + fi + fi +fi + +if [ -n "$STOP" ]; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d tdm-trinity stop || true + else + /etc/init.d/tdm-trinity stop || true + fi +else + if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ]; then + touch /var/run/tdm-trinity.upgrade + fi +fi + +DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager + +if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then + if [ -n "$HAVE_DEBCONF" ]; then + # disown this question + db_unregister shared/default-x-display-manager || true + # does the question still exist? + if db_get shared/default-x-display-manager; then + if db_metaget shared/default-x-display-manager owners; then + # FIXME - redo this part uses shell-lib.sh from xfree86 + #observe "X display managers now available are \"$OWNERS\"" + db_subst shared/default-x-display-manager choices "$RET" + fi + DEFAULT_DISPLAY_MANAGER= + if db_get shared/default-x-display-manager; then + DEFAULT_DISPLAY_MANAGER="$RET" + fi + # are we removing the currently selected display manager? + if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then + if [ "tdm-trinity" = "$DEFAULT_DISPLAY_MANAGER" ]; then + if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then + if db_get "$DEFAULT_DISPLAY_MANAGER/daemon_name"; then + # does the display manager file reference the current default? if + # so, remove it because it will now be wrong + if [ -n "$RET" ]; then + if [ "$(cat "$DEFAULT_DISPLAY_MANAGER_FILE")" = "$RET" ]; then + rm "$DEFAULT_DISPLAY_MANAGER_FILE" + fi + fi + fi + fi + # ask the user to choose a new default + db_fset shared/default-x-display-manager seen false + db_input critical shared/default-x-display-manager || true + db_go + # if the default display manager file doesn't exist, write it with + # the path to the new default display manager + if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then + DEFAULT_DISPLAY_MANAGER= + if db_get shared/default-x-display-manager; then + DEFAULT_DISPLAY_MANAGER="$RET" + fi + if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then + # FIXME - redo this part uses shell-lib.sh from xfree86 + #warn "new default display manager has been selected; please be" \ + # "sure to run \"dpkg-reconfigure $RET\" to ensure that it" \ + # "is configured" + DAEMON_NAME= + if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then + DAEMON_NAME="$RET" + fi + if [ ! -n "$DAEMON_NAME" ]; then + # if we were unable to determine the name of the selected daemon (for + # instance, if the selected default display manager doesn't provide a + # daemon_name question), guess + DAEMON_NAME=$(which "$DEFAULT_DISPLAY_MANAGER" 2>/dev/null) + if [ ! -n "$DAEMON_NAME" ]; then + echo . + # FIXME - redo this part uses shell-lib.sh from xfree86 + #warn "unable to determine path to default X display manager" \ + # "$DEFAULT_DISPLAY_MANAGER; not updating" \ + # "$DEFAULT_DISPLAY_MANAGER_FILE" + fi + fi + if [ -n "$DAEMON_NAME" ]; then + echo "$DAEMON_NAME" > "$DEFAULT_DISPLAY_MANAGER_FILE" + fi + fi + fi + fi + fi + fi + fi +fi + +exit 0 diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.templates b/ubuntu/maverick/tdebase/debian/tdm-trinity.templates new file mode 100644 index 000000000..564181f78 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.templates @@ -0,0 +1,32 @@ +Template: shared/default-x-display-manager +Type: select +Choices: ${choices} +_Description: Default display manager: + A display manager is a program that provides graphical login capabilities for + the X Window System. + . + Only one display manager can manage a given X server, but multiple display + manager packages are installed. Please select which display manager should + run by default. + . + Multiple display managers can run simultaneously if they are configured to + manage different servers; to achieve this, configure the display managers + accordingly, edit each of their init scripts in /etc/init.d, and disable the + check for a default display manager. + +Template: tdm-trinity/daemon_name +Type: string +Default: /opt/trinity/bin/tdm +Description: internal use only + This template is never shown to the user and does not require translation. + +Template: tdm-trinity/stop_running_server_with_children +Type: boolean +Default: false +_Description: Stop the tdm-trinity daemon? + The K Desktop manager (tdm-trinity) daemon is typically stopped on package upgrade + and removal, but it appears to be managing at least one running X session. + . + If tdm is stopped now, any X sessions it manages will be terminated. + Otherwise, the new version will take effect the next time the daemon + is restarted. diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.txt b/ubuntu/maverick/tdebase/debian/tdm-trinity.txt new file mode 100644 index 000000000..c51d4aa73 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.txt @@ -0,0 +1,189 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: x-display-manager tdm-trinity +# Required-Start: $local_fs $remote_fs +# Required-Stop: $local_fs $remote_fs +# Should-Start: console-screen +# Should-Stop: console-screen +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: X display manager for Trinity +# Description: TDM manages a collection of X servers, which may be on the local host or remote machines. +### END INIT INFO +# /etc/init.d/tdm-trinity: start or stop the X display manager +# Script originally stolen from the xdm package +# +# description: K Display Manager +# +set -e + +# To start tdm-trinity even if it is not the default display manager, change +# HEED_DEFAULT_DISPLAY_MANAGER to "false." +HEED_DEFAULT_DISPLAY_MANAGER=true +DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager + +TDEDIRS=/opt/trinity/ +PATH=/opt/trinity/bin:/bin:/usr/bin:/sbin:/usr/sbin +DAEMON=/opt/trinity/bin/tdm +PIDFILE=/var/run/tdm.pid +UPGRADEFILE=/var/run/tdm.upgrade + +# parameters to support tdm customization +TDMRC=/etc/trinity/tdm/tdmrc +BACKGROUNDRC=/etc/trinity/tdm/backgroundrc + +#if configuration is changed by tdmtheme or other tools, don't do magick +if grep -q "Theme=@@@ToBeReplacedByDesktopBase@@@" ${TDMRC} && grep -q "Wallpaper=default_blue.jpg" ${BACKGROUNDRC} +then + + + +TDMOVERRIDEDIR=/etc/default/tdm-trinity.d +TDMCFGDIR=/var/run/tdm-trinity +TDMCFG=$TDMCFGDIR/tdmrc +BACKGROUNDCFG=$TDMCFGDIR/backgroundrc + +test -x $DAEMON || exit 0 + +# uncomment, if you want auto-logon to be runlevel-dependant +#test "$runlevel" || { runlevel=`runlevel`; runlevel=${runlevel#* }; } +#test "$runlevel" = 4 && ARG=-autolog || ARG=-noautolog + +# uncomment, if you want tons of debug info in your syslog +#ARG="$ARG -debug 255" + +# we use an alternative tdm master configuration file +ARG="$ARG -config $TDMCFG" + +# we source overrides. run-parts sorts the list in a predictable order +if [ -d "$TDMOVERRIDEDIR" ]; then + for part in $(run-parts --list "$TDMOVERRIDEDIR" 2>/dev/null || true); do + . "$part" + done +fi + +# we generate tdm configuration files +gentdmconf --in $TDMCFGDIR 1> /dev/null + +# we update tdm configuration files (only overridden values) +[ -n "$USEBACKGROUND" ] && sed -i "s|^#\?UseBackground=.*|UseBackground=$USEBACKGROUND|" $TDMCFG +[ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $TDMCFG +[ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $TDMCFG +[ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $TDMCFG +[ -n "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG + + +fi +# autologin overrides are useful for live debian environment +if [ -n "$AUTOLOGINUSER" ]; then + sed -i "s|^#\?AutoLoginEnable=.*|AutoLoginEnable=true|" $TDMCFG + sed -i "s|^#\?AutoLoginUser=.*|AutoLoginUser=$AUTOLOGINUSER|" $TDMCFG +fi +[ -n "$AUTOLOGINDELAY" ] && sed -i "s|^#\?AutoLoginDelay=.*|AutoLoginDelay=$AUTOLOGINDELAY|" $TDMCFG +[ -n "$AUTOLOGINAGAIN" ] && sed -i "s|^#\?AutoLoginAgain=.*|AutoLoginAgain=$AUTOLOGINAGAIN|" $TDMCFG +[ -n "$AUTOLOGINLOCKED" ] && sed -i "s|^#\?AutoLoginLocked=.*|AutoLoginLocked=$AUTOLOGINLOCKED|" $TDMCFG + +# If we upgraded the daemon, we can't use the --exec argument to +# start-stop-daemon since the inode will have changed. The risk here is that +# in a situation where the daemon died, its pidfile was not cleaned up, and +# some other process is now running under that pid, start-stop-daemon will send +# signals to an innocent process. However, this seems like a corner case. +# C'est la vie! +if [ -e $UPGRADEFILE ]; then + SSD_ARGS="--pidfile $PIDFILE --startas $DAEMON" +else + SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON" +fi + +stillrunning () { + if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then + true + else + # if the daemon does not remove its own pidfile, we will + rm -f $PIDFILE $UPGRADEFILE + false + fi; +} + +case "$1" in + start) + if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] && + [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && + [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then + echo "Not starting K Display Manager (tdm-trinity); it is not the default display manager." + else + echo -n "Starting K Display Manager: tdm-trinity" + start-stop-daemon --start --quiet $SSD_ARGS -- $ARG || echo -n " already running" + echo "." + fi + ;; + + restart) + /etc/init.d/tdm-trinity stop + if [ -f $PIDFILE ]; then + if stillrunning; then + exit 1 + fi + fi + /etc/init.d/tdm-trinity start + ;; + + reload) + echo -n "Reloading K Display Manager configuration..." + if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then + echo "done." + else + echo "tdm-trinity not running." + fi + ;; + + force-reload) + /etc/init.d/tdm-trinity reload + ;; + + stop) + echo -n "Stopping K Display Manager: tdm-trinity" + if [ ! -f $PIDFILE ]; then + echo " not running ($PIDFILE not found)." + exit 0 + else + DAEMONPID=$(cat $PIDFILE | tr -d '[:blank:]') + KILLCOUNT=1 + if [ ! -e $UPGRADEFILE ]; then + if start-stop-daemon --stop --quiet $SSD_ARGS; then + # give tdm's signal handler a second to catch its breath + sleep 1 + else + echo -n " not running" + fi + fi + while [ $KILLCOUNT -le 5 ]; do + if stillrunning; then + kill $DAEMONPID + else + break + fi + sleep 1 + KILLCOUNT=$(( $KILLCOUNT + 1 )) + done + if stillrunning; then + echo -n " not responding to TERM signal (pid $DAEMONPID)" + else + rm -f $UPGRADEFILE + fi + fi + echo "." + + # Launches usplash on shutdown + if ( `grep -q '\( \|^\)splash\( \|$\)' /proc/cmdline` && `which usplash_down >/dev/null` ) ; then + usplash_down + fi + ;; + + *) + echo "Usage: /etc/init.d/tdm-trinity {start|stop|restart|reload|force-reload}" + exit 1 + ;; +esac + +exit 0 -- cgit v1.2.1