Fix TDM themes in default settings packages

13 files changed, 58 insertions, 58 deletions

diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile
index 594c1a396..ea9d69b19 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile
@@ -5,10 +5,10 @@ WALLPAPER_DIR = $(DESTDIR)/usr/share/wallpapers
 SOUNDS_DIR = $(DESTDIR)/usr/share/sounds

 KICKER_DIR = $(DESTDIR)/usr/share/apps/kicker

 KONQ_TILES_DIR = $(DESTDIR)/usr/share/apps/konqueror/tiles

-KDM_THEME_DIR = $(DESTDIR)/opt/trinity/share/apps/tdm/themes/kubuntu-trinity

-KDM_THEME_NO_USERLIST_DIR = $(DESTDIR)/opt/trinity/share/apps/tdm/themes/kubuntu-no-userlist-trinity

-KDM_OVERRIDE = $(DESTDIR)/etc/default/tdm-trinity.d/

-KDM_SETTINGS_DIR = $(DESTDIR)/etc/trinity/tdm/

+TDM_THEME_DIR = $(DESTDIR)/opt/trinity/share/apps/tdm/themes/kubuntu-trinity

+TDM_THEME_NO_USERLIST_DIR = $(DESTDIR)/opt/trinity/share/apps/tdm/themes/kubuntu-no-userlist-trinity

+TDM_OVERRIDE = $(DESTDIR)/etc/default/tdm-trinity.d/

+TDM_SETTINGS_DIR = $(DESTDIR)/etc/trinity/tdm/

 KSPLASH_THEME_DIR = $(DESTDIR)/opt/trinity/share/apps/ksplash/Themes/kubuntu

 SETTINGS_DIR = $(DESTDIR)/usr/share/kubuntu-default-settings-trinity

 CURSOR_DIR = $(DESTDIR)/usr/share/icons/contrastlarge

@@ -18,9 +18,9 @@ build:
 clean:

 

 install:

-	mkdir -p "$(KDM_SETTINGS_DIR)"

-	install -m644 backgroundrc "$(KDM_SETTINGS_DIR)"

-	install -m644 tdmdistrc "$(KDM_SETTINGS_DIR)"

+	mkdir -p "$(TDM_SETTINGS_DIR)"

+	install -m644 backgroundrc "$(TDM_SETTINGS_DIR)"

+	install -m644 tdmdistrc "$(TDM_SETTINGS_DIR)"

 

 	mkdir -p "$(WALLPAPER_DIR)"

 	install -m644 artwork/kubuntu-wallpaper.png  "$(WALLPAPER_DIR)"

@@ -50,11 +50,11 @@ install:
 	mkdir -p "$(KICKER_DIR)/wallpapers"

 	install -m644 artwork/kubuntu-panel.png  "$(KICKER_DIR)/wallpapers/"

 

-	mkdir -p "$(KDM_THEME_DIR)"

-	install -m644 artwork/tdm-theme/*  "$(KDM_THEME_DIR)"

+	mkdir -p "$(TDM_THEME_DIR)"

+	install -m644 artwork/tdm-theme/*  "$(TDM_THEME_DIR)"

 

-	mkdir -p "$(KDM_THEME_NO_USERLIST_DIR)"

-	install -m644 artwork/tdm-theme-cartoon-no-userlist/*  "$(KDM_THEME_NO_USERLIST_DIR)"

+	mkdir -p "$(TDM_THEME_NO_USERLIST_DIR)"

+	install -m644 artwork/tdm-theme-cartoon-no-userlist/*  "$(TDM_THEME_NO_USERLIST_DIR)"

 

 	mkdir -p "$(KSPLASH_THEME_DIR)"

 	install -m644 artwork/ksplash/*  "$(KSPLASH_THEME_DIR)"

diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/ksplash/ReadMe.txt b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/ksplash/ReadMe.txt
index cfc4f99e9..47b686406 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/ksplash/ReadMe.txt
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/ksplash/ReadMe.txt
@@ -6,7 +6,7 @@ Version = 1.5.1
 Author = Jim Bustos <jimbustos@gmail.com>
 URL = http://www.kde-look.org/usermanager/search.php?username=jbus
 
-This theme also has a matching KDM theme located @
+This theme also has a matching TDM theme located @
 http://kdelook.org/content/show.php?content=29331
 
 This theme requires Moodwrod's Moodin Engine.
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop
index e55edf3cf..d8fbd800f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop
@@ -5,6 +5,6 @@
 Encoding=UTF-8
 Greeter=kubuntu.xml
 Name=Debian O2 - No Userlist
-Description=A cartoonish KDM theme for Debian
+Description=A cartoonish TDM theme for Debian
 Author=Ken Wimer (wimer@kde.org)
 Screenshot=preview.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/GdmGreeterTheme.desktop b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/GdmGreeterTheme.desktop
index 8263c2b25..085ef86b7 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/GdmGreeterTheme.desktop
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/GdmGreeterTheme.desktop
@@ -5,6 +5,6 @@
 Encoding=UTF-8
 Greeter=kubuntu.xml
 Name=Debian O2
-Description=A cartoonish KDM theme for Debian
+Description=A cartoonish TDM theme for Debian
 Author=Ken Wimer (wimer@kde.org)
 Screenshot=preview.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/kubuntu.xml b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/kubuntu.xml
index 00caadbbb..5d1c437da 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/kubuntu.xml
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/kubuntu.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE greeter SYSTEM "greeter.dtd">
 <greeter>
 	<item type="pixmap" >
-		<normal file="@@@KDMBACKGROUND@@@" />
+		<normal file="@@@TDMBACKGROUND@@@" />
 		<pos width="100%" x="0" y="0" height="100%" />
 	</item>
 	<item type="pixmap" >
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop
index d50678db4..10ce5cc52 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop
@@ -5,6 +5,6 @@
 Encoding=UTF-8
 Greeter=enterprise.xml
 Name=O2 Enterprise
-Description=A sleek and professional looking KDM theme for Trinity
+Description=A sleek and professional looking TDM theme for Trinity
 Author=Ken Wimer (wimer@kde.org) and Timothy Pearson (kb9vqf@pearsoncomputing.net)
 Screenshot=preview.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enterprise.xml b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enterprise.xml
index 42e37f890..cf8aecd32 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enterprise.xml
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enterprise.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE greeter SYSTEM "greeter.dtd">
 <greeter>
 	<item type="pixmap" >
-		<normal file="@@@KDMBACKGROUND@@@" />
+		<normal file="@@@TDMBACKGROUND@@@" />
 		<pos width="100%" x="0" y="0" height="100%" />
 	</item>
 	<item type="pixmap" >
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog
index a18bff0ca..2fc3af7de 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog
@@ -185,7 +185,7 @@ kubuntu-default-settings (1:8.04-7) hardy; urgency=low
 kubuntu-default-settings (1:8.04-6) hardy; urgency=low
 
   * Fixed kdm-settings/20_kubuntu_default_settings, uses PreferUser to
-    match the user's choosen photo in KDM
+    match the user's choosen photo in TDM
 
  -- Anthony Mercatante <tonio@kubuntu.org>  Fri, 04 Jan 2008 15:52:46 +0100
 
@@ -255,7 +255,7 @@ kubuntu-default-settings (1:7.10-25) gutsy; urgency=low
 
 kubuntu-default-settings (1:7.10-24) gutsy; urgency=low
 
-  * Removed now useless KDM dependency
+  * Removed now useless TDM dependency
 
  -- Anthony Mercatante <tonio@kubuntu.org>  Wed, 26 Sep 2007 13:49:47 +0200
 
@@ -416,15 +416,15 @@ kubuntu-default-settings (1:7.10-4) gutsy; urgency=low
 
 kubuntu-default-settings (1:7.10-3) gutsy; urgency=low
 
-  * Remove KDM hacking from postinst and postrm
+  * Remove TDM hacking from postinst and postrm
   * Add kdm-settings/20_kubuntu_default_settings for
-    /etc/defaults/kdm.d/ for nice overloading of KDM settings
+    /etc/defaults/kdm.d/ for nice overloading of TDM settings
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 06 Jun 2007 17:55:53 +0100
 
 kubuntu-default-settings (1:7.10-2) gutsy; urgency=low
 
-  * Modify KDM theme to include user list, change by Timo Freyer lumpi_online@gmx.ch
+  * Modify TDM theme to include user list, change by Timo Freyer lumpi_online@gmx.ch
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  1 Jun 2007 13:29:20 +0100
 
@@ -1038,13 +1038,13 @@ kubuntu-default-settings (1:6.10-24) edgy; urgency=low
 
 kubuntu-default-settings (1:6.10-23) edgy; urgency=low
 
-  * Fix path to background image in KDM theme
+  * Fix path to background image in TDM theme
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 30 Aug 2006 13:30:20 +0000
 
 kubuntu-default-settings (1:6.10-22) edgy; urgency=low
 
-  * KDM theme fixes from Ken Wimer
+  * TDM theme fixes from Ken Wimer
   * New Konqueror background from Ken Wimer
   * Add Edgy amarok theme
 
@@ -1058,7 +1058,7 @@ kubuntu-default-settings (1:6.10-21) edgy; urgency=low
 
 kubuntu-default-settings (1:6.10-20) edgy; urgency=low
 
-  * Improved KDM theme from Ken Wimer
+  * Improved TDM theme from Ken Wimer
   * New KSplash theme from Ken Wimer
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 24 Aug 2006 13:43:12 +0100
@@ -1137,7 +1137,7 @@ kubuntu-default-settings (1:6.10-9) edgy; urgency=low
 
 kubuntu-default-settings (1:6.10-8) edgy; urgency=low
 
-  * New KDM theme from Ken Wimer
+  * New TDM theme from Ken Wimer
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 19 Aug 2006 22:05:11 +0100
 
@@ -1234,7 +1234,7 @@ kubuntu-default-settings (1:6.06-18) dapper; urgency=low
 
 kubuntu-default-settings (1:6.06-17) dapper; urgency=low
 
-  * Updated KDM artwork from Ken Wimer
+  * Updated TDM artwork from Ken Wimer
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 May 2006 00:16:19 +0100
 
@@ -1386,7 +1386,7 @@ kubuntu-default-settings (1:6.04-16) dapper; urgency=low
 kubuntu-default-settings (1:6.04-15) dapper; urgency=low
 
   * Make default window style kwin3_crystal
-  * Give ksplash same background as KDM
+  * Give ksplash same background as TDM
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 13 Mar 2006 23:58:24 +0000
 
@@ -1410,7 +1410,7 @@ kubuntu-default-settings (1:6.04-12) dapper; urgency=low
 
   * Change selected colours and button forground colour
   * Dapper usplash image
-  * Dapper KDM theme
+  * Dapper TDM theme
   * Dapper KSplash Moodin theme
   * Tweak lipstick settings
   * Menu drop shadow in kstylerc
@@ -1474,7 +1474,7 @@ kubuntu-default-settings (1:6.04-7) dapper; urgency=low
   * Added tabs on top for konversation and default theme set to "Square"
     for better visibility
   * Added ksvgplugin with integration set to "contextToolBar"
-  * Added new KDM theme and KSplash Moodin theme
+  * Added new TDM theme and KSplash Moodin theme
   * Changed font effect on the desktop for better visibility
   * Correct amarok's kubuntu theme installation
   * Added knemorc
@@ -1517,7 +1517,7 @@ kubuntu-default-settings (1:6.04-5) dapper; urgency=low
     tdeioslaves default activation in order to have an homogenous ark integration in kde with
     rar, 7z and other compressed files
   * Makefile updated to install all new files
-  * Add postinst and postrm scripts to edit kdmrc for Debian KDM theme, stops kdm 
+  * Add postinst and postrm scripts to edit kdmrc for Debian TDM theme, stops kdm 
     having to depend on kubuntu-default-settings
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  9 Jan 2006 04:50:25 +0000
@@ -1619,7 +1619,7 @@ kubuntu-default-settings (1:5.10-11) breezy; urgency=low
 
 kubuntu-default-settings (1:5.10-10) breezy; urgency=low
 
-  * Update KDM theme and add matching splash screen
+  * Update TDM theme and add matching splash screen
   * Add login sound
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 24 Sep 2005 13:21:08 +0100
@@ -1632,7 +1632,7 @@ kubuntu-default-settings (1:5.10-9) breezy; urgency=low
 
 kubuntu-default-settings (1:5.10-8) breezy; urgency=low
 
-  * New KDM theme and background
+  * New TDM theme and background
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 19 Sep 2005 15:39:44 +0100
 
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/copyright b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/copyright
index bc1a0cd44..1dfa5cbb8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/copyright
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/copyright
@@ -24,7 +24,7 @@ may be found in the file /usr/share/common-licenses/GPL.
 Items which include the Debian logo:
 
 Debian Konqueror Throbber, copyright 2005 Matea Tzilkov <matea.tzilkov@gmail.com>
-KDM theme and KSplash theme, copyright 2006 Ken Wimer <kwwii@bootsplash.org>
+TDM theme and KSplash theme, copyright 2006 Ken Wimer <kwwii@bootsplash.org>
 Metabar and Amarok sidebar themes, copyright 2006 Ken Wimer <kwwii@bootsplash.org>
 
 License: Creative Commons Legal Code Attribution-ShareAlike 2.5
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile
index c18753ef2..6c213aa2c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile
@@ -5,10 +5,10 @@ WALLPAPER_DIR = $(DESTDIR)/usr/share/wallpapers
 SOUNDS_DIR = $(DESTDIR)/usr/share/sounds

 KICKER_DIR = $(DESTDIR)/usr/share/apps/kicker

 KONQ_TILES_DIR = $(DESTDIR)/usr/share/apps/konqueror/tiles

-KDM_THEME_DIR = $(DESTDIR)/opt/trinity/share/apps/tdm/themes/kubuntu-trinity

-KDM_THEME_NO_USERLIST_DIR = $(DESTDIR)/opt/trinity/share/apps/tdm/themes/kubuntu-no-userlist-trinity

-KDM_OVERRIDE = $(DESTDIR)/etc/default/tdm-trinity.d/

-KDM_SETTINGS_DIR = $(DESTDIR)/etc/trinity/tdm/

+TDM_THEME_DIR = $(DESTDIR)/opt/trinity/share/apps/tdm/themes/kubuntu-trinity

+TDM_THEME_NO_USERLIST_DIR = $(DESTDIR)/opt/trinity/share/apps/tdm/themes/kubuntu-no-userlist-trinity

+TDM_OVERRIDE = $(DESTDIR)/etc/default/tdm-trinity.d/

+TDM_SETTINGS_DIR = $(DESTDIR)/etc/trinity/tdm/

 KSPLASH_THEME_DIR = $(DESTDIR)/opt/trinity/share/apps/ksplash/Themes/kubuntu

 SETTINGS_DIR = $(DESTDIR)/usr/share/redmond-default-settings-trinity

 CURSOR_DIR = $(DESTDIR)/usr/share/icons/contrastlarge

@@ -21,9 +21,9 @@ build:
 clean:

 

 install:

-	mkdir -p "$(KDM_SETTINGS_DIR)"

-	install -m644 backgroundrc "$(KDM_SETTINGS_DIR)"

-	install -m644 tdmdistrc "$(KDM_SETTINGS_DIR)"

+	mkdir -p "$(TDM_SETTINGS_DIR)"

+	install -m644 backgroundrc "$(TDM_SETTINGS_DIR)"

+	install -m644 tdmdistrc "$(TDM_SETTINGS_DIR)"

 

 	mkdir -p "$(WALLPAPER_DIR)"

 	install -m644 artwork/kubuntu-wallpaper.png  "$(WALLPAPER_DIR)"

@@ -189,11 +189,11 @@ install:
 	mkdir -p "$(KICKER_DIR)/wallpapers"

 	install -m644 artwork/kubuntu-panel.png  "$(KICKER_DIR)/wallpapers/"

 

-	mkdir -p "$(KDM_THEME_DIR)"

-	install -m644 artwork/tdm-theme/*  "$(KDM_THEME_DIR)"

+	mkdir -p "$(TDM_THEME_DIR)"

+	install -m644 artwork/tdm-theme/*  "$(TDM_THEME_DIR)"

 

-	mkdir -p "$(KDM_THEME_NO_USERLIST_DIR)"

-	install -m644 artwork/tdm-theme-no-userlist/*  "$(KDM_THEME_NO_USERLIST_DIR)"

+	mkdir -p "$(TDM_THEME_NO_USERLIST_DIR)"

+	install -m644 artwork/tdm-theme-no-userlist/*  "$(TDM_THEME_NO_USERLIST_DIR)"

 

 	mkdir -p "$(KSPLASH_THEME_DIR)"

 	install -m644 artwork/ksplash/*  "$(KSPLASH_THEME_DIR)"

diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/copyright b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/copyright
index 0fdfbf2aa..da861bc89 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/copyright
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/copyright
@@ -24,7 +24,7 @@ may be found in the file /usr/share/common-licenses/GPL.
 Items which include the Kubuntu logo:
 
 Kubuntu Konqueror Throbber, copyright 2005 Matea Tzilkov <matea.tzilkov@gmail.com>
-KDM theme and KSplash theme, copyright 2006 Ken Wimer <kwwii@bootsplash.org>
+TDM theme and KSplash theme, copyright 2006 Ken Wimer <kwwii@bootsplash.org>
 Metabar and Amarok sidebar themes, copyright 2006 Ken Wimer <kwwii@bootsplash.org>
 
 License: Creative Commons Legal Code Attribution-ShareAlike 2.5
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/Makefile b/ubuntu/maverick/defaultsettings/redmond-default-settings/Makefile
index 6268b91c7..40306f9ae 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/Makefile
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/Makefile
@@ -5,10 +5,10 @@ WALLPAPER_DIR = $(DESTDIR)/usr/share/wallpapers
 SOUNDS_DIR = $(DESTDIR)/usr/share/sounds

 KICKER_DIR = $(DESTDIR)/usr/share/apps/kicker

 KONQ_TILES_DIR = $(DESTDIR)/usr/share/apps/konqueror/tiles

-KDM_THEME_DIR = $(DESTDIR)/opt/trinity/share/apps/tdm/themes/kubuntu-trinity

-KDM_THEME_NO_USERLIST_DIR = $(DESTDIR)/opt/trinity/share/apps/tdm/themes/kubuntu-no-userlist-trinity

-KDM_OVERRIDE = $(DESTDIR)/etc/default/tdm-trinity.d/

-KDM_SETTINGS_DIR = $(DESTDIR)/etc/trinity/tdm/

+TDM_THEME_DIR = $(DESTDIR)/opt/trinity/share/apps/tdm/themes/kubuntu-trinity

+TDM_THEME_NO_USERLIST_DIR = $(DESTDIR)/opt/trinity/share/apps/tdm/themes/kubuntu-no-userlist-trinity

+TDM_OVERRIDE = $(DESTDIR)/etc/default/tdm-trinity.d/

+TDM_SETTINGS_DIR = $(DESTDIR)/etc/trinity/tdm/

 KSPLASH_THEME_DIR = $(DESTDIR)/opt/trinity/share/apps/ksplash/Themes/kubuntu

 SETTINGS_DIR = $(DESTDIR)/usr/share/redmond-default-settings-trinity

 CURSOR_DIR = $(DESTDIR)/usr/share/icons/contrastlarge

@@ -20,9 +20,9 @@ build:
 clean:

 

 install:

-	mkdir -p "$(KDM_SETTINGS_DIR)"

-	install -m644 backgroundrc "$(KDM_SETTINGS_DIR)"

-	install -m644 tdmdistrc "$(KDM_SETTINGS_DIR)"

+	mkdir -p "$(TDM_SETTINGS_DIR)"

+	install -m644 backgroundrc "$(TDM_SETTINGS_DIR)"

+	install -m644 tdmdistrc "$(TDM_SETTINGS_DIR)"

 

 	mkdir -p "$(WALLPAPER_DIR)"

 	install -m644 artwork/kubuntu-wallpaper.png  "$(WALLPAPER_DIR)"

@@ -188,11 +188,11 @@ install:
 	mkdir -p "$(KICKER_DIR)/wallpapers"

 	install -m644 artwork/kubuntu-panel.png  "$(KICKER_DIR)/wallpapers/"

 

-	mkdir -p "$(KDM_THEME_DIR)"

-	install -m644 artwork/tdm-theme/*  "$(KDM_THEME_DIR)"

+	mkdir -p "$(TDM_THEME_DIR)"

+	install -m644 artwork/tdm-theme/*  "$(TDM_THEME_DIR)"

 

-	mkdir -p "$(KDM_THEME_NO_USERLIST_DIR)"

-	install -m644 artwork/tdm-theme-no-userlist/*  "$(KDM_THEME_NO_USERLIST_DIR)"

+	mkdir -p "$(TDM_THEME_NO_USERLIST_DIR)"

+	install -m644 artwork/tdm-theme-no-userlist/*  "$(TDM_THEME_NO_USERLIST_DIR)"

 

 	mkdir -p "$(KSPLASH_THEME_DIR)"

 	install -m644 artwork/ksplash/*  "$(KSPLASH_THEME_DIR)"

diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/copyright b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/copyright
index 0fdfbf2aa..da861bc89 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/copyright
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/copyright
@@ -24,7 +24,7 @@ may be found in the file /usr/share/common-licenses/GPL.
 Items which include the Kubuntu logo:
 
 Kubuntu Konqueror Throbber, copyright 2005 Matea Tzilkov <matea.tzilkov@gmail.com>
-KDM theme and KSplash theme, copyright 2006 Ken Wimer <kwwii@bootsplash.org>
+TDM theme and KSplash theme, copyright 2006 Ken Wimer <kwwii@bootsplash.org>
 Metabar and Amarok sidebar themes, copyright 2006 Ken Wimer <kwwii@bootsplash.org>
 
 License: Creative Commons Legal Code Attribution-ShareAlike 2.5