Update Debian and Ubuntu packaging to match recent renaming

11 files changed, 16 insertions, 16 deletions

diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile
index fa069e33a..9cb53d701 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile
@@ -136,8 +136,8 @@ install:
 	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"

 	install -m644 kpart-rc-files/ksvgplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"

 

-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/khtml/"

-	install -m644 kpart-rc-files/khtml_browser.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/khtml/"

+	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"

+	install -m644 kpart-rc-files/tdehtml_browser.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"

 

 	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"

 	install -m644 mimelnk/x-tar.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"

@@ -149,8 +149,8 @@ install:
 	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"

 	install -m644 kpart-plugins/dirfilterplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"

 

-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwallet/"

-	install -m644 kwallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwallet/"

+	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"

+	install -m644 tdewallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"

 

 	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"

 	install -m644 artwork/window-decoration-gradient.png "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"

diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog
index a44775158..7504e67fc 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog
@@ -240,7 +240,7 @@ kubuntu-default-settings (1:7.10-27) gutsy; urgency=low
 
 kubuntu-default-settings (1:7.10-26) gutsy; urgency=low
 
-  * Fixed khtmlrc, now uses easylist instead of filterset.g. Fixes LP:
+  * Fixed tdehtmlrc, now uses easylist instead of filterset.g. Fixes LP:
     #99535
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Sat, 29 Sep 2007 11:41:52 +0200
@@ -1110,7 +1110,7 @@ kubuntu-default-settings (1:6.10-13) edgy; urgency=low
 
 kubuntu-default-settings (1:6.10-12) edgy; urgency=low
 
-  * Improved khtmlrc for better adblock filters
+  * Improved tdehtmlrc for better adblock filters
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 20 Aug 2006 20:55:01 +0200
 
@@ -1423,7 +1423,7 @@ kubuntu-default-settings (1:6.04-12) dapper; urgency=low
 
 kubuntu-default-settings (1:6.04-11) dapper; urgency=low
 
-  * Added khtmlrc with a disabled list of filters for adblock
+  * Added tdehtmlrc with a disabled list of filters for adblock
   * Changed log directory for konversation, from $HOME to
     $HOME/.kde/share/apps/konversation/logs
   * knemorc improved with different iconsets depending the kind of connection.
@@ -1444,7 +1444,7 @@ kubuntu-default-settings (1:6.04-10) dapper; urgency=low
     konversation and keep tabs arround the focus
   * Added dirfilterplugin.rc to make usage of dirfilter in konqueror's filemanagement
     profile by default
-  * Added kwalletrc and kdewallet.kwl for confortable default config on new profiles
+  * Added tdewalletrc and kdewallet.kwl for confortable default config on new profiles
   * Changed kdeprintrc to use localhost as default CUPS server
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 28 Feb 2006 15:38:52 +0000
@@ -1507,10 +1507,10 @@ kubuntu-default-settings (1:6.04-5) dapper; urgency=low
   * Added ark_part.rc, ark_part_readonly.rc, gvimagepart.rc, part.rc in folder
     kpart-rc-files, with integration set to "contextToolBar"
   * Updated konquerorrc, setting contextToolBar's "NewLine" value to "true"
-    (doesn't work if set in kparts' configuration files while clicking another tab and
+    (doesn't work if set in tdeparts' configuration files while clicking another tab and
     coming back)
     MediumFontSize set to 10
-  * Added khtml_browser.rc, removing DOM entries in the konq's "view" menu
+  * Added tdehtml_browser.rc, removing DOM entries in the konq's "view" menu
   * Updated filemagement profile, adding Sidebar by default
   * Added x-tar.desktop, x-tarz.desktop, x-tbz.desktop, x-tgz.desktop, x-zip.desktop
     in folder mimelnk, with blanked "LocalProtocol" value, to remove tar and zip
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/katerc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/katerc
index 10fd37bab..f952dff62 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/katerc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/katerc
@@ -6,4 +6,4 @@ Session Exit=discard
 Startup Session=new
 
 [Kate Document Defaults]
-KTextEditor Plugin ktexteditor_isearch=true
+KTextEditor Plugin tdetexteditor_isearch=true
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/khtmlrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/khtmlrc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdehtmlrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kwalletrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdewalletrc
index 326194cb6..d0dce217c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kwalletrc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdewalletrc
@@ -1,5 +1,5 @@
 [Auto Allow]
-kdewallet=kwalletmanager
+kdewallet=tdewalletmanager
 
 [Auto Deny]
 kdewallet=
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/khtmlrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/khtmlrc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdehtmlrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kwalletrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdewalletrc
index 326194cb6..d0dce217c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kwalletrc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdewalletrc
@@ -1,5 +1,5 @@
 [Auto Allow]
-kdewallet=kwalletmanager
+kdewallet=tdewalletmanager
 
 [Auto Deny]
 kdewallet=
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part.rc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part.rc
index da8f97f73..a45167843 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part.rc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="ark_kparts" version="8">
+<kpartgui name="ark_tdeparts" version="8">
 <ActionProperties>
     <Action name="select_all" icon="ark_selectall"/>
 </ActionProperties>
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc
index 888d12e8d..df2c4f29f 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="ark_kparts" version="7">
+<kpartgui name="ark_tdeparts" version="7">
 <ActionProperties>
     <Action name="select_all" icon="ark_selectall"/>
 </ActionProperties>
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/khtml_browser.rc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/tdehtml_browser.rc
index 2eab2a321..069870b55 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/khtml_browser.rc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/tdehtml_browser.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="khtmlpart" version="19">
+<kpartgui name="tdehtmlpart" version="19">
 <MenuBar>
  <Menu name="file"><text>&amp;File</text>
   <Action name="saveBackground" />
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kwallet-default-wallet/kdewallet.kwl b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tdewallet-default-wallet/kdewallet.kwl
index 485b2e683..485b2e683 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kwallet-default-wallet/kdewallet.kwl
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tdewallet-default-wallet/kdewallet.kwl