Part 1 of 2 of kdm rename

1 files changed, 11 insertions, 11 deletions

diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules
index 6e5e8fb05..282910347 100755
--- a/ubuntu/maverick/tdebase/debian/rules
+++ b/ubuntu/maverick/tdebase/debian/rules
@@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes
 CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
 
 DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \
--DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DKDM_PAM_SERVICE="kdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
+-DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
 -DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
@@ -29,7 +29,7 @@ DEB_BUILD_PARALLEL = true
 
 DEB_FIXPERMS_EXCLUDE := \
 	opt/trinity/bin/tdesud    \
-	opt/trinity/bin/kdmtsak
+	opt/trinity/bin/tdmtsak
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdebase-trinity-dbg
 
@@ -233,15 +233,15 @@ binary-install/tdebase-data-trinity::
 	rm -rf debian/tmp/etc/xdg/*
 	rm -rf debian/tdebase-data-trinity/etc/xdg/*
 
-install/kdm-trinity::
-	sed -i 's/#UseTheme=true/UseTheme=true/g' debian/tmp/etc/trinity/kdm/kdmrc
-	sed -i 's/Theme=@@@ToBeReplacedByDesktopBase@@@/Theme=\/opt\/trinity\/share\/apps\/kdm\/themes\/kubuntu-trinity/g' debian/tmp/etc/trinity/kdm/kdmrc
+install/tdm-trinity::
+	sed -i 's/#UseTheme=true/UseTheme=true/g' debian/tmp/etc/trinity/tdm/tdmrc
+	sed -i 's/Theme=@@@ToBeReplacedByDesktopBase@@@/Theme=\/opt\/trinity\/share\/apps\/tdm\/themes\/kubuntu-trinity/g' debian/tmp/etc/trinity/tdm/tdmrc
 
-binary-install/kdm-trinity::
-	mkdir -p debian/kdm-trinity/etc/init
-	install -p -D -m644 debian/kdm-trinity.conf debian/kdm-trinity/etc/init/kdm-trinity.conf
-	install -p -D -m644 debian/kdm-trinity.pam debian/kdm-trinity/etc/pam.d/kdm-trinity
-	install -p -D -m644 debian/kdm-trinity-np.pam debian/kdm-trinity/etc/pam.d/kdm-trinity-np
+binary-install/tdm-trinity::
+	mkdir -p debian/tdm-trinity/etc/init
+	install -p -D -m644 debian/tdm-trinity.conf debian/tdm-trinity/etc/init/tdm-trinity.conf
+	install -p -D -m644 debian/tdm-trinity.pam debian/tdm-trinity/etc/pam.d/tdm-trinity
+	install -p -D -m644 debian/tdm-trinity-np.pam debian/tdm-trinity/etc/pam.d/tdm-trinity-np
 
 binary-install/kcontrol-trinity::
 	mkdir -p debian/kcontrol/etc/udev/rules.d
@@ -270,6 +270,6 @@ binary-install/tdebase-trinity-bin::
 	chmod +s debian/tdebase-trinity-bin/opt/trinity/bin/kcheckpass
 
 binary-install/ksmserver-trinity::
-	install -p -D -m644 debian/tmp/opt/trinity/share/apps/kdm/sessions/tde.desktop debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop
+	install -p -D -m644 debian/tmp/opt/trinity/share/apps/tdm/sessions/tde.desktop debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop
 	install -p -D -m755 debian/plasma.autodetect debian/ksmserver-trinity/usr/bin/plasma.autodetect
 	install -p -D -m755 debian/plasma-desktop.autodetect debian/ksmserver-trinity/usr/bin/plasma-desktop.autodetect