8 files changed, 50 insertions, 50 deletions
diff --git a/debian/squeeze/tdeutils/debian/changelog b/debian/squeeze/tdeutils/debian/changelog
index b3d3af82b..71992aefe 100644
--- a/debian/squeeze/tdeutils/debian/changelog
+++ b/debian/squeeze/tdeutils/debian/changelog
@@ -268,7 +268,7 @@ tdeutils (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.
     + Fixes kcalc: Alt-H does not select hex. (Closes: #272026)
-    + Fixes kwalletmanager does not appear in kde system tray.
+    + Fixes tdewalletmanager does not appear in kde system tray.
       (Closes: #372258)
     + Fixes kgpg: Kgpg editor crashes on decrypting. (Closes: #372767)
 
@@ -287,7 +287,7 @@ tdeutils (4:3.5.4-1) unstable; urgency=low
   * New upstream release.
 
   * KDE_3_5_BRANCH update (up to r567761).
-    + Fixes kwalletmanager crashes on logout. (Closes: #372564, #377001)
+    + Fixes tdewalletmanager crashes on logout. (Closes: #372564, #377001)
 
   +++ Changes by Christopher Martin:
 
@@ -312,7 +312,7 @@ tdeutils (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
   * kubuntu_12_kmilo_actions.diff updated
-  * Remove kubuntu_13_downgrade_kwallet.diff
+  * Remove kubuntu_13_downgrade_tdewallet.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:05 +0000
 
@@ -325,8 +325,8 @@ tdeutils (4:3.5.4-0ubuntu5) edgy; urgency=low
 
 tdeutils (4:3.5.4-0ubuntu4) edgy; urgency=low
 
-  * Added kubuntu_13_downgrade_kwallet to avoid bug #57696, downgrading
-    kwalletmanager to 3.5.2, This bug has been reported on KDE 2 month
+  * Added kubuntu_13_downgrade_tdewallet to avoid bug #57696, downgrading
+    tdewalletmanager to 3.5.2, This bug has been reported on KDE 2 month
     ago (http://bugs.kde.org/show_bug.cgi?id=129161) and 3.5.4 has been
     released without any correction. 
     Because most apps' authentication system is based on this, the issue
diff --git a/debian/squeeze/tdeutils/debian/control b/debian/squeeze/tdeutils/debian/control
index 23132b0e0..956b68ea3 100644
--- a/debian/squeeze/tdeutils/debian/control
+++ b/debian/squeeze/tdeutils/debian/control
@@ -13,7 +13,7 @@ Section: tde
 Architecture: all
 Replaces: kdeutils-trinity (<< 4:14.0.0)
 Breaks: kdeutils-trinity (<< 4:14.0.0)
-Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), kdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), kwalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
+Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), kdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
 Suggests: tdeutils-trinity-doc-html (>= ${Source-Version})
 Description: general purpose utilities from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -343,11 +343,11 @@ Description: timer utility for Trinity
  This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
-Package: kwalletmanager-trinity
+Package: tdewalletmanager-trinity
 Section: utils
 Architecture: any
-Replaces: kwalletmanager-trinity (<< 4:14.0.0)
-Breaks: kwalletmanager-trinity (<< 4:14.0.0)
+Replaces: tdewalletmanager-trinity (<< 4:14.0.0)
+Breaks: tdewalletmanager-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Description: wallet manager for Trinity
diff --git a/debian/squeeze/tdeutils/debian/control.in b/debian/squeeze/tdeutils/debian/control.in
index f1d64bd00..f86496f4d 100644
--- a/debian/squeeze/tdeutils/debian/control.in
+++ b/debian/squeeze/tdeutils/debian/control.in
@@ -11,7 +11,7 @@ Standards-Version: 3.7.2
 Package: tdeutils
 Section: tde
 Architecture: all
-Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), kwalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version})
+Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), tdewalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version})
 Suggests: tdeutils-doc-html (>= ${Source-Version})
 Description: general purpose utilities from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -287,7 +287,7 @@ Description: timer utility for KDE
  This package is part of KDE, as a component of the KDE utilities module.
  See the 'kde' and 'tdeutils' packages for more information.
 
-Package: kwalletmanager
+Package: tdewalletmanager
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
diff --git a/debian/squeeze/tdeutils/debian/kwalletmanager-trinity.install b/debian/squeeze/tdeutils/debian/kwalletmanager-trinity.install
deleted file mode 100644
index 1ba37d2e3..000000000
--- a/debian/squeeze/tdeutils/debian/kwalletmanager-trinity.install
+++ /dev/null
@@ -1,31 +0,0 @@
-debian/tmp/opt/trinity/bin/kwalletmanager
-debian/tmp/opt/trinity/lib/trinity/kcm_kwallet.la
-debian/tmp/opt/trinity/lib/trinity/kcm_kwallet.so
-debian/tmp/opt/trinity/share/applications/tde/kwalletconfig.desktop
-debian/tmp/opt/trinity/share/applications/tde/kwalletmanager.desktop
-debian/tmp/opt/trinity/share/applications/tde/kwalletmanager-kwalletd.desktop
-debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png
-debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_open.png
-debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png
-debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png
-debian/tmp/opt/trinity/share/apps/kwalletmanager/kwalleteditor.rc
-debian/tmp/opt/trinity/share/apps/kwalletmanager/kwalletmanager.rc
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/cr22-action-wallet_closed.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/cr22-action-wallet_open.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit1.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit2.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit3.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/kwalletmanager.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/password1.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/password2.png
-debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kwalletmanager.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kwalletmanager.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kwalletmanager.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kwalletmanager.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kwalletmanager.png
-debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kwalletmanager.png
-debian/tmp/opt/trinity/share/services/kwallet_config.desktop
-debian/tmp/opt/trinity/share/services/kwalletmanager_show.desktop
diff --git a/debian/squeeze/tdeutils/debian/man/kcharselect-trinity.1 b/debian/squeeze/tdeutils/debian/man/kcharselect-trinity.1
index 15d1c35d9..d6ba31cf5 100644
--- a/debian/squeeze/tdeutils/debian/man/kcharselect-trinity.1
+++ b/debian/squeeze/tdeutils/debian/man/kcharselect-trinity.1
@@ -204,10 +204,10 @@ shared over more than one screen.
 Specifies the X display to run KDE on.
 .IP KDESYCOCA
 Specifies and alternative path for the 
-.I ksycoca
+.I tdesycoca
 KDE system configuration cache file.
 The default path is
-/tmp/kde-$USER/ksycoca
+/tmp/kde-$USER/tdesycoca
 .IP DCOPSERVER
 Specifies an alternative path for the DCOP server file. The default
 file is
diff --git a/debian/squeeze/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet b/debian/squeeze/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet
index 6331a925f..d87ba35e0 100644
--- a/debian/squeeze/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet
+++ b/debian/squeeze/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet
@@ -1,10 +1,10 @@
-Document: tdeutils-doc-html-kwallet
+Document: tdeutils-doc-html-tdewallet
 Title: KWallet Handbook
 Author: George Staikos, Lauri Watts
 Abstract: The wallet subsytem provides a convenient and secure way to manage all your passwords.
 Section: Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kwallet/index.html
-Files: /usr/share/doc/tde/HTML/en/kwallet/*.html
+Index: /usr/share/doc/tde/HTML/en/tdewallet/index.html
+Files: /usr/share/doc/tde/HTML/en/tdewallet/*.html
 
diff --git a/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install b/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install
index 17d66276d..a04353048 100644
--- a/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install
+++ b/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/opt/trinity/include/kmultiformlistbox.h
-debian/tmp/opt/trinity/include/kmultiformlistboxentry.h
-debian/tmp/opt/trinity/include/kmultiformlistboxfactory.h
+debian/tmp/opt/trinity/include/tdemultiformlistbox.h
+debian/tmp/opt/trinity/include/tdemultiformlistboxentry.h
+debian/tmp/opt/trinity/include/tdemultiformlistboxfactory.h
 debian/tmp/opt/trinity/include/ksim/chart.h
 debian/tmp/opt/trinity/include/ksim/common.h
 debian/tmp/opt/trinity/include/ksim/ksimconfig.h
diff --git a/debian/squeeze/tdeutils/debian/tdewalletmanager-trinity.install b/debian/squeeze/tdeutils/debian/tdewalletmanager-trinity.install
new file mode 100644
index 000000000..6e75bf792
--- /dev/null
+++ b/debian/squeeze/tdeutils/debian/tdewalletmanager-trinity.install
@@ -0,0 +1,31 @@
+debian/tmp/opt/trinity/bin/tdewalletmanager
+debian/tmp/opt/trinity/lib/trinity/kcm_tdewallet.la
+debian/tmp/opt/trinity/lib/trinity/kcm_tdewallet.so
+debian/tmp/opt/trinity/share/applications/tde/tdewalletconfig.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdewalletmanager.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdewalletmanager-tdewalletd.desktop
+debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png
+debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/folder_open.png
+debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png
+debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png
+debian/tmp/opt/trinity/share/apps/tdewalletmanager/tdewalleteditor.rc
+debian/tmp/opt/trinity/share/apps/tdewalletmanager/tdewalletmanager.rc
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/cr22-action-wallet_closed.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/cr22-action-wallet_open.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/tdewalletmanager.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/password1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/password2.png
+debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/tdewalletmanager.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdewalletmanager.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdewalletmanager.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdewalletmanager.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdewalletmanager.png
+debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/tdewalletmanager.png
+debian/tmp/opt/trinity/share/services/tdewallet_config.desktop
+debian/tmp/opt/trinity/share/services/tdewalletmanager_show.desktop