Part 1 of 2 of kdm rename

1 files changed, 41 insertions, 41 deletions

diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.txt b/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.txt
index 71b5beb79..edbfdd647 100644
--- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.txt
+++ b/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.txt
@@ -1,6 +1,6 @@
 #!/bin/sh
 ### BEGIN INIT INFO
-# Provides:          x-display-manager kdm-kde3
+# Provides:          x-display-manager tdm-kde3
 # Required-Start:    $local_fs $remote_fs
 # Required-Stop:     $local_fs $remote_fs
 # Should-Start:      console-screen
@@ -8,40 +8,40 @@
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: X display manager for KDE3
-# Description:       KDM manages a collection of X servers, which may be on the local host or remote machines.
+# Description:       TDM manages a collection of X servers, which may be on the local host or remote machines.
 ### END INIT INFO
-# /etc/init.d/kdm-kde3: start or stop the X display manager
+# /etc/init.d/tdm-kde3: start or stop the X display manager
 # Script originally stolen from the xdm package
 #
 # description: K Display Manager
 #
 set -e
 
-# To start kdm-kde3 even if it is not the default display manager, change
+# To start tdm-kde3 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/kde3/
 PATH=/opt/kde3/bin:/bin:/usr/bin:/sbin:/usr/sbin
-DAEMON=/opt/kde3/bin/kdm
-PIDFILE=/var/run/kdm.pid
-UPGRADEFILE=/var/run/kdm.upgrade
+DAEMON=/opt/kde3/bin/tdm
+PIDFILE=/var/run/tdm.pid
+UPGRADEFILE=/var/run/tdm.upgrade
 
-# parameters to support kdm customization
-KDMRC=/etc/kde3/kdm/kdmrc
-BACKGROUNDRC=/etc/kde3/kdm/backgroundrc
+# parameters to support tdm customization
+TDMRC=/etc/kde3/tdm/tdmrc
+BACKGROUNDRC=/etc/kde3/tdm/backgroundrc
 
-#if configuration is changed by kdmtheme or other tools, don't do magick
-if grep -q "Theme=@@@ToBeReplacedByDesktopBase@@@" ${KDMRC} && grep -q "Wallpaper=default_blue.jpg" ${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
 
 
 
-KDMOVERRIDEDIR=/etc/default/kdm-kde3.d
-KDMCFGDIR=/var/run/kdm-kde3
-KDMCFG=$KDMCFGDIR/kdmrc
-BACKGROUNDCFG=$KDMCFGDIR/backgroundrc
+TDMOVERRIDEDIR=/etc/default/tdm-kde3.d
+TDMCFGDIR=/var/run/tdm-kde3
+TDMCFG=$TDMCFGDIR/tdmrc
+BACKGROUNDCFG=$TDMCFGDIR/backgroundrc
 
 test -x $DAEMON || exit 0
 
@@ -52,36 +52,36 @@ test -x $DAEMON || exit 0
 # uncomment, if you want tons of debug info in your syslog
 #ARG="$ARG -debug 255"
 
-# we use an alternative kdm master configuration file
-ARG="$ARG -config $KDMCFG"
+# 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 "$KDMOVERRIDEDIR" ]; then
-    for part in $(run-parts --list "$KDMOVERRIDEDIR" 2>/dev/null || true); do
+if [ -d "$TDMOVERRIDEDIR" ]; then
+    for part in $(run-parts --list "$TDMOVERRIDEDIR" 2>/dev/null || true); do
         . "$part"
     done
 fi
 
-# we generate kdm configuration files
-genkdmconf --in $KDMCFGDIR 1> /dev/null
+# we generate tdm configuration files
+gentdmconf --in $TDMCFGDIR 1> /dev/null
 
-# we update kdm configuration files (only overridden values)
-[ -n "$USEBACKGROUND" ] && sed -i "s|^#\?UseBackground=.*|UseBackground=$USEBACKGROUND|" $KDMCFG
-[ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $KDMCFG
-[ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $KDMCFG
-[ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $KDMCFG
+# 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|" $KDMCFG
-	sed -i "s|^#\?AutoLoginUser=.*|AutoLoginUser=$AUTOLOGINUSER|" $KDMCFG
+	sed -i "s|^#\?AutoLoginEnable=.*|AutoLoginEnable=true|" $TDMCFG
+	sed -i "s|^#\?AutoLoginUser=.*|AutoLoginUser=$AUTOLOGINUSER|" $TDMCFG
 fi
-[ -n "$AUTOLOGINDELAY" ] && sed -i "s|^#\?AutoLoginDelay=.*|AutoLoginDelay=$AUTOLOGINDELAY|" $KDMCFG
-[ -n "$AUTOLOGINAGAIN" ] && sed -i "s|^#\?AutoLoginAgain=.*|AutoLoginAgain=$AUTOLOGINAGAIN|" $KDMCFG
-[ -n "$AUTOLOGINLOCKED" ] && sed -i "s|^#\?AutoLoginLocked=.*|AutoLoginLocked=$AUTOLOGINLOCKED|" $KDMCFG
+[ -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
@@ -110,22 +110,22 @@ case "$1" in
     if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] &&
        [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] &&
        [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then
-      echo "Not starting K Display Manager (kdm-kde3); it is not the default display manager."
+      echo "Not starting K Display Manager (tdm-kde3); it is not the default display manager."
     else
-      echo -n "Starting K Display Manager: kdm-kde3"
+      echo -n "Starting K Display Manager: tdm-kde3"
       start-stop-daemon --start --quiet $SSD_ARGS -- $ARG || echo -n " already running"
       echo "."
     fi
   ;;
 
   restart)
-    /etc/init.d/kdm-kde3 stop
+    /etc/init.d/tdm-kde3 stop
     if [ -f $PIDFILE ]; then
       if stillrunning; then
         exit 1
       fi
     fi
-    /etc/init.d/kdm-kde3 start
+    /etc/init.d/tdm-kde3 start
   ;;
 
   reload)
@@ -133,16 +133,16 @@ case "$1" in
     if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
       echo "done."
     else
-      echo "kdm-kde3 not running."
+      echo "tdm-kde3 not running."
     fi
   ;;
 
   force-reload)
-    /etc/init.d/kdm-kde3 reload
+    /etc/init.d/tdm-kde3 reload
   ;;
 
   stop)
-    echo -n "Stopping K Display Manager: kdm-kde3"
+    echo -n "Stopping K Display Manager: tdm-kde3"
     if [ ! -f $PIDFILE ]; then
       echo " not running ($PIDFILE not found)."
       exit 0
@@ -151,7 +151,7 @@ case "$1" in
       KILLCOUNT=1
       if [ ! -e $UPGRADEFILE ]; then
         if start-stop-daemon --stop --quiet $SSD_ARGS; then
-          # give kdm's signal handler a second to catch its breath
+          # give tdm's signal handler a second to catch its breath
           sleep 1
         else
           echo -n " not running"
@@ -181,7 +181,7 @@ case "$1" in
   ;;
 
   *)
-    echo "Usage: /etc/init.d/kdm-kde3 {start|stop|restart|reload|force-reload}"
+    echo "Usage: /etc/init.d/tdm-kde3 {start|stop|restart|reload|force-reload}"
     exit 1
     ;;
 esac