Update Debian and Ubuntu packaging for latest GIT

55 files changed, 131 insertions, 131 deletions

diff --git a/debian/lenny/applications/kradio/debian/control b/debian/lenny/applications/kradio/debian/control
index 3631e61e3..35e42b8ae 100644
--- a/debian/lenny/applications/kradio/debian/control
+++ b/debian/lenny/applications/kradio/debian/control
@@ -12,10 +12,10 @@ Depends: ${shlibs:Depends}
 Replaces: kradio-trinity (<< 4:14.0.0)
 Breaks: kradio-trinity (<< 4:14.0.0)
 Description: Comfortable Radio Application for KDE [Trinity]
- KRadio is a comfortable radio application for KDE 3.x with support for 
+ TDERadio is a comfortable radio application for KDE 3.x with support for 
  V4L and V4L2 radio cards drivers.
  .
- KRadio currently provides
+ TDERadio currently provides
  .
    * V4L/V4L2 radio support
    * Remote control support (LIRC)
@@ -26,8 +26,8 @@ Description: Comfortable Radio Application for KDE [Trinity]
    * Extendable plugin architecture
  .
  This package also includes a growing collection of station preset
- files for many cities around the world contributed by KRadio users.
+ files for many cities around the world contributed by TDERadio users.
  .
- As KRadio is based on an extendable plugin architecture, contributions
+ As TDERadio is based on an extendable plugin architecture, contributions
  of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
  .
diff --git a/debian/lenny/applications/kradio/debian/kradio.1 b/debian/lenny/applications/kradio/debian/kradio.1
index 3b715d05d..47fdb40d7 100644
--- a/debian/lenny/applications/kradio/debian/kradio.1
+++ b/debian/lenny/applications/kradio/debian/kradio.1
@@ -1,12 +1,12 @@
 .\" This file was generated by kdemangen.pl
-.TH KRADIO 1 "Dec 2005" "K Desktop Environment" "KRadio"
+.TH KRADIO 1 "Dec 2005" "K Desktop Environment" "TDERadio"
 .SH NAME
 kradio
-\- KRadio
+\- TDERadio
 .SH SYNOPSIS
 kradio [Qt\-options] [KDE\-options] 
 .SH DESCRIPTION
-KRadio
+TDERadio
 .SH OPTIONS
 .SS Generic options:
 .TP
diff --git a/debian/lenny/applications/kradio/debian/menu b/debian/lenny/applications/kradio/debian/menu
index 773521bdb..aef47274f 100644
--- a/debian/lenny/applications/kradio/debian/menu
+++ b/debian/lenny/applications/kradio/debian/menu
@@ -1,7 +1,7 @@
 ?package(kradio):needs="X11" \
   section="Applications/TV and Radio" \
   hints="TDE" \
-  title="KRadio" \
+  title="TDERadio" \
   longtitle="K-Radio Application" \
   command="/opt/trinity/bin/kradio" \
   icon="/opt/trinity/share/pixmaps/kradio.xpm"
diff --git a/debian/lenny/tdelibs/debian/changelog b/debian/lenny/tdelibs/debian/changelog
index 8beea2a79..3b293e399 100644
--- a/debian/lenny/tdelibs/debian/changelog
+++ b/debian/lenny/tdelibs/debian/changelog
@@ -433,7 +433,7 @@ tdelibs (4:3.5.8-0ubuntu4) hardy; urgency=low
 tdelibs (4:3.5.8-0ubuntu3.1) gutsy-proposed; urgency=low
 
   * Add kubuntu_94_kselectaction.diff Closes: LP #155144
-    Editable KSelectAction stopped working for custom values
+    Editable TDESelectAction stopped working for custom values
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 21 Oct 2007 00:09:25 +0100
 
diff --git a/debian/lenny/tdelibs/debian/man/tdelauncher-trinity.1 b/debian/lenny/tdelibs/debian/man/tdelauncher-trinity.1
index 9029a5ace..70345461d 100644
--- a/debian/lenny/tdelibs/debian/man/tdelauncher-trinity.1
+++ b/debian/lenny/tdelibs/debian/man/tdelauncher-trinity.1
@@ -8,7 +8,7 @@ tdelauncher
 .sp 1
 \fBtdelauncher\fP is a daemon responsible for service activation in KDE. It operates closely together with the tdeinit master process to start new processes. KDE applications communicate with \fBtdelauncher\fP via DCOP to start new applications or services.
 .sp 1
-The error message "KLauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBtdelauncher\fP crashed.
+The error message "TDELauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBtdelauncher\fP crashed.
 .sp 1
 Note: \fBtdelauncher\fP is not the "run command" dialog (Alt+F2)!
 .SH SEE ALSO
diff --git a/debian/lenny/tdemultimedia/debian/changelog b/debian/lenny/tdemultimedia/debian/changelog
index f6c8c5527..a17c83ad7 100644
--- a/debian/lenny/tdemultimedia/debian/changelog
+++ b/debian/lenny/tdemultimedia/debian/changelog
@@ -817,7 +817,7 @@ tdemultimedia (4:3.1.2-1.2) unstable; urgency=low
       sense. (Closes: #220174)
     - Comment out inline assembly macro. (Closes: #220176)
     - Make sure subclasses inherit publicly from class
-      KListViewItem. (Closes: #220179)
+      TDEListViewItem. (Closes: #220179)
 
  -- Petter Reinholdtsen <pere@debian.org>  Tue, 11 Nov 2003 16:31:46 +0000
 
diff --git a/debian/lenny/tdesdk/debian/man/demangle.1 b/debian/lenny/tdesdk/debian/man/demangle.1
index 0719fe1f4..b387aacd9 100644
--- a/debian/lenny/tdesdk/debian/man/demangle.1
+++ b/debian/lenny/tdesdk/debian/man/demangle.1
@@ -34,7 +34,7 @@ _ZNK6Object10metaObjectEv
 .br
 _ZN8QPtrListI5ArrowE5clearEv
 .br
-_ZTC4Kolf0_11KMainWindow
+_ZTC4Kolf0_11TDEMainWindow
 .RE
 .PP
 These names can then be demangled as follows:
@@ -46,7 +46,7 @@ Object::metaObject() const
 .br
 QPtrList<Arrow>::clear()
 .br
-construction vtable for KMainWindow-in-Kolf
+construction vtable for TDEMainWindow-in-Kolf
 .RE
 .SH SEE ALSO
 .BR kminspector (1),
diff --git a/debian/squeeze/applications/kradio/debian/control b/debian/squeeze/applications/kradio/debian/control
index 3631e61e3..35e42b8ae 100644
--- a/debian/squeeze/applications/kradio/debian/control
+++ b/debian/squeeze/applications/kradio/debian/control
@@ -12,10 +12,10 @@ Depends: ${shlibs:Depends}
 Replaces: kradio-trinity (<< 4:14.0.0)
 Breaks: kradio-trinity (<< 4:14.0.0)
 Description: Comfortable Radio Application for KDE [Trinity]
- KRadio is a comfortable radio application for KDE 3.x with support for 
+ TDERadio is a comfortable radio application for KDE 3.x with support for 
  V4L and V4L2 radio cards drivers.
  .
- KRadio currently provides
+ TDERadio currently provides
  .
    * V4L/V4L2 radio support
    * Remote control support (LIRC)
@@ -26,8 +26,8 @@ Description: Comfortable Radio Application for KDE [Trinity]
    * Extendable plugin architecture
  .
  This package also includes a growing collection of station preset
- files for many cities around the world contributed by KRadio users.
+ files for many cities around the world contributed by TDERadio users.
  .
- As KRadio is based on an extendable plugin architecture, contributions
+ As TDERadio is based on an extendable plugin architecture, contributions
  of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
  .
diff --git a/debian/squeeze/applications/kradio/debian/kradio.1 b/debian/squeeze/applications/kradio/debian/kradio.1
index 3b715d05d..47fdb40d7 100644
--- a/debian/squeeze/applications/kradio/debian/kradio.1
+++ b/debian/squeeze/applications/kradio/debian/kradio.1
@@ -1,12 +1,12 @@
 .\" This file was generated by kdemangen.pl
-.TH KRADIO 1 "Dec 2005" "K Desktop Environment" "KRadio"
+.TH KRADIO 1 "Dec 2005" "K Desktop Environment" "TDERadio"
 .SH NAME
 kradio
-\- KRadio
+\- TDERadio
 .SH SYNOPSIS
 kradio [Qt\-options] [KDE\-options] 
 .SH DESCRIPTION
-KRadio
+TDERadio
 .SH OPTIONS
 .SS Generic options:
 .TP
diff --git a/debian/squeeze/applications/kradio/debian/menu b/debian/squeeze/applications/kradio/debian/menu
index 773521bdb..aef47274f 100644
--- a/debian/squeeze/applications/kradio/debian/menu
+++ b/debian/squeeze/applications/kradio/debian/menu
@@ -1,7 +1,7 @@
 ?package(kradio):needs="X11" \
   section="Applications/TV and Radio" \
   hints="TDE" \
-  title="KRadio" \
+  title="TDERadio" \
   longtitle="K-Radio Application" \
   command="/opt/trinity/bin/kradio" \
   icon="/opt/trinity/share/pixmaps/kradio.xpm"
diff --git a/debian/squeeze/tdelibs/debian/changelog b/debian/squeeze/tdelibs/debian/changelog
index 8beea2a79..3b293e399 100644
--- a/debian/squeeze/tdelibs/debian/changelog
+++ b/debian/squeeze/tdelibs/debian/changelog
@@ -433,7 +433,7 @@ tdelibs (4:3.5.8-0ubuntu4) hardy; urgency=low
 tdelibs (4:3.5.8-0ubuntu3.1) gutsy-proposed; urgency=low
 
   * Add kubuntu_94_kselectaction.diff Closes: LP #155144
-    Editable KSelectAction stopped working for custom values
+    Editable TDESelectAction stopped working for custom values
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 21 Oct 2007 00:09:25 +0100
 
diff --git a/debian/squeeze/tdelibs/debian/man/tdelauncher-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdelauncher-trinity.1
index 9029a5ace..70345461d 100644
--- a/debian/squeeze/tdelibs/debian/man/tdelauncher-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdelauncher-trinity.1
@@ -8,7 +8,7 @@ tdelauncher
 .sp 1
 \fBtdelauncher\fP is a daemon responsible for service activation in KDE. It operates closely together with the tdeinit master process to start new processes. KDE applications communicate with \fBtdelauncher\fP via DCOP to start new applications or services.
 .sp 1
-The error message "KLauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBtdelauncher\fP crashed.
+The error message "TDELauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBtdelauncher\fP crashed.
 .sp 1
 Note: \fBtdelauncher\fP is not the "run command" dialog (Alt+F2)!
 .SH SEE ALSO
diff --git a/debian/squeeze/tdemultimedia/debian/changelog b/debian/squeeze/tdemultimedia/debian/changelog
index f6c8c5527..a17c83ad7 100644
--- a/debian/squeeze/tdemultimedia/debian/changelog
+++ b/debian/squeeze/tdemultimedia/debian/changelog
@@ -817,7 +817,7 @@ tdemultimedia (4:3.1.2-1.2) unstable; urgency=low
       sense. (Closes: #220174)
     - Comment out inline assembly macro. (Closes: #220176)
     - Make sure subclasses inherit publicly from class
-      KListViewItem. (Closes: #220179)
+      TDEListViewItem. (Closes: #220179)
 
  -- Petter Reinholdtsen <pere@debian.org>  Tue, 11 Nov 2003 16:31:46 +0000
 
diff --git a/debian/squeeze/tdesdk/debian/man/demangle.1 b/debian/squeeze/tdesdk/debian/man/demangle.1
index 0719fe1f4..b387aacd9 100644
--- a/debian/squeeze/tdesdk/debian/man/demangle.1
+++ b/debian/squeeze/tdesdk/debian/man/demangle.1
@@ -34,7 +34,7 @@ _ZNK6Object10metaObjectEv
 .br
 _ZN8QPtrListI5ArrowE5clearEv
 .br
-_ZTC4Kolf0_11KMainWindow
+_ZTC4Kolf0_11TDEMainWindow
 .RE
 .PP
 These names can then be demangled as follows:
@@ -46,7 +46,7 @@ Object::metaObject() const
 .br
 QPtrList<Arrow>::clear()
 .br
-construction vtable for KMainWindow-in-Kolf
+construction vtable for TDEMainWindow-in-Kolf
 .RE
 .SH SEE ALSO
 .BR kminspector (1),
diff --git a/debian/wheezy/applications/kradio/debian/control b/debian/wheezy/applications/kradio/debian/control
index 3631e61e3..35e42b8ae 100644
--- a/debian/wheezy/applications/kradio/debian/control
+++ b/debian/wheezy/applications/kradio/debian/control
@@ -12,10 +12,10 @@ Depends: ${shlibs:Depends}
 Replaces: kradio-trinity (<< 4:14.0.0)
 Breaks: kradio-trinity (<< 4:14.0.0)
 Description: Comfortable Radio Application for KDE [Trinity]
- KRadio is a comfortable radio application for KDE 3.x with support for 
+ TDERadio is a comfortable radio application for KDE 3.x with support for 
  V4L and V4L2 radio cards drivers.
  .
- KRadio currently provides
+ TDERadio currently provides
  .
    * V4L/V4L2 radio support
    * Remote control support (LIRC)
@@ -26,8 +26,8 @@ Description: Comfortable Radio Application for KDE [Trinity]
    * Extendable plugin architecture
  .
  This package also includes a growing collection of station preset
- files for many cities around the world contributed by KRadio users.
+ files for many cities around the world contributed by TDERadio users.
  .
- As KRadio is based on an extendable plugin architecture, contributions
+ As TDERadio is based on an extendable plugin architecture, contributions
  of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
  .
diff --git a/debian/wheezy/applications/kradio/debian/kradio.1 b/debian/wheezy/applications/kradio/debian/kradio.1
index 3b715d05d..47fdb40d7 100644
--- a/debian/wheezy/applications/kradio/debian/kradio.1
+++ b/debian/wheezy/applications/kradio/debian/kradio.1
@@ -1,12 +1,12 @@
 .\" This file was generated by kdemangen.pl
-.TH KRADIO 1 "Dec 2005" "K Desktop Environment" "KRadio"
+.TH KRADIO 1 "Dec 2005" "K Desktop Environment" "TDERadio"
 .SH NAME
 kradio
-\- KRadio
+\- TDERadio
 .SH SYNOPSIS
 kradio [Qt\-options] [KDE\-options] 
 .SH DESCRIPTION
-KRadio
+TDERadio
 .SH OPTIONS
 .SS Generic options:
 .TP
diff --git a/debian/wheezy/applications/kradio/debian/menu b/debian/wheezy/applications/kradio/debian/menu
index 773521bdb..aef47274f 100644
--- a/debian/wheezy/applications/kradio/debian/menu
+++ b/debian/wheezy/applications/kradio/debian/menu
@@ -1,7 +1,7 @@
 ?package(kradio):needs="X11" \
   section="Applications/TV and Radio" \
   hints="TDE" \
-  title="KRadio" \
+  title="TDERadio" \
   longtitle="K-Radio Application" \
   command="/opt/trinity/bin/kradio" \
   icon="/opt/trinity/share/pixmaps/kradio.xpm"
diff --git a/debian/wheezy/tdelibs/debian/changelog b/debian/wheezy/tdelibs/debian/changelog
index 8beea2a79..3b293e399 100644
--- a/debian/wheezy/tdelibs/debian/changelog
+++ b/debian/wheezy/tdelibs/debian/changelog
@@ -433,7 +433,7 @@ tdelibs (4:3.5.8-0ubuntu4) hardy; urgency=low
 tdelibs (4:3.5.8-0ubuntu3.1) gutsy-proposed; urgency=low
 
   * Add kubuntu_94_kselectaction.diff Closes: LP #155144
-    Editable KSelectAction stopped working for custom values
+    Editable TDESelectAction stopped working for custom values
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 21 Oct 2007 00:09:25 +0100
 
diff --git a/debian/wheezy/tdelibs/debian/man/tdelauncher-trinity.1 b/debian/wheezy/tdelibs/debian/man/tdelauncher-trinity.1
index 9029a5ace..70345461d 100644
--- a/debian/wheezy/tdelibs/debian/man/tdelauncher-trinity.1
+++ b/debian/wheezy/tdelibs/debian/man/tdelauncher-trinity.1
@@ -8,7 +8,7 @@ tdelauncher
 .sp 1
 \fBtdelauncher\fP is a daemon responsible for service activation in KDE. It operates closely together with the tdeinit master process to start new processes. KDE applications communicate with \fBtdelauncher\fP via DCOP to start new applications or services.
 .sp 1
-The error message "KLauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBtdelauncher\fP crashed.
+The error message "TDELauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBtdelauncher\fP crashed.
 .sp 1
 Note: \fBtdelauncher\fP is not the "run command" dialog (Alt+F2)!
 .SH SEE ALSO
diff --git a/debian/wheezy/tdemultimedia/debian/changelog b/debian/wheezy/tdemultimedia/debian/changelog
index f6c8c5527..a17c83ad7 100644
--- a/debian/wheezy/tdemultimedia/debian/changelog
+++ b/debian/wheezy/tdemultimedia/debian/changelog
@@ -817,7 +817,7 @@ tdemultimedia (4:3.1.2-1.2) unstable; urgency=low
       sense. (Closes: #220174)
     - Comment out inline assembly macro. (Closes: #220176)
     - Make sure subclasses inherit publicly from class
-      KListViewItem. (Closes: #220179)
+      TDEListViewItem. (Closes: #220179)
 
  -- Petter Reinholdtsen <pere@debian.org>  Tue, 11 Nov 2003 16:31:46 +0000
 
diff --git a/debian/wheezy/tdesdk/debian/man/demangle.1 b/debian/wheezy/tdesdk/debian/man/demangle.1
index 0719fe1f4..b387aacd9 100644
--- a/debian/wheezy/tdesdk/debian/man/demangle.1
+++ b/debian/wheezy/tdesdk/debian/man/demangle.1
@@ -34,7 +34,7 @@ _ZNK6Object10metaObjectEv
 .br
 _ZN8QPtrListI5ArrowE5clearEv
 .br
-_ZTC4Kolf0_11KMainWindow
+_ZTC4Kolf0_11TDEMainWindow
 .RE
 .PP
 These names can then be demangled as follows:
@@ -46,7 +46,7 @@ Object::metaObject() const
 .br
 QPtrList<Arrow>::clear()
 .br
-construction vtable for KMainWindow-in-Kolf
+construction vtable for TDEMainWindow-in-Kolf
 .RE
 .SH SEE ALSO
 .BR kminspector (1),
diff --git a/ubuntu/lucid_automake/applications/kerry/debian/patches/kubuntu_05_shortkey.patch b/ubuntu/lucid_automake/applications/kerry/debian/patches/kubuntu_05_shortkey.patch
index 6478949f6..7000016ed 100644
--- a/ubuntu/lucid_automake/applications/kerry/debian/patches/kubuntu_05_shortkey.patch
+++ b/ubuntu/lucid_automake/applications/kerry/debian/patches/kubuntu_05_shortkey.patch
@@ -5,9 +5,9 @@ diff -Nur kerry-0.2.1/kerry/src/kerryapp.cpp kerry-0.2.1.new/kerry/src/kerryapp.
    globalKeys = new KGlobalAccel(this);
    globalKeys->insert( "Program:kerry", i18n("Kerry Beagle Search") );
  
--  KShortcut showDialogShortcut = KShortcut(ALT+Key_Space);
+-  TDEShortcut showDialogShortcut = TDEShortcut(ALT+Key_Space);
 -  showDialogShortcut.append( KKey( Key_F12 ) );
-+  KShortcut showDialogShortcut = KShortcut(CTRL+SHIFT+Key_Space);
++  TDEShortcut showDialogShortcut = TDEShortcut(CTRL+SHIFT+Key_Space);
    globalKeys->insert( "Show Kerry Dialog", i18n("Show Search Dialog"), QString::null, showDialogShortcut, showDialogShortcut, hitListWindow, SLOT(showSearchDialog()) );
    globalKeys->insert( "Search Primary Selection with Kerry", i18n("Search Primary Selection"), QString::null, CTRL+ALT+Key_Space, CTRL+ALT+Key_Space, this, SLOT(searchPrimarySelection()) );
    configChanged();
diff --git a/ubuntu/lucid_automake/applications/kradio/debian/control b/ubuntu/lucid_automake/applications/kradio/debian/control
index 2a173789f..4403795d0 100644
--- a/ubuntu/lucid_automake/applications/kradio/debian/control
+++ b/ubuntu/lucid_automake/applications/kradio/debian/control
@@ -10,10 +10,10 @@ Package: kradio-kde3
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Comfortable Radio Application for KDE [KDE3]
- KRadio is a comfortable radio application for KDE 3.x with support for 
+ TDERadio is a comfortable radio application for KDE 3.x with support for 
  V4L and V4L2 radio cards drivers.
  .
- KRadio currently provides
+ TDERadio currently provides
  .
    * V4L/V4L2 radio support
    * Remote control support (LIRC)
@@ -24,8 +24,8 @@ Description: Comfortable Radio Application for KDE [KDE3]
    * Extendable plugin architecture
  .
  This package also includes a growing collection of station preset
- files for many cities around the world contributed by KRadio users.
+ files for many cities around the world contributed by TDERadio users.
  .
- As KRadio is based on an extendable plugin architecture, contributions
+ As TDERadio is based on an extendable plugin architecture, contributions
  of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
  .
diff --git a/ubuntu/lucid_automake/applications/kradio/debian/kradio.1 b/ubuntu/lucid_automake/applications/kradio/debian/kradio.1
index 3b715d05d..47fdb40d7 100644
--- a/ubuntu/lucid_automake/applications/kradio/debian/kradio.1
+++ b/ubuntu/lucid_automake/applications/kradio/debian/kradio.1
@@ -1,12 +1,12 @@
 .\" This file was generated by kdemangen.pl
-.TH KRADIO 1 "Dec 2005" "K Desktop Environment" "KRadio"
+.TH KRADIO 1 "Dec 2005" "K Desktop Environment" "TDERadio"
 .SH NAME
 kradio
-\- KRadio
+\- TDERadio
 .SH SYNOPSIS
 kradio [Qt\-options] [KDE\-options] 
 .SH DESCRIPTION
-KRadio
+TDERadio
 .SH OPTIONS
 .SS Generic options:
 .TP
diff --git a/ubuntu/lucid_automake/applications/kradio/debian/menu b/ubuntu/lucid_automake/applications/kradio/debian/menu
index ed206dd11..bae72be5f 100644
--- a/ubuntu/lucid_automake/applications/kradio/debian/menu
+++ b/ubuntu/lucid_automake/applications/kradio/debian/menu
@@ -1,7 +1,7 @@
 ?package(kradio):needs="X11" \
   section="Applications/TV and Radio" \
   hints="KDE" \
-  title="KRadio" \
+  title="TDERadio" \
   longtitle="K-Radio Application" \
   command="/opt/kde3/bin/kradio" \
   icon="/opt/kde3/share/pixmaps/kradio.xpm"
diff --git a/ubuntu/lucid_automake/kdelibs/debian/changelog b/ubuntu/lucid_automake/kdelibs/debian/changelog
index eb547118d..b1123744c 100644
--- a/ubuntu/lucid_automake/kdelibs/debian/changelog
+++ b/ubuntu/lucid_automake/kdelibs/debian/changelog
@@ -433,7 +433,7 @@ kdelibs (4:3.5.8-0ubuntu4) hardy; urgency=low
 kdelibs (4:3.5.8-0ubuntu3.1) gutsy-proposed; urgency=low
 
   * Add kubuntu_94_kselectaction.diff Closes: LP #155144
-    Editable KSelectAction stopped working for custom values
+    Editable TDESelectAction stopped working for custom values
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 21 Oct 2007 00:09:25 +0100
 
diff --git a/ubuntu/lucid_automake/kdelibs/debian/man/tdelauncher-kde3.1 b/ubuntu/lucid_automake/kdelibs/debian/man/tdelauncher-kde3.1
index efad216e3..c718e204c 100644
--- a/ubuntu/lucid_automake/kdelibs/debian/man/tdelauncher-kde3.1
+++ b/ubuntu/lucid_automake/kdelibs/debian/man/tdelauncher-kde3.1
@@ -8,7 +8,7 @@ tdelauncher
 .sp 1
 \fBtdelauncher\fP is a daemon responsible for service activation in KDE. It operates closely together with the kdeinit master process to start new processes. KDE applications communicate with \fBtdelauncher\fP via DCOP to start new applications or services.
 .sp 1
-The error message "KLauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBtdelauncher\fP crashed.
+The error message "TDELauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBtdelauncher\fP crashed.
 .sp 1
 Note: \fBtdelauncher\fP is not the "run command" dialog (Alt+F2)!
 .SH SEE ALSO
diff --git a/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_51_launchpad_integration.diff b/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_51_launchpad_integration.diff
index b6f4e497f..80238d564 100644
--- a/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_51_launchpad_integration.diff
+++ b/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_51_launchpad_integration.diff
@@ -26,7 +26,7 @@ diff -Nur kdelibs-3.5.8/kdeui/khelpmenu.cpp kdelibs-3.5.8.new/kdeui/khelpmenu.cp
 +    mMenu->insertItem( SmallIcon("locale"), i18n( "&Translate this Application" ), this, TQT_SLOT(kubuntuTranslate()) );
 +    mMenu->insertSeparator();
 +
-     if (kapp->authorizeKAction("help_about_app"))
+     if (kapp->authorizeTDEAction("help_about_app"))
      {
        mMenu->insertItem( kapp->miniIcon(),
 @@ -233,6 +240,24 @@
@@ -72,11 +72,11 @@ diff -Nur kdelibs-3.5.8/kdeui/kstdaction.cpp kdelibs-3.5.8.new/kdeui/kstdaction.
 +++ kdelibs-3.5.8.new/kdeui/kstdaction.cpp	2007-10-09 09:39:54.000000000 +0100
 @@ -319,5 +319,9 @@
  	{ return KStdAction::create( AboutApp, name, recvr, slot, parent ); }
- KAction *aboutKDE( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+ TDEAction *aboutKDE( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
  	{ return KStdAction::create( AboutKDE, name, recvr, slot, parent ); }
-+KAction *kubuntuTranslate( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
++TDEAction *kubuntuTranslate( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 +	{ return KStdAction::create( KubuntuTranslate, name, recvr, slot, parent ); }
-+KAction *kubuntuGetHelpOnline( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
++TDEAction *kubuntuGetHelpOnline( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 +	{ return KStdAction::create( KubuntuGetHelpOnline, name, recvr, slot, parent ); }
  
  }
@@ -93,14 +93,14 @@ diff -Nur kdelibs-3.5.8/kdeui/kstdaction.h kdelibs-3.5.8.new/kdeui/kstdaction.h
  
 @@ -609,6 +610,12 @@
  	*/
- 	KDEUI_EXPORT KAction *switchApplicationLanguage(const TQObject *recvr, const char *slot,
- 				KActionCollection* parent, const char *name = 0 );
+ 	KDEUI_EXPORT TDEAction *switchApplicationLanguage(const TQObject *recvr, const char *slot,
+ 				TDEActionCollection* parent, const char *name = 0 );
 +
-+	KDEUI_EXPORT KAction *kubuntuTranslate(const TQObject *recvr, const char *slot,
-+				KActionCollection* parent, const char *name = 0 );
++	KDEUI_EXPORT TDEAction *kubuntuTranslate(const TQObject *recvr, const char *slot,
++				TDEActionCollection* parent, const char *name = 0 );
 +
-+	KDEUI_EXPORT KAction *kubuntuGetHelpOnline(const TQObject *recvr, const char *slot,
-+				KActionCollection* parent, const char *name = 0 );
++	KDEUI_EXPORT TDEAction *kubuntuGetHelpOnline(const TQObject *recvr, const char *slot,
++				TDEActionCollection* parent, const char *name = 0 );
  }
  
  #endif // KSTDACTION_H
@@ -108,12 +108,12 @@ diff -Nur kdelibs-3.5.8/kdeui/kstdaction_p.h kdelibs-3.5.8.new/kdeui/kstdaction_
 --- kdelibs-3.5.8/kdeui/kstdaction_p.h	2007-10-08 10:52:12.000000000 +0100
 +++ kdelibs-3.5.8.new/kdeui/kstdaction_p.h	2007-10-09 09:39:54.000000000 +0100
 @@ -112,6 +112,8 @@
- 	{ SwitchApplicationLanguage,     KStdAccel::AccelNone, "switch_application_language", I18N_NOOP("Switch application &language..."), 0, 0 },
- 	{ AboutApp,      KStdAccel::AccelNone, "help_about_app", I18N_NOOP("&About %1"), 0, 0 },
- 	{ AboutKDE,      KStdAccel::AccelNone, "help_about_kde", I18N_NOOP("About &Trinity"), 0,"about_kde" },
-+	{ KubuntuGetHelpOnline,      KStdAccel::AccelNone, "kubuntu_get_help_online", I18N_NOOP("&Get Help Online"), 0, "launchpad" },
-+	{ KubuntuTranslate,      KStdAccel::AccelNone, "kubuntu_translate", I18N_NOOP("&Translate This Application"), 0, "locale" },
- 	{ ActionNone, KStdAccel::AccelNone, 0, 0, 0, 0 }
+ 	{ SwitchApplicationLanguage,     TDEStdAccel::AccelNone, "switch_application_language", I18N_NOOP("Switch application &language..."), 0, 0 },
+ 	{ AboutApp,      TDEStdAccel::AccelNone, "help_about_app", I18N_NOOP("&About %1"), 0, 0 },
+ 	{ AboutKDE,      TDEStdAccel::AccelNone, "help_about_kde", I18N_NOOP("About &Trinity"), 0,"about_kde" },
++	{ KubuntuGetHelpOnline,      TDEStdAccel::AccelNone, "kubuntu_get_help_online", I18N_NOOP("&Get Help Online"), 0, "launchpad" },
++	{ KubuntuTranslate,      TDEStdAccel::AccelNone, "kubuntu_translate", I18N_NOOP("&Translate This Application"), 0, "locale" },
+ 	{ ActionNone, TDEStdAccel::AccelNone, 0, 0, 0, 0 }
  };
  
 diff -Nur kdelibs-3.5.8/kdeui/ui_standards.rc kdelibs-3.5.8.new/kdeui/ui_standards.rc
diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/changelog b/ubuntu/lucid_automake/kdemultimedia/debian/changelog
index fcb1bff9f..7058c478d 100644
--- a/ubuntu/lucid_automake/kdemultimedia/debian/changelog
+++ b/ubuntu/lucid_automake/kdemultimedia/debian/changelog
@@ -817,7 +817,7 @@ kdemultimedia (4:3.1.2-1.2) unstable; urgency=low
       sense. (Closes: #220174)
     - Comment out inline assembly macro. (Closes: #220176)
     - Make sure subclasses inherit publicly from class
-      KListViewItem. (Closes: #220179)
+      TDEListViewItem. (Closes: #220179)
 
  -- Petter Reinholdtsen <pere@debian.org>  Tue, 11 Nov 2003 16:31:46 +0000
 
diff --git a/ubuntu/lucid_automake/kdesdk/debian/man/demangle.1 b/ubuntu/lucid_automake/kdesdk/debian/man/demangle.1
index 0719fe1f4..b387aacd9 100644
--- a/ubuntu/lucid_automake/kdesdk/debian/man/demangle.1
+++ b/ubuntu/lucid_automake/kdesdk/debian/man/demangle.1
@@ -34,7 +34,7 @@ _ZNK6Object10metaObjectEv
 .br
 _ZN8QPtrListI5ArrowE5clearEv
 .br
-_ZTC4Kolf0_11KMainWindow
+_ZTC4Kolf0_11TDEMainWindow
 .RE
 .PP
 These names can then be demangled as follows:
@@ -46,7 +46,7 @@ Object::metaObject() const
 .br
 QPtrList<Arrow>::clear()
 .br
-construction vtable for KMainWindow-in-Kolf
+construction vtable for TDEMainWindow-in-Kolf
 .RE
 .SH SEE ALSO
 .BR kminspector (1),
diff --git a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_05_shortkey.patch b/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_05_shortkey.patch
index 6881e817e..c4a705c68 100644
--- a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_05_shortkey.patch
+++ b/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_05_shortkey.patch
@@ -5,9 +5,9 @@ diff -Nur kerry-0.2.1/kerry/src/kerryapp.cpp kerry-0.2.1.new/kerry/src/kerryapp.
    globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
    globalKeys->insert( "Program:kerry", i18n("Kerry Beagle Search") );
 
--  KShortcut showDialogShortcut = KShortcut(ALT+Key_Space);
+-  TDEShortcut showDialogShortcut = TDEShortcut(ALT+Key_Space);
 -  showDialogShortcut.append( KKey( Key_F12 ) );
-+  KShortcut showDialogShortcut = KShortcut(CTRL+SHIFT+Key_Space);
++  TDEShortcut showDialogShortcut = TDEShortcut(CTRL+SHIFT+Key_Space);
    globalKeys->insert( "Show Kerry Dialog", i18n("Show Search Dialog"), TQString(), showDialogShortcut, showDialogShortcut, TQT_TQOBJECT(hitListWindow), TQT_SLOT(showSearchDialog()) );
    globalKeys->insert( "Search Primary Selection with Kerry", i18n("Search Primary Selection"), TQString(), CTRL+ALT+Key_Space, CTRL+ALT+Key_Space, TQT_TQOBJECT(this), TQT_SLOT(searchPrimarySelection()) );
    configChanged();
diff --git a/ubuntu/maverick/applications/kradio/debian/control b/ubuntu/maverick/applications/kradio/debian/control
index 3631e61e3..35e42b8ae 100644
--- a/ubuntu/maverick/applications/kradio/debian/control
+++ b/ubuntu/maverick/applications/kradio/debian/control
@@ -12,10 +12,10 @@ Depends: ${shlibs:Depends}
 Replaces: kradio-trinity (<< 4:14.0.0)
 Breaks: kradio-trinity (<< 4:14.0.0)
 Description: Comfortable Radio Application for KDE [Trinity]
- KRadio is a comfortable radio application for KDE 3.x with support for 
+ TDERadio is a comfortable radio application for KDE 3.x with support for 
  V4L and V4L2 radio cards drivers.
  .
- KRadio currently provides
+ TDERadio currently provides
  .
    * V4L/V4L2 radio support
    * Remote control support (LIRC)
@@ -26,8 +26,8 @@ Description: Comfortable Radio Application for KDE [Trinity]
    * Extendable plugin architecture
  .
  This package also includes a growing collection of station preset
- files for many cities around the world contributed by KRadio users.
+ files for many cities around the world contributed by TDERadio users.
  .
- As KRadio is based on an extendable plugin architecture, contributions
+ As TDERadio is based on an extendable plugin architecture, contributions
  of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
  .
diff --git a/ubuntu/maverick/applications/kradio/debian/kradio.1 b/ubuntu/maverick/applications/kradio/debian/kradio.1
index 3b715d05d..47fdb40d7 100644
--- a/ubuntu/maverick/applications/kradio/debian/kradio.1
+++ b/ubuntu/maverick/applications/kradio/debian/kradio.1
@@ -1,12 +1,12 @@
 .\" This file was generated by kdemangen.pl
-.TH KRADIO 1 "Dec 2005" "K Desktop Environment" "KRadio"
+.TH KRADIO 1 "Dec 2005" "K Desktop Environment" "TDERadio"
 .SH NAME
 kradio
-\- KRadio
+\- TDERadio
 .SH SYNOPSIS
 kradio [Qt\-options] [KDE\-options] 
 .SH DESCRIPTION
-KRadio
+TDERadio
 .SH OPTIONS
 .SS Generic options:
 .TP
diff --git a/ubuntu/maverick/applications/kradio/debian/menu b/ubuntu/maverick/applications/kradio/debian/menu
index 773521bdb..aef47274f 100644
--- a/ubuntu/maverick/applications/kradio/debian/menu
+++ b/ubuntu/maverick/applications/kradio/debian/menu
@@ -1,7 +1,7 @@
 ?package(kradio):needs="X11" \
   section="Applications/TV and Radio" \
   hints="TDE" \
-  title="KRadio" \
+  title="TDERadio" \
   longtitle="K-Radio Application" \
   command="/opt/trinity/bin/kradio" \
   icon="/opt/trinity/share/pixmaps/kradio.xpm"
diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog
index 8beea2a79..3b293e399 100644
--- a/ubuntu/maverick/tdelibs/debian/changelog
+++ b/ubuntu/maverick/tdelibs/debian/changelog
@@ -433,7 +433,7 @@ tdelibs (4:3.5.8-0ubuntu4) hardy; urgency=low
 tdelibs (4:3.5.8-0ubuntu3.1) gutsy-proposed; urgency=low
 
   * Add kubuntu_94_kselectaction.diff Closes: LP #155144
-    Editable KSelectAction stopped working for custom values
+    Editable TDESelectAction stopped working for custom values
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 21 Oct 2007 00:09:25 +0100
 
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdelauncher-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/tdelauncher-trinity.1
index 9029a5ace..70345461d 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdelauncher-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/tdelauncher-trinity.1
@@ -8,7 +8,7 @@ tdelauncher
 .sp 1
 \fBtdelauncher\fP is a daemon responsible for service activation in KDE. It operates closely together with the tdeinit master process to start new processes. KDE applications communicate with \fBtdelauncher\fP via DCOP to start new applications or services.
 .sp 1
-The error message "KLauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBtdelauncher\fP crashed.
+The error message "TDELauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBtdelauncher\fP crashed.
 .sp 1
 Note: \fBtdelauncher\fP is not the "run command" dialog (Alt+F2)!
 .SH SEE ALSO
diff --git a/ubuntu/maverick/tdemultimedia/debian/changelog b/ubuntu/maverick/tdemultimedia/debian/changelog
index f6c8c5527..a17c83ad7 100644
--- a/ubuntu/maverick/tdemultimedia/debian/changelog
+++ b/ubuntu/maverick/tdemultimedia/debian/changelog
@@ -817,7 +817,7 @@ tdemultimedia (4:3.1.2-1.2) unstable; urgency=low
       sense. (Closes: #220174)
     - Comment out inline assembly macro. (Closes: #220176)
     - Make sure subclasses inherit publicly from class
-      KListViewItem. (Closes: #220179)
+      TDEListViewItem. (Closes: #220179)
 
  -- Petter Reinholdtsen <pere@debian.org>  Tue, 11 Nov 2003 16:31:46 +0000
 
diff --git a/ubuntu/maverick/tdesdk/debian/man/demangle.1 b/ubuntu/maverick/tdesdk/debian/man/demangle.1
index 0719fe1f4..b387aacd9 100644
--- a/ubuntu/maverick/tdesdk/debian/man/demangle.1
+++ b/ubuntu/maverick/tdesdk/debian/man/demangle.1
@@ -34,7 +34,7 @@ _ZNK6Object10metaObjectEv
 .br
 _ZN8QPtrListI5ArrowE5clearEv
 .br
-_ZTC4Kolf0_11KMainWindow
+_ZTC4Kolf0_11TDEMainWindow
 .RE
 .PP
 These names can then be demangled as follows:
@@ -46,7 +46,7 @@ Object::metaObject() const
 .br
 QPtrList<Arrow>::clear()
 .br
-construction vtable for KMainWindow-in-Kolf
+construction vtable for TDEMainWindow-in-Kolf
 .RE
 .SH SEE ALSO
 .BR kminspector (1),
diff --git a/ubuntu/maverick_automake/applications/kerry/debian/patches/kubuntu_05_shortkey.patch b/ubuntu/maverick_automake/applications/kerry/debian/patches/kubuntu_05_shortkey.patch
index 6478949f6..7000016ed 100644
--- a/ubuntu/maverick_automake/applications/kerry/debian/patches/kubuntu_05_shortkey.patch
+++ b/ubuntu/maverick_automake/applications/kerry/debian/patches/kubuntu_05_shortkey.patch
@@ -5,9 +5,9 @@ diff -Nur kerry-0.2.1/kerry/src/kerryapp.cpp kerry-0.2.1.new/kerry/src/kerryapp.
    globalKeys = new KGlobalAccel(this);
    globalKeys->insert( "Program:kerry", i18n("Kerry Beagle Search") );
  
--  KShortcut showDialogShortcut = KShortcut(ALT+Key_Space);
+-  TDEShortcut showDialogShortcut = TDEShortcut(ALT+Key_Space);
 -  showDialogShortcut.append( KKey( Key_F12 ) );
-+  KShortcut showDialogShortcut = KShortcut(CTRL+SHIFT+Key_Space);
++  TDEShortcut showDialogShortcut = TDEShortcut(CTRL+SHIFT+Key_Space);
    globalKeys->insert( "Show Kerry Dialog", i18n("Show Search Dialog"), QString::null, showDialogShortcut, showDialogShortcut, hitListWindow, SLOT(showSearchDialog()) );
    globalKeys->insert( "Search Primary Selection with Kerry", i18n("Search Primary Selection"), QString::null, CTRL+ALT+Key_Space, CTRL+ALT+Key_Space, this, SLOT(searchPrimarySelection()) );
    configChanged();
diff --git a/ubuntu/maverick_automake/applications/kradio/debian/control b/ubuntu/maverick_automake/applications/kradio/debian/control
index 2a173789f..4403795d0 100644
--- a/ubuntu/maverick_automake/applications/kradio/debian/control
+++ b/ubuntu/maverick_automake/applications/kradio/debian/control
@@ -10,10 +10,10 @@ Package: kradio-kde3
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Comfortable Radio Application for KDE [KDE3]
- KRadio is a comfortable radio application for KDE 3.x with support for 
+ TDERadio is a comfortable radio application for KDE 3.x with support for 
  V4L and V4L2 radio cards drivers.
  .
- KRadio currently provides
+ TDERadio currently provides
  .
    * V4L/V4L2 radio support
    * Remote control support (LIRC)
@@ -24,8 +24,8 @@ Description: Comfortable Radio Application for KDE [KDE3]
    * Extendable plugin architecture
  .
  This package also includes a growing collection of station preset
- files for many cities around the world contributed by KRadio users.
+ files for many cities around the world contributed by TDERadio users.
  .
- As KRadio is based on an extendable plugin architecture, contributions
+ As TDERadio is based on an extendable plugin architecture, contributions
  of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
  .
diff --git a/ubuntu/maverick_automake/applications/kradio/debian/kradio.1 b/ubuntu/maverick_automake/applications/kradio/debian/kradio.1
index 3b715d05d..47fdb40d7 100644
--- a/ubuntu/maverick_automake/applications/kradio/debian/kradio.1
+++ b/ubuntu/maverick_automake/applications/kradio/debian/kradio.1
@@ -1,12 +1,12 @@
 .\" This file was generated by kdemangen.pl
-.TH KRADIO 1 "Dec 2005" "K Desktop Environment" "KRadio"
+.TH KRADIO 1 "Dec 2005" "K Desktop Environment" "TDERadio"
 .SH NAME
 kradio
-\- KRadio
+\- TDERadio
 .SH SYNOPSIS
 kradio [Qt\-options] [KDE\-options] 
 .SH DESCRIPTION
-KRadio
+TDERadio
 .SH OPTIONS
 .SS Generic options:
 .TP
diff --git a/ubuntu/maverick_automake/applications/kradio/debian/menu b/ubuntu/maverick_automake/applications/kradio/debian/menu
index ed206dd11..bae72be5f 100644
--- a/ubuntu/maverick_automake/applications/kradio/debian/menu
+++ b/ubuntu/maverick_automake/applications/kradio/debian/menu
@@ -1,7 +1,7 @@
 ?package(kradio):needs="X11" \
   section="Applications/TV and Radio" \
   hints="KDE" \
-  title="KRadio" \
+  title="TDERadio" \
   longtitle="K-Radio Application" \
   command="/opt/kde3/bin/kradio" \
   icon="/opt/kde3/share/pixmaps/kradio.xpm"
diff --git a/ubuntu/maverick_automake/kdelibs/debian/changelog b/ubuntu/maverick_automake/kdelibs/debian/changelog
index eb547118d..b1123744c 100644
--- a/ubuntu/maverick_automake/kdelibs/debian/changelog
+++ b/ubuntu/maverick_automake/kdelibs/debian/changelog
@@ -433,7 +433,7 @@ kdelibs (4:3.5.8-0ubuntu4) hardy; urgency=low
 kdelibs (4:3.5.8-0ubuntu3.1) gutsy-proposed; urgency=low
 
   * Add kubuntu_94_kselectaction.diff Closes: LP #155144
-    Editable KSelectAction stopped working for custom values
+    Editable TDESelectAction stopped working for custom values
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 21 Oct 2007 00:09:25 +0100
 
diff --git a/ubuntu/maverick_automake/kdelibs/debian/man/tdelauncher-kde3.1 b/ubuntu/maverick_automake/kdelibs/debian/man/tdelauncher-kde3.1
index efad216e3..c718e204c 100644
--- a/ubuntu/maverick_automake/kdelibs/debian/man/tdelauncher-kde3.1
+++ b/ubuntu/maverick_automake/kdelibs/debian/man/tdelauncher-kde3.1
@@ -8,7 +8,7 @@ tdelauncher
 .sp 1
 \fBtdelauncher\fP is a daemon responsible for service activation in KDE. It operates closely together with the kdeinit master process to start new processes. KDE applications communicate with \fBtdelauncher\fP via DCOP to start new applications or services.
 .sp 1
-The error message "KLauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBtdelauncher\fP crashed.
+The error message "TDELauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBtdelauncher\fP crashed.
 .sp 1
 Note: \fBtdelauncher\fP is not the "run command" dialog (Alt+F2)!
 .SH SEE ALSO
diff --git a/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_51_launchpad_integration.diff b/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_51_launchpad_integration.diff
index b6f4e497f..80238d564 100644
--- a/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_51_launchpad_integration.diff
+++ b/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_51_launchpad_integration.diff
@@ -26,7 +26,7 @@ diff -Nur kdelibs-3.5.8/kdeui/khelpmenu.cpp kdelibs-3.5.8.new/kdeui/khelpmenu.cp
 +    mMenu->insertItem( SmallIcon("locale"), i18n( "&Translate this Application" ), this, TQT_SLOT(kubuntuTranslate()) );
 +    mMenu->insertSeparator();
 +
-     if (kapp->authorizeKAction("help_about_app"))
+     if (kapp->authorizeTDEAction("help_about_app"))
      {
        mMenu->insertItem( kapp->miniIcon(),
 @@ -233,6 +240,24 @@
@@ -72,11 +72,11 @@ diff -Nur kdelibs-3.5.8/kdeui/kstdaction.cpp kdelibs-3.5.8.new/kdeui/kstdaction.
 +++ kdelibs-3.5.8.new/kdeui/kstdaction.cpp	2007-10-09 09:39:54.000000000 +0100
 @@ -319,5 +319,9 @@
  	{ return KStdAction::create( AboutApp, name, recvr, slot, parent ); }
- KAction *aboutKDE( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+ TDEAction *aboutKDE( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
  	{ return KStdAction::create( AboutKDE, name, recvr, slot, parent ); }
-+KAction *kubuntuTranslate( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
++TDEAction *kubuntuTranslate( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 +	{ return KStdAction::create( KubuntuTranslate, name, recvr, slot, parent ); }
-+KAction *kubuntuGetHelpOnline( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
++TDEAction *kubuntuGetHelpOnline( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 +	{ return KStdAction::create( KubuntuGetHelpOnline, name, recvr, slot, parent ); }
  
  }
@@ -93,14 +93,14 @@ diff -Nur kdelibs-3.5.8/kdeui/kstdaction.h kdelibs-3.5.8.new/kdeui/kstdaction.h
  
 @@ -609,6 +610,12 @@
  	*/
- 	KDEUI_EXPORT KAction *switchApplicationLanguage(const TQObject *recvr, const char *slot,
- 				KActionCollection* parent, const char *name = 0 );
+ 	KDEUI_EXPORT TDEAction *switchApplicationLanguage(const TQObject *recvr, const char *slot,
+ 				TDEActionCollection* parent, const char *name = 0 );
 +
-+	KDEUI_EXPORT KAction *kubuntuTranslate(const TQObject *recvr, const char *slot,
-+				KActionCollection* parent, const char *name = 0 );
++	KDEUI_EXPORT TDEAction *kubuntuTranslate(const TQObject *recvr, const char *slot,
++				TDEActionCollection* parent, const char *name = 0 );
 +
-+	KDEUI_EXPORT KAction *kubuntuGetHelpOnline(const TQObject *recvr, const char *slot,
-+				KActionCollection* parent, const char *name = 0 );
++	KDEUI_EXPORT TDEAction *kubuntuGetHelpOnline(const TQObject *recvr, const char *slot,
++				TDEActionCollection* parent, const char *name = 0 );
  }
  
  #endif // KSTDACTION_H
@@ -108,12 +108,12 @@ diff -Nur kdelibs-3.5.8/kdeui/kstdaction_p.h kdelibs-3.5.8.new/kdeui/kstdaction_
 --- kdelibs-3.5.8/kdeui/kstdaction_p.h	2007-10-08 10:52:12.000000000 +0100
 +++ kdelibs-3.5.8.new/kdeui/kstdaction_p.h	2007-10-09 09:39:54.000000000 +0100
 @@ -112,6 +112,8 @@
- 	{ SwitchApplicationLanguage,     KStdAccel::AccelNone, "switch_application_language", I18N_NOOP("Switch application &language..."), 0, 0 },
- 	{ AboutApp,      KStdAccel::AccelNone, "help_about_app", I18N_NOOP("&About %1"), 0, 0 },
- 	{ AboutKDE,      KStdAccel::AccelNone, "help_about_kde", I18N_NOOP("About &Trinity"), 0,"about_kde" },
-+	{ KubuntuGetHelpOnline,      KStdAccel::AccelNone, "kubuntu_get_help_online", I18N_NOOP("&Get Help Online"), 0, "launchpad" },
-+	{ KubuntuTranslate,      KStdAccel::AccelNone, "kubuntu_translate", I18N_NOOP("&Translate This Application"), 0, "locale" },
- 	{ ActionNone, KStdAccel::AccelNone, 0, 0, 0, 0 }
+ 	{ SwitchApplicationLanguage,     TDEStdAccel::AccelNone, "switch_application_language", I18N_NOOP("Switch application &language..."), 0, 0 },
+ 	{ AboutApp,      TDEStdAccel::AccelNone, "help_about_app", I18N_NOOP("&About %1"), 0, 0 },
+ 	{ AboutKDE,      TDEStdAccel::AccelNone, "help_about_kde", I18N_NOOP("About &Trinity"), 0,"about_kde" },
++	{ KubuntuGetHelpOnline,      TDEStdAccel::AccelNone, "kubuntu_get_help_online", I18N_NOOP("&Get Help Online"), 0, "launchpad" },
++	{ KubuntuTranslate,      TDEStdAccel::AccelNone, "kubuntu_translate", I18N_NOOP("&Translate This Application"), 0, "locale" },
+ 	{ ActionNone, TDEStdAccel::AccelNone, 0, 0, 0, 0 }
  };
  
 diff -Nur kdelibs-3.5.8/kdeui/ui_standards.rc kdelibs-3.5.8.new/kdeui/ui_standards.rc
diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/changelog b/ubuntu/maverick_automake/kdemultimedia/debian/changelog
index fcb1bff9f..7058c478d 100644
--- a/ubuntu/maverick_automake/kdemultimedia/debian/changelog
+++ b/ubuntu/maverick_automake/kdemultimedia/debian/changelog
@@ -817,7 +817,7 @@ kdemultimedia (4:3.1.2-1.2) unstable; urgency=low
       sense. (Closes: #220174)
     - Comment out inline assembly macro. (Closes: #220176)
     - Make sure subclasses inherit publicly from class
-      KListViewItem. (Closes: #220179)
+      TDEListViewItem. (Closes: #220179)
 
  -- Petter Reinholdtsen <pere@debian.org>  Tue, 11 Nov 2003 16:31:46 +0000
 
diff --git a/ubuntu/maverick_automake/kdesdk/debian/man/demangle.1 b/ubuntu/maverick_automake/kdesdk/debian/man/demangle.1
index 0719fe1f4..b387aacd9 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/man/demangle.1
+++ b/ubuntu/maverick_automake/kdesdk/debian/man/demangle.1
@@ -34,7 +34,7 @@ _ZNK6Object10metaObjectEv
 .br
 _ZN8QPtrListI5ArrowE5clearEv
 .br
-_ZTC4Kolf0_11KMainWindow
+_ZTC4Kolf0_11TDEMainWindow
 .RE
 .PP
 These names can then be demangled as follows:
@@ -46,7 +46,7 @@ Object::metaObject() const
 .br
 QPtrList<Arrow>::clear()
 .br
-construction vtable for KMainWindow-in-Kolf
+construction vtable for TDEMainWindow-in-Kolf
 .RE
 .SH SEE ALSO
 .BR kminspector (1),
diff --git a/ubuntu/precise/applications/kerry/debian/patches/kubuntu_05_shortkey.patch b/ubuntu/precise/applications/kerry/debian/patches/kubuntu_05_shortkey.patch
index 6881e817e..c4a705c68 100644
--- a/ubuntu/precise/applications/kerry/debian/patches/kubuntu_05_shortkey.patch
+++ b/ubuntu/precise/applications/kerry/debian/patches/kubuntu_05_shortkey.patch
@@ -5,9 +5,9 @@ diff -Nur kerry-0.2.1/kerry/src/kerryapp.cpp kerry-0.2.1.new/kerry/src/kerryapp.
    globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
    globalKeys->insert( "Program:kerry", i18n("Kerry Beagle Search") );
 
--  KShortcut showDialogShortcut = KShortcut(ALT+Key_Space);
+-  TDEShortcut showDialogShortcut = TDEShortcut(ALT+Key_Space);
 -  showDialogShortcut.append( KKey( Key_F12 ) );
-+  KShortcut showDialogShortcut = KShortcut(CTRL+SHIFT+Key_Space);
++  TDEShortcut showDialogShortcut = TDEShortcut(CTRL+SHIFT+Key_Space);
    globalKeys->insert( "Show Kerry Dialog", i18n("Show Search Dialog"), TQString(), showDialogShortcut, showDialogShortcut, TQT_TQOBJECT(hitListWindow), TQT_SLOT(showSearchDialog()) );
    globalKeys->insert( "Search Primary Selection with Kerry", i18n("Search Primary Selection"), TQString(), CTRL+ALT+Key_Space, CTRL+ALT+Key_Space, TQT_TQOBJECT(this), TQT_SLOT(searchPrimarySelection()) );
    configChanged();
diff --git a/ubuntu/precise/applications/kradio/debian/control b/ubuntu/precise/applications/kradio/debian/control
index 3631e61e3..35e42b8ae 100644
--- a/ubuntu/precise/applications/kradio/debian/control
+++ b/ubuntu/precise/applications/kradio/debian/control
@@ -12,10 +12,10 @@ Depends: ${shlibs:Depends}
 Replaces: kradio-trinity (<< 4:14.0.0)
 Breaks: kradio-trinity (<< 4:14.0.0)
 Description: Comfortable Radio Application for KDE [Trinity]
- KRadio is a comfortable radio application for KDE 3.x with support for 
+ TDERadio is a comfortable radio application for KDE 3.x with support for 
  V4L and V4L2 radio cards drivers.
  .
- KRadio currently provides
+ TDERadio currently provides
  .
    * V4L/V4L2 radio support
    * Remote control support (LIRC)
@@ -26,8 +26,8 @@ Description: Comfortable Radio Application for KDE [Trinity]
    * Extendable plugin architecture
  .
  This package also includes a growing collection of station preset
- files for many cities around the world contributed by KRadio users.
+ files for many cities around the world contributed by TDERadio users.
  .
- As KRadio is based on an extendable plugin architecture, contributions
+ As TDERadio is based on an extendable plugin architecture, contributions
  of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
  .
diff --git a/ubuntu/precise/applications/kradio/debian/kradio.1 b/ubuntu/precise/applications/kradio/debian/kradio.1
index 3b715d05d..47fdb40d7 100644
--- a/ubuntu/precise/applications/kradio/debian/kradio.1
+++ b/ubuntu/precise/applications/kradio/debian/kradio.1
@@ -1,12 +1,12 @@
 .\" This file was generated by kdemangen.pl
-.TH KRADIO 1 "Dec 2005" "K Desktop Environment" "KRadio"
+.TH KRADIO 1 "Dec 2005" "K Desktop Environment" "TDERadio"
 .SH NAME
 kradio
-\- KRadio
+\- TDERadio
 .SH SYNOPSIS
 kradio [Qt\-options] [KDE\-options] 
 .SH DESCRIPTION
-KRadio
+TDERadio
 .SH OPTIONS
 .SS Generic options:
 .TP
diff --git a/ubuntu/precise/applications/kradio/debian/menu b/ubuntu/precise/applications/kradio/debian/menu
index 773521bdb..aef47274f 100644
--- a/ubuntu/precise/applications/kradio/debian/menu
+++ b/ubuntu/precise/applications/kradio/debian/menu
@@ -1,7 +1,7 @@
 ?package(kradio):needs="X11" \
   section="Applications/TV and Radio" \
   hints="TDE" \
-  title="KRadio" \
+  title="TDERadio" \
   longtitle="K-Radio Application" \
   command="/opt/trinity/bin/kradio" \
   icon="/opt/trinity/share/pixmaps/kradio.xpm"
diff --git a/ubuntu/precise/tdelibs/debian/changelog b/ubuntu/precise/tdelibs/debian/changelog
index 8beea2a79..3b293e399 100644
--- a/ubuntu/precise/tdelibs/debian/changelog
+++ b/ubuntu/precise/tdelibs/debian/changelog
@@ -433,7 +433,7 @@ tdelibs (4:3.5.8-0ubuntu4) hardy; urgency=low
 tdelibs (4:3.5.8-0ubuntu3.1) gutsy-proposed; urgency=low
 
   * Add kubuntu_94_kselectaction.diff Closes: LP #155144
-    Editable KSelectAction stopped working for custom values
+    Editable TDESelectAction stopped working for custom values
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 21 Oct 2007 00:09:25 +0100
 
diff --git a/ubuntu/precise/tdelibs/debian/man/tdelauncher-trinity.1 b/ubuntu/precise/tdelibs/debian/man/tdelauncher-trinity.1
index 9029a5ace..70345461d 100644
--- a/ubuntu/precise/tdelibs/debian/man/tdelauncher-trinity.1
+++ b/ubuntu/precise/tdelibs/debian/man/tdelauncher-trinity.1
@@ -8,7 +8,7 @@ tdelauncher
 .sp 1
 \fBtdelauncher\fP is a daemon responsible for service activation in KDE. It operates closely together with the tdeinit master process to start new processes. KDE applications communicate with \fBtdelauncher\fP via DCOP to start new applications or services.
 .sp 1
-The error message "KLauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBtdelauncher\fP crashed.
+The error message "TDELauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBtdelauncher\fP crashed.
 .sp 1
 Note: \fBtdelauncher\fP is not the "run command" dialog (Alt+F2)!
 .SH SEE ALSO
diff --git a/ubuntu/precise/tdemultimedia/debian/changelog b/ubuntu/precise/tdemultimedia/debian/changelog
index f6c8c5527..a17c83ad7 100644
--- a/ubuntu/precise/tdemultimedia/debian/changelog
+++ b/ubuntu/precise/tdemultimedia/debian/changelog
@@ -817,7 +817,7 @@ tdemultimedia (4:3.1.2-1.2) unstable; urgency=low
       sense. (Closes: #220174)
     - Comment out inline assembly macro. (Closes: #220176)
     - Make sure subclasses inherit publicly from class
-      KListViewItem. (Closes: #220179)
+      TDEListViewItem. (Closes: #220179)
 
  -- Petter Reinholdtsen <pere@debian.org>  Tue, 11 Nov 2003 16:31:46 +0000
 
diff --git a/ubuntu/precise/tdesdk/debian/man/demangle.1 b/ubuntu/precise/tdesdk/debian/man/demangle.1
index 0719fe1f4..b387aacd9 100644
--- a/ubuntu/precise/tdesdk/debian/man/demangle.1
+++ b/ubuntu/precise/tdesdk/debian/man/demangle.1
@@ -34,7 +34,7 @@ _ZNK6Object10metaObjectEv
 .br
 _ZN8QPtrListI5ArrowE5clearEv
 .br
-_ZTC4Kolf0_11KMainWindow
+_ZTC4Kolf0_11TDEMainWindow
 .RE
 .PP
 These names can then be demangled as follows:
@@ -46,7 +46,7 @@ Object::metaObject() const
 .br
 QPtrList<Arrow>::clear()
 .br
-construction vtable for KMainWindow-in-Kolf
+construction vtable for TDEMainWindow-in-Kolf
 .RE
 .SH SEE ALSO
 .BR kminspector (1),