Update Debian and Ubuntu packaging to match recent renaming

18 files changed, 23 insertions, 23 deletions

diff --git a/debian/lenny/applications/kaffeine/debian/changelog b/debian/lenny/applications/kaffeine/debian/changelog
index ae8921760..3f11ad0ae 100644
--- a/debian/lenny/applications/kaffeine/debian/changelog
+++ b/debian/lenny/applications/kaffeine/debian/changelog
@@ -302,7 +302,7 @@ kaffeine (0.8.4-0ubuntu1) gutsy; urgency=low
   * Added libxcb builddep.
   * Added back kaffeine-gstreamer package
   * Removed obsolete kubuntu_05_restore_contrast.diff
-  * Add kubuntu_06_kparts_mimetype_checking.diff:
+  * Add kubuntu_06_tdeparts_mimetype_checking.diff:
     - Makes it possible to select the engine to use.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 05 Mai 2007 11:02:23 +0100
diff --git a/debian/lenny/applications/kaffeine/debian/copyright b/debian/lenny/applications/kaffeine/debian/copyright
index 8b7ddae56..e1f37677a 100644
--- a/debian/lenny/applications/kaffeine/debian/copyright
+++ b/debian/lenny/applications/kaffeine/debian/copyright
@@ -8,7 +8,7 @@ Upstream authors:
    Christoph Pfister <christophpfister@gmail.com>
    Jurgen Kofler <kaffeine@gmx.net>
 
-Copyright for kmultitabbar:
+Copyright for tdemultitabbar:
    (C) 2001-2003 Joseph Wenninger <jowenn@kde.org>
 
 Copyright for kaffeine_export copied from kat:
diff --git a/debian/lenny/applications/kmplayer/debian/changelog b/debian/lenny/applications/kmplayer/debian/changelog
index 26a6aed53..233e1f465 100644
--- a/debian/lenny/applications/kmplayer/debian/changelog
+++ b/debian/lenny/applications/kmplayer/debian/changelog
@@ -52,7 +52,7 @@ kmplayer (1:0.10.0b-1) unstable; urgency=low
 kmplayer (1:0.10.0b-0ubuntu1) hardy; urgency=low
 
   * New upstream release.
-  * Dropped kubuntu_02_use_default_config_with_kparts_.diff - applied upstream.
+  * Dropped kubuntu_02_use_default_config_with_tdeparts_.diff - applied upstream.
   * Updated email in kmplayer.1.docbook.
   * Updated Standards-Version to 3.7.3.0.
 
@@ -335,7 +335,7 @@ kmplayer (0.9.1.99+0.9.2-pre3-0ubuntu1) dapper; urgency=low
   [Anthony Mercatante]
   * Package polishing (debian/copyright, debian/rules...)
   * Added kubuntu_01_use_xine_by_default.patch to make usage of wine by default
-  * Added kubuntu_02_use_default_config_with_kparts_.patch to enable default
+  * Added kubuntu_02_use_default_config_with_tdeparts_.patch to enable default
     config in the konqueror plugin
   * Tarball rebuilt to remove obsolete debian/ folder in it
 
diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/changelog b/debian/lenny/applications/knetworkmanager.cmake/debian/changelog
index ed0d32a81..d430a6b1e 100644
--- a/debian/lenny/applications/knetworkmanager.cmake/debian/changelog
+++ b/debian/lenny/applications/knetworkmanager.cmake/debian/changelog
@@ -272,7 +272,7 @@ knetworkmanager (1:0.1-3) unstable; urgency=low
     - debian/patches/07-overlay_icon_vpn.patch
       + Show overlay icon (lock) for active VPN connections.
     - debian/patches/08-disable_sm.patch
-      + Disable session management to avoid a deadlock when accessing kwallet.
+      + Disable session management to avoid a deadlock when accessing tdewallet.
         Install an autostart file into /usr/share/autostart/ instead.
         Closes: #406162
     - debian/patches/09-dbus_bool_t.patch
diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/control b/debian/lenny/applications/knetworkmanager.cmake/debian/control
index 988450b51..6650a2b73 100644
--- a/debian/lenny/applications/knetworkmanager.cmake/debian/control
+++ b/debian/lenny/applications/knetworkmanager.cmake/debian/control
@@ -27,7 +27,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
 Replaces: network-manager-kde (<< 4:14.0.0)
 Breaks: network-manager-kde (<< 4:14.0.0)
-Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
+Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
 Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
 Description: KDE systray applet for controlling NetworkManager [Trinity]
diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/control.in b/debian/lenny/applications/knetworkmanager.cmake/debian/control.in
index 9a213de18..6ec9fbbd7 100644
--- a/debian/lenny/applications/knetworkmanager.cmake/debian/control.in
+++ b/debian/lenny/applications/knetworkmanager.cmake/debian/control.in
@@ -27,7 +27,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager
 Package: network-manager-kde-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
-Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
+Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
 Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
 Description: KDE systray applet for controlling NetworkManager [Trinity]
diff --git a/debian/lenny/applications/knetworkmanager8/debian/changelog b/debian/lenny/applications/knetworkmanager8/debian/changelog
index 04405984c..b68efdcf7 100644
--- a/debian/lenny/applications/knetworkmanager8/debian/changelog
+++ b/debian/lenny/applications/knetworkmanager8/debian/changelog
@@ -272,7 +272,7 @@ knetworkmanager (1:0.1-3) unstable; urgency=low
     - debian/patches/07-overlay_icon_vpn.patch
       + Show overlay icon (lock) for active VPN connections.
     - debian/patches/08-disable_sm.patch
-      + Disable session management to avoid a deadlock when accessing kwallet.
+      + Disable session management to avoid a deadlock when accessing tdewallet.
         Install an autostart file into /usr/share/autostart/ instead.
         Closes: #406162
     - debian/patches/09-dbus_bool_t.patch
diff --git a/debian/lenny/applications/knetworkmanager8/debian/control b/debian/lenny/applications/knetworkmanager8/debian/control
index 711f2e99d..2f3d45694 100644
--- a/debian/lenny/applications/knetworkmanager8/debian/control
+++ b/debian/lenny/applications/knetworkmanager8/debian/control
@@ -28,7 +28,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9)
 Replaces: network-manager-kde-trinity (<< 4:14.0.0)
 Breaks: network-manager-kde-trinity (<< 4:14.0.0)
-Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
+Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
 Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
 Description: KDE systray applet for controlling NetworkManager [Trinity]
diff --git a/debian/lenny/applications/knetworkmanager8/debian/control.in b/debian/lenny/applications/knetworkmanager8/debian/control.in
index 9a213de18..6ec9fbbd7 100644
--- a/debian/lenny/applications/knetworkmanager8/debian/control.in
+++ b/debian/lenny/applications/knetworkmanager8/debian/control.in
@@ -27,7 +27,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager
 Package: network-manager-kde-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
-Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
+Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
 Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
 Description: KDE systray applet for controlling NetworkManager [Trinity]
diff --git a/debian/lenny/applications/knetworkmanager9/debian/control b/debian/lenny/applications/knetworkmanager9/debian/control
index c32604bbf..efd256a36 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/control
+++ b/debian/lenny/applications/knetworkmanager9/debian/control
@@ -16,7 +16,7 @@ Homepage: http://www.trinitydesktop.org/
 Package: network-manager-tde
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: kwalletmanager-trinity
+Recommends: tdewalletmanager-trinity
 Provides: tdenetworkmanager-trinity
 Description: TDE systray applet for controlling networking [Trinity]
  Systray applet for controlling network connections managed by 
diff --git a/debian/lenny/applications/knetworkmanager9/debian/control.in b/debian/lenny/applications/knetworkmanager9/debian/control.in
index e54418ea6..a5cefc2bb 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/control.in
+++ b/debian/lenny/applications/knetworkmanager9/debian/control.in
@@ -18,7 +18,7 @@ Homepage: http://www.trinitydesktop.org/
 Package: network-manager-tde
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: kwalletmanager-trinity
+Recommends: tdewalletmanager-trinity
 Provides: tdenetworkmanager-trinity
 Description: TDE systray applet for controlling networking [Trinity]
  Systray applet for controlling network connections managed by
diff --git a/debian/lenny/applications/koffice/debian/chalk-data-trinity.install b/debian/lenny/applications/koffice/debian/chalk-data-trinity.install
index 7bed60e6c..a0e03ae3b 100644
--- a/debian/lenny/applications/koffice/debian/chalk-data-trinity.install
+++ b/debian/lenny/applications/koffice/debian/chalk-data-trinity.install
@@ -352,7 +352,7 @@ debian/tmp/opt/trinity/share/services/chalk_rgb_u16_plugin.desktop
 debian/tmp/opt/trinity/share/services/chalkrotateimage.desktop
 debian/tmp/opt/trinity/share/services/chalkroundcornersfilter.desktop
 debian/tmp/opt/trinity/share/services/chalkscreenshot.desktop
-debian/tmp/opt/trinity/share/services/chalkscripting.desktop
+debian/tmp/opt/trinity/share/services/chaltdescripting.desktop
 debian/tmp/opt/trinity/share/services/chalkselectiontools.desktop
 debian/tmp/opt/trinity/share/services/chalkselectopaque.desktop
 debian/tmp/opt/trinity/share/services/chalkseparatechannels.desktop
diff --git a/debian/lenny/applications/koffice/debian/chalk-trinity.install b/debian/lenny/applications/koffice/debian/chalk-trinity.install
index 4df24b77e..66afcfbba 100644
--- a/debian/lenny/applications/koffice/debian/chalk-trinity.install
+++ b/debian/lenny/applications/koffice/debian/chalk-trinity.install
@@ -73,8 +73,8 @@ debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.la
 debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.so
-debian/tmp/opt/trinity/lib/trinity/chalkscripting.la
-debian/tmp/opt/trinity/lib/trinity/chalkscripting.so
+debian/tmp/opt/trinity/lib/trinity/chaltdescripting.la
+debian/tmp/opt/trinity/lib/trinity/chaltdescripting.so
 debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.la
 debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.so
 debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.la
@@ -152,6 +152,6 @@ debian/tmp/opt/trinity/lib/libchalkimage.so.*
 debian/tmp/opt/trinity/lib/libchalk_lms_*.so.*
 debian/tmp/opt/trinity/lib/libchalk_rgb_*.so.*
 debian/tmp/opt/trinity/lib/libchalkrgb.so.*
-debian/tmp/opt/trinity/lib/libchalkscripting.so.*
+debian/tmp/opt/trinity/lib/libchaltdescripting.so.*
 debian/tmp/opt/trinity/lib/libchalkui.so.*
 debian/tmp/opt/trinity/lib/libchalk_ycbcr_*.so.*
diff --git a/debian/lenny/applications/koffice/debian/chalk-trinity.lintian b/debian/lenny/applications/koffice/debian/chalk-trinity.lintian
index 08adc5291..cdf64af56 100644
--- a/debian/lenny/applications/koffice/debian/chalk-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/chalk-trinity.lintian
@@ -1,4 +1,4 @@
 chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so
 chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
+chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchaltdescripting0 libchalkui1
 
diff --git a/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install b/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install
index 4b80b83ec..f28ee3bef 100644
--- a/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install
+++ b/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install
@@ -79,8 +79,8 @@ debian/tmp/opt/trinity/lib/libchalkimage.la
 debian/tmp/opt/trinity/lib/libchalkimage.so
 debian/tmp/opt/trinity/lib/libchalkrgb.la
 debian/tmp/opt/trinity/lib/libchalkrgb.so
-debian/tmp/opt/trinity/lib/libchalkscripting.la
-debian/tmp/opt/trinity/lib/libchalkscripting.so
+debian/tmp/opt/trinity/lib/libchaltdescripting.la
+debian/tmp/opt/trinity/lib/libchaltdescripting.so
 debian/tmp/opt/trinity/lib/libchalkui.la
 debian/tmp/opt/trinity/lib/libchalkui.so
 debian/tmp/opt/trinity/lib/libkrossapi.la
diff --git a/debian/lenny/applications/kpowersave.cmake/debian/changelog b/debian/lenny/applications/kpowersave.cmake/debian/changelog
index c23417124..2d09c1e65 100644
--- a/debian/lenny/applications/kpowersave.cmake/debian/changelog
+++ b/debian/lenny/applications/kpowersave.cmake/debian/changelog
@@ -162,7 +162,7 @@ kpowersave (0.6.2-5) unstable; urgency=low
 
   * Prepend a sequence number to all patches.
   * debian/patches/03-reset_blankonly_to_default.patch
-    - Added. Reset kscreensaver settings to correct default values on scheme 
+    - Added. Reset tdescreensaver settings to correct default values on scheme 
       changes and on application shutdown.
       Patch by Modestas Vainius, thanks! Closes: #399473
 
diff --git a/debian/lenny/applications/kpowersave/debian/changelog b/debian/lenny/applications/kpowersave/debian/changelog
index c23417124..2d09c1e65 100644
--- a/debian/lenny/applications/kpowersave/debian/changelog
+++ b/debian/lenny/applications/kpowersave/debian/changelog
@@ -162,7 +162,7 @@ kpowersave (0.6.2-5) unstable; urgency=low
 
   * Prepend a sequence number to all patches.
   * debian/patches/03-reset_blankonly_to_default.patch
-    - Added. Reset kscreensaver settings to correct default values on scheme 
+    - Added. Reset tdescreensaver settings to correct default values on scheme 
       changes and on application shutdown.
       Patch by Modestas Vainius, thanks! Closes: #399473
 
diff --git a/debian/lenny/applications/tde-style-qtcurve/debian/changelog b/debian/lenny/applications/tde-style-qtcurve/debian/changelog
index 3ff72d99c..f7612d81f 100644
--- a/debian/lenny/applications/tde-style-qtcurve/debian/changelog
+++ b/debian/lenny/applications/tde-style-qtcurve/debian/changelog
@@ -83,8 +83,8 @@ tde-style-qtcurve (0.52.3-1) unstable; urgency=low
 
   * Don't lighten border of disabled check/radio buttons.
   * Lighten trough of disabled slider.
-  * Modify khtml check to also check to see if widget name == "__khtml"
-  * Store khtml widgets in a map, to speed up checking.
+  * Modify tdehtml check to also check to see if widget name == "__tdehtml"
+  * Store tdehtml widgets in a map, to speed up checking.
   * Fix shadow on comboboxes.
   * Draw background of checked menuitem icons as per KDE4.