Update Debian and Ubuntu packaging for latest GIT HEAD

25 files changed, 92 insertions, 92 deletions

diff --git a/debian/lenny/applications/piklab/debian/copyright b/debian/lenny/applications/piklab/debian/copyright
index 5144c002c..3265a28c8 100644
--- a/debian/lenny/applications/piklab/debian/copyright
+++ b/debian/lenny/applications/piklab/debian/copyright
@@ -37,12 +37,12 @@ Copyright:
     src/progs/direct/base/direct.*: Copyright (C) Brian C. Lane
     src/common/gui/list_view.cpp: Copyright (C) 1992-2003 Trolltech AS.
     src/common/gui/editlistbox.cpp: Copyright (C) 2000 David Faure, Alexander Neundorf
-    src/common/nokde/nokde_kaboutdata.h: Copyright (C) 2000, Espen Sand
+    src/common/nokde/nokde_tdeaboutdata.h: Copyright (C) 2000, Espen Sand
     src/devices/pic/xml_data/*.xml: Copyright (C) 2007, Alan Page
     src/common/port/usb_port.cpp: Copyright (C) 2003-2005 Orion Sky Lawlor
     src/common/nokde/win32_utils.*: Copyright (C) 2004-2005, Jaroslaw Staniek
-    src/common/nokde/nokde_kcmdlineargs.*: Copyright (C) 1999, Waldo Bastian
-    src/common/nokde/nokde_kaboutdata.cpp: Copyright (C) 2000, Espen Sand
+    src/common/nokde/nokde_tdecmdlineargs.*: Copyright (C) 1999, Waldo Bastian
+    src/common/nokde/nokde_tdeaboutdata.cpp: Copyright (C) 2000, Espen Sand
 
 License:
 
diff --git a/debian/lenny/tdegames/debian/changelog b/debian/lenny/tdegames/debian/changelog
index 17e0e836e..2b3abf931 100644
--- a/debian/lenny/tdegames/debian/changelog
+++ b/debian/lenny/tdegames/debian/changelog
@@ -21,7 +21,7 @@ tdegames (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
     - Bump version of tdelibs4-dev build dep to 3.5.10
-    - Drop 11_include_kapplication.diff - applied upstream 
+    - Drop 11_include_tdeapplication.diff - applied upstream 
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:42:38 -0400
 
@@ -62,7 +62,7 @@ tdegames (4:3.5.8-1) unstable; urgency=low
 
 tdegames (4:3.5.7-2) unstable; urgency=low
 
-  * Add patch to include kapplication.h in katomic. Fixes build failure on
+  * Add patch to include tdeapplication.h in katomic. Fixes build failure on
     alpha. Thanks to Steve Langasek for the fix.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 22 Jan 2007 05:59:42 +0100
diff --git a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
index e0e516f86..ca194e680 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -104,10 +104,10 @@ debian/tmp/opt/trinity/include/kabc/vcardformatplugin.h
 debian/tmp/opt/trinity/include/kabc/vcard.h
 debian/tmp/opt/trinity/include/kabc/vcardline.h
 debian/tmp/opt/trinity/include/kabc/vcardparser.h
-debian/tmp/opt/trinity/include/kaboutapplication.h
-debian/tmp/opt/trinity/include/kaboutdata.h
-debian/tmp/opt/trinity/include/kaboutdialog.h
-debian/tmp/opt/trinity/include/kaboutkde.h
+debian/tmp/opt/trinity/include/tdeaboutapplication.h
+debian/tmp/opt/trinity/include/tdeaboutdata.h
+debian/tmp/opt/trinity/include/tdeaboutdialog.h
+debian/tmp/opt/trinity/include/tdeabouttde.h
 debian/tmp/opt/trinity/include/tdeaccelgen.h
 debian/tmp/opt/trinity/include/tdeaccel.h
 debian/tmp/opt/trinity/include/tdeaccelmanager.h
@@ -121,7 +121,7 @@ debian/tmp/opt/trinity/include/kactivelabel.h
 debian/tmp/opt/trinity/include/kallocator.h
 debian/tmp/opt/trinity/include/kanimwidget.h
 debian/tmp/opt/trinity/include/kapp.h
-debian/tmp/opt/trinity/include/kapplication.h
+debian/tmp/opt/trinity/include/tdeapplication.h
 debian/tmp/opt/trinity/include/karchive.h
 debian/tmp/opt/trinity/include/kar.h
 debian/tmp/opt/trinity/include/karrowbutton.h
@@ -156,7 +156,7 @@ debian/tmp/opt/trinity/include/kcharselect.h
 debian/tmp/opt/trinity/include/kcharsets.h
 debian/tmp/opt/trinity/include/kclientsocketbase.h
 debian/tmp/opt/trinity/include/kclipboard.h
-debian/tmp/opt/trinity/include/kcmdlineargs.h
+debian/tmp/opt/trinity/include/tdecmdlineargs.h
 debian/tmp/opt/trinity/include/kcmenumngr.h
 debian/tmp/opt/trinity/include/tdecmodulecontainer.h
 debian/tmp/opt/trinity/include/tdecmodule.h
@@ -590,7 +590,7 @@ debian/tmp/opt/trinity/include/kstdguiitem.h
 debian/tmp/opt/trinity/include/kstreamsocket.h
 debian/tmp/opt/trinity/include/kstringhandler.h
 debian/tmp/opt/trinity/include/kstringvalidator.h
-debian/tmp/opt/trinity/include/kstyle.h
+debian/tmp/opt/trinity/include/tdestyle.h
 debian/tmp/opt/trinity/include/ksvgiconengine.h
 debian/tmp/opt/trinity/include/kswitchlanguagedialog.h
 debian/tmp/opt/trinity/include/tdesycocaentry.h
diff --git a/debian/squeeze/applications/piklab/debian/copyright b/debian/squeeze/applications/piklab/debian/copyright
index 5144c002c..3265a28c8 100644
--- a/debian/squeeze/applications/piklab/debian/copyright
+++ b/debian/squeeze/applications/piklab/debian/copyright
@@ -37,12 +37,12 @@ Copyright:
     src/progs/direct/base/direct.*: Copyright (C) Brian C. Lane
     src/common/gui/list_view.cpp: Copyright (C) 1992-2003 Trolltech AS.
     src/common/gui/editlistbox.cpp: Copyright (C) 2000 David Faure, Alexander Neundorf
-    src/common/nokde/nokde_kaboutdata.h: Copyright (C) 2000, Espen Sand
+    src/common/nokde/nokde_tdeaboutdata.h: Copyright (C) 2000, Espen Sand
     src/devices/pic/xml_data/*.xml: Copyright (C) 2007, Alan Page
     src/common/port/usb_port.cpp: Copyright (C) 2003-2005 Orion Sky Lawlor
     src/common/nokde/win32_utils.*: Copyright (C) 2004-2005, Jaroslaw Staniek
-    src/common/nokde/nokde_kcmdlineargs.*: Copyright (C) 1999, Waldo Bastian
-    src/common/nokde/nokde_kaboutdata.cpp: Copyright (C) 2000, Espen Sand
+    src/common/nokde/nokde_tdecmdlineargs.*: Copyright (C) 1999, Waldo Bastian
+    src/common/nokde/nokde_tdeaboutdata.cpp: Copyright (C) 2000, Espen Sand
 
 License:
 
diff --git a/debian/squeeze/tdegames/debian/changelog b/debian/squeeze/tdegames/debian/changelog
index 17e0e836e..2b3abf931 100644
--- a/debian/squeeze/tdegames/debian/changelog
+++ b/debian/squeeze/tdegames/debian/changelog
@@ -21,7 +21,7 @@ tdegames (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
     - Bump version of tdelibs4-dev build dep to 3.5.10
-    - Drop 11_include_kapplication.diff - applied upstream 
+    - Drop 11_include_tdeapplication.diff - applied upstream 
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:42:38 -0400
 
@@ -62,7 +62,7 @@ tdegames (4:3.5.8-1) unstable; urgency=low
 
 tdegames (4:3.5.7-2) unstable; urgency=low
 
-  * Add patch to include kapplication.h in katomic. Fixes build failure on
+  * Add patch to include tdeapplication.h in katomic. Fixes build failure on
     alpha. Thanks to Steve Langasek for the fix.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 22 Jan 2007 05:59:42 +0100
diff --git a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
index e0e516f86..ca194e680 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -104,10 +104,10 @@ debian/tmp/opt/trinity/include/kabc/vcardformatplugin.h
 debian/tmp/opt/trinity/include/kabc/vcard.h
 debian/tmp/opt/trinity/include/kabc/vcardline.h
 debian/tmp/opt/trinity/include/kabc/vcardparser.h
-debian/tmp/opt/trinity/include/kaboutapplication.h
-debian/tmp/opt/trinity/include/kaboutdata.h
-debian/tmp/opt/trinity/include/kaboutdialog.h
-debian/tmp/opt/trinity/include/kaboutkde.h
+debian/tmp/opt/trinity/include/tdeaboutapplication.h
+debian/tmp/opt/trinity/include/tdeaboutdata.h
+debian/tmp/opt/trinity/include/tdeaboutdialog.h
+debian/tmp/opt/trinity/include/tdeabouttde.h
 debian/tmp/opt/trinity/include/tdeaccelgen.h
 debian/tmp/opt/trinity/include/tdeaccel.h
 debian/tmp/opt/trinity/include/tdeaccelmanager.h
@@ -121,7 +121,7 @@ debian/tmp/opt/trinity/include/kactivelabel.h
 debian/tmp/opt/trinity/include/kallocator.h
 debian/tmp/opt/trinity/include/kanimwidget.h
 debian/tmp/opt/trinity/include/kapp.h
-debian/tmp/opt/trinity/include/kapplication.h
+debian/tmp/opt/trinity/include/tdeapplication.h
 debian/tmp/opt/trinity/include/karchive.h
 debian/tmp/opt/trinity/include/kar.h
 debian/tmp/opt/trinity/include/karrowbutton.h
@@ -156,7 +156,7 @@ debian/tmp/opt/trinity/include/kcharselect.h
 debian/tmp/opt/trinity/include/kcharsets.h
 debian/tmp/opt/trinity/include/kclientsocketbase.h
 debian/tmp/opt/trinity/include/kclipboard.h
-debian/tmp/opt/trinity/include/kcmdlineargs.h
+debian/tmp/opt/trinity/include/tdecmdlineargs.h
 debian/tmp/opt/trinity/include/kcmenumngr.h
 debian/tmp/opt/trinity/include/tdecmodulecontainer.h
 debian/tmp/opt/trinity/include/tdecmodule.h
@@ -590,7 +590,7 @@ debian/tmp/opt/trinity/include/kstdguiitem.h
 debian/tmp/opt/trinity/include/kstreamsocket.h
 debian/tmp/opt/trinity/include/kstringhandler.h
 debian/tmp/opt/trinity/include/kstringvalidator.h
-debian/tmp/opt/trinity/include/kstyle.h
+debian/tmp/opt/trinity/include/tdestyle.h
 debian/tmp/opt/trinity/include/ksvgiconengine.h
 debian/tmp/opt/trinity/include/kswitchlanguagedialog.h
 debian/tmp/opt/trinity/include/tdesycocaentry.h
diff --git a/debian/wheezy/applications/piklab/debian/copyright b/debian/wheezy/applications/piklab/debian/copyright
index 5144c002c..3265a28c8 100644
--- a/debian/wheezy/applications/piklab/debian/copyright
+++ b/debian/wheezy/applications/piklab/debian/copyright
@@ -37,12 +37,12 @@ Copyright:
     src/progs/direct/base/direct.*: Copyright (C) Brian C. Lane
     src/common/gui/list_view.cpp: Copyright (C) 1992-2003 Trolltech AS.
     src/common/gui/editlistbox.cpp: Copyright (C) 2000 David Faure, Alexander Neundorf
-    src/common/nokde/nokde_kaboutdata.h: Copyright (C) 2000, Espen Sand
+    src/common/nokde/nokde_tdeaboutdata.h: Copyright (C) 2000, Espen Sand
     src/devices/pic/xml_data/*.xml: Copyright (C) 2007, Alan Page
     src/common/port/usb_port.cpp: Copyright (C) 2003-2005 Orion Sky Lawlor
     src/common/nokde/win32_utils.*: Copyright (C) 2004-2005, Jaroslaw Staniek
-    src/common/nokde/nokde_kcmdlineargs.*: Copyright (C) 1999, Waldo Bastian
-    src/common/nokde/nokde_kaboutdata.cpp: Copyright (C) 2000, Espen Sand
+    src/common/nokde/nokde_tdecmdlineargs.*: Copyright (C) 1999, Waldo Bastian
+    src/common/nokde/nokde_tdeaboutdata.cpp: Copyright (C) 2000, Espen Sand
 
 License:
 
diff --git a/debian/wheezy/tdegames/debian/changelog b/debian/wheezy/tdegames/debian/changelog
index 17e0e836e..2b3abf931 100644
--- a/debian/wheezy/tdegames/debian/changelog
+++ b/debian/wheezy/tdegames/debian/changelog
@@ -21,7 +21,7 @@ tdegames (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
     - Bump version of tdelibs4-dev build dep to 3.5.10
-    - Drop 11_include_kapplication.diff - applied upstream 
+    - Drop 11_include_tdeapplication.diff - applied upstream 
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:42:38 -0400
 
@@ -62,7 +62,7 @@ tdegames (4:3.5.8-1) unstable; urgency=low
 
 tdegames (4:3.5.7-2) unstable; urgency=low
 
-  * Add patch to include kapplication.h in katomic. Fixes build failure on
+  * Add patch to include tdeapplication.h in katomic. Fixes build failure on
     alpha. Thanks to Steve Langasek for the fix.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 22 Jan 2007 05:59:42 +0100
diff --git a/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.install
index e0e516f86..ca194e680 100644
--- a/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -104,10 +104,10 @@ debian/tmp/opt/trinity/include/kabc/vcardformatplugin.h
 debian/tmp/opt/trinity/include/kabc/vcard.h
 debian/tmp/opt/trinity/include/kabc/vcardline.h
 debian/tmp/opt/trinity/include/kabc/vcardparser.h
-debian/tmp/opt/trinity/include/kaboutapplication.h
-debian/tmp/opt/trinity/include/kaboutdata.h
-debian/tmp/opt/trinity/include/kaboutdialog.h
-debian/tmp/opt/trinity/include/kaboutkde.h
+debian/tmp/opt/trinity/include/tdeaboutapplication.h
+debian/tmp/opt/trinity/include/tdeaboutdata.h
+debian/tmp/opt/trinity/include/tdeaboutdialog.h
+debian/tmp/opt/trinity/include/tdeabouttde.h
 debian/tmp/opt/trinity/include/tdeaccelgen.h
 debian/tmp/opt/trinity/include/tdeaccel.h
 debian/tmp/opt/trinity/include/tdeaccelmanager.h
@@ -121,7 +121,7 @@ debian/tmp/opt/trinity/include/kactivelabel.h
 debian/tmp/opt/trinity/include/kallocator.h
 debian/tmp/opt/trinity/include/kanimwidget.h
 debian/tmp/opt/trinity/include/kapp.h
-debian/tmp/opt/trinity/include/kapplication.h
+debian/tmp/opt/trinity/include/tdeapplication.h
 debian/tmp/opt/trinity/include/karchive.h
 debian/tmp/opt/trinity/include/kar.h
 debian/tmp/opt/trinity/include/karrowbutton.h
@@ -156,7 +156,7 @@ debian/tmp/opt/trinity/include/kcharselect.h
 debian/tmp/opt/trinity/include/kcharsets.h
 debian/tmp/opt/trinity/include/kclientsocketbase.h
 debian/tmp/opt/trinity/include/kclipboard.h
-debian/tmp/opt/trinity/include/kcmdlineargs.h
+debian/tmp/opt/trinity/include/tdecmdlineargs.h
 debian/tmp/opt/trinity/include/kcmenumngr.h
 debian/tmp/opt/trinity/include/tdecmodulecontainer.h
 debian/tmp/opt/trinity/include/tdecmodule.h
@@ -590,7 +590,7 @@ debian/tmp/opt/trinity/include/kstdguiitem.h
 debian/tmp/opt/trinity/include/kstreamsocket.h
 debian/tmp/opt/trinity/include/kstringhandler.h
 debian/tmp/opt/trinity/include/kstringvalidator.h
-debian/tmp/opt/trinity/include/kstyle.h
+debian/tmp/opt/trinity/include/tdestyle.h
 debian/tmp/opt/trinity/include/ksvgiconengine.h
 debian/tmp/opt/trinity/include/kswitchlanguagedialog.h
 debian/tmp/opt/trinity/include/tdesycocaentry.h
diff --git a/ubuntu/lucid_automake/applications/piklab/debian/copyright b/ubuntu/lucid_automake/applications/piklab/debian/copyright
index 5144c002c..3265a28c8 100644
--- a/ubuntu/lucid_automake/applications/piklab/debian/copyright
+++ b/ubuntu/lucid_automake/applications/piklab/debian/copyright
@@ -37,12 +37,12 @@ Copyright:
     src/progs/direct/base/direct.*: Copyright (C) Brian C. Lane
     src/common/gui/list_view.cpp: Copyright (C) 1992-2003 Trolltech AS.
     src/common/gui/editlistbox.cpp: Copyright (C) 2000 David Faure, Alexander Neundorf
-    src/common/nokde/nokde_kaboutdata.h: Copyright (C) 2000, Espen Sand
+    src/common/nokde/nokde_tdeaboutdata.h: Copyright (C) 2000, Espen Sand
     src/devices/pic/xml_data/*.xml: Copyright (C) 2007, Alan Page
     src/common/port/usb_port.cpp: Copyright (C) 2003-2005 Orion Sky Lawlor
     src/common/nokde/win32_utils.*: Copyright (C) 2004-2005, Jaroslaw Staniek
-    src/common/nokde/nokde_kcmdlineargs.*: Copyright (C) 1999, Waldo Bastian
-    src/common/nokde/nokde_kaboutdata.cpp: Copyright (C) 2000, Espen Sand
+    src/common/nokde/nokde_tdecmdlineargs.*: Copyright (C) 1999, Waldo Bastian
+    src/common/nokde/nokde_tdeaboutdata.cpp: Copyright (C) 2000, Espen Sand
 
 License:
 
diff --git a/ubuntu/lucid_automake/kdegames/debian/changelog b/ubuntu/lucid_automake/kdegames/debian/changelog
index 2bd5a46f0..a65449f2e 100644
--- a/ubuntu/lucid_automake/kdegames/debian/changelog
+++ b/ubuntu/lucid_automake/kdegames/debian/changelog
@@ -21,7 +21,7 @@ kdegames (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
     - Bump version of kdelibs4-dev build dep to 3.5.10
-    - Drop 11_include_kapplication.diff - applied upstream 
+    - Drop 11_include_tdeapplication.diff - applied upstream 
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:42:38 -0400
 
@@ -62,7 +62,7 @@ kdegames (4:3.5.8-1) unstable; urgency=low
 
 kdegames (4:3.5.7-2) unstable; urgency=low
 
-  * Add patch to include kapplication.h in katomic. Fixes build failure on
+  * Add patch to include tdeapplication.h in katomic. Fixes build failure on
     alpha. Thanks to Steve Langasek for the fix.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 22 Jan 2007 05:59:42 +0100
diff --git a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install
index c195dc46b..0a96b4e79 100644
--- a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install
+++ b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install
@@ -104,10 +104,10 @@ debian/tmp/opt/kde3/include/tde/kabc/vcardformatplugin.h
 debian/tmp/opt/kde3/include/tde/kabc/vcard.h
 debian/tmp/opt/kde3/include/tde/kabc/vcardline.h
 debian/tmp/opt/kde3/include/tde/kabc/vcardparser.h
-debian/tmp/opt/kde3/include/tde/kaboutapplication.h
-debian/tmp/opt/kde3/include/tde/kaboutdata.h
-debian/tmp/opt/kde3/include/tde/kaboutdialog.h
-debian/tmp/opt/kde3/include/tde/kaboutkde.h
+debian/tmp/opt/kde3/include/tde/tdeaboutapplication.h
+debian/tmp/opt/kde3/include/tde/tdeaboutdata.h
+debian/tmp/opt/kde3/include/tde/tdeaboutdialog.h
+debian/tmp/opt/kde3/include/tde/tdeabouttde.h
 debian/tmp/opt/kde3/include/tde/tdeaccelgen.h
 debian/tmp/opt/kde3/include/tde/tdeaccel.h
 debian/tmp/opt/kde3/include/tde/tdeaccelmanager.h
@@ -121,7 +121,7 @@ debian/tmp/opt/kde3/include/tde/kactivelabel.h
 debian/tmp/opt/kde3/include/tde/kallocator.h
 debian/tmp/opt/kde3/include/tde/kanimwidget.h
 debian/tmp/opt/kde3/include/tde/kapp.h
-debian/tmp/opt/kde3/include/tde/kapplication.h
+debian/tmp/opt/kde3/include/tde/tdeapplication.h
 debian/tmp/opt/kde3/include/tde/karchive.h
 debian/tmp/opt/kde3/include/tde/kar.h
 debian/tmp/opt/kde3/include/tde/karrowbutton.h
@@ -156,7 +156,7 @@ debian/tmp/opt/kde3/include/tde/kcharselect.h
 debian/tmp/opt/kde3/include/tde/kcharsets.h
 debian/tmp/opt/kde3/include/tde/kclientsocketbase.h
 debian/tmp/opt/kde3/include/tde/kclipboard.h
-debian/tmp/opt/kde3/include/tde/kcmdlineargs.h
+debian/tmp/opt/kde3/include/tde/tdecmdlineargs.h
 debian/tmp/opt/kde3/include/tde/kcmenumngr.h
 debian/tmp/opt/kde3/include/tde/tdecmodulecontainer.h
 debian/tmp/opt/kde3/include/tde/tdecmodule.h
@@ -588,7 +588,7 @@ debian/tmp/opt/kde3/include/tde/kstdguiitem.h
 debian/tmp/opt/kde3/include/tde/kstreamsocket.h
 debian/tmp/opt/kde3/include/tde/kstringhandler.h
 debian/tmp/opt/kde3/include/tde/kstringvalidator.h
-debian/tmp/opt/kde3/include/tde/kstyle.h
+debian/tmp/opt/kde3/include/tde/tdestyle.h
 debian/tmp/opt/kde3/include/tde/ksvgiconengine.h
 debian/tmp/opt/kde3/include/tde/kswitchlanguagedialog.h
 debian/tmp/opt/kde3/include/tde/tdesycocaentry.h
diff --git a/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_64_rosetta_translation.diff b/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
index 1525f8b00..d4808fb39 100644
--- a/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
+++ b/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
@@ -1,5 +1,5 @@
---- kdelibs/kdecore/kaboutdata.cpp	2006-03-17 10:19:05.000000000 +0000
-+++ kdelibs/kdecore/kaboutdata.cpp	2006-12-05 19:46:12.000000000 +0000
+--- kdelibs/kdecore/tdeaboutdata.cpp	2006-03-17 10:19:05.000000000 +0000
++++ kdelibs/kdecore/tdeaboutdata.cpp	2006-12-05 19:46:12.000000000 +0000
 @@ -389,7 +389,7 @@
              "of the translation teams all over the world.</p>"
              "<p>For more information on KDE internationalization "
diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
index 24e242b82..1ee900501 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
+++ b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
@@ -27,8 +27,8 @@
  #include <tqfile.h>
 +#include <tqprocess.h>
  
- #include <kapplication.h>
- #include <kcmdlineargs.h>
+ #include <tdeapplication.h>
+ #include <tdecmdlineargs.h>
 @@ -45,10 +46,124 @@
  #include "kiosksync.h"
  
diff --git a/ubuntu/maverick/applications/piklab/debian/copyright b/ubuntu/maverick/applications/piklab/debian/copyright
index 5144c002c..3265a28c8 100644
--- a/ubuntu/maverick/applications/piklab/debian/copyright
+++ b/ubuntu/maverick/applications/piklab/debian/copyright
@@ -37,12 +37,12 @@ Copyright:
     src/progs/direct/base/direct.*: Copyright (C) Brian C. Lane
     src/common/gui/list_view.cpp: Copyright (C) 1992-2003 Trolltech AS.
     src/common/gui/editlistbox.cpp: Copyright (C) 2000 David Faure, Alexander Neundorf
-    src/common/nokde/nokde_kaboutdata.h: Copyright (C) 2000, Espen Sand
+    src/common/nokde/nokde_tdeaboutdata.h: Copyright (C) 2000, Espen Sand
     src/devices/pic/xml_data/*.xml: Copyright (C) 2007, Alan Page
     src/common/port/usb_port.cpp: Copyright (C) 2003-2005 Orion Sky Lawlor
     src/common/nokde/win32_utils.*: Copyright (C) 2004-2005, Jaroslaw Staniek
-    src/common/nokde/nokde_kcmdlineargs.*: Copyright (C) 1999, Waldo Bastian
-    src/common/nokde/nokde_kaboutdata.cpp: Copyright (C) 2000, Espen Sand
+    src/common/nokde/nokde_tdecmdlineargs.*: Copyright (C) 1999, Waldo Bastian
+    src/common/nokde/nokde_tdeaboutdata.cpp: Copyright (C) 2000, Espen Sand
 
 License:
 
diff --git a/ubuntu/maverick/tdegames/debian/changelog b/ubuntu/maverick/tdegames/debian/changelog
index 17e0e836e..2b3abf931 100644
--- a/ubuntu/maverick/tdegames/debian/changelog
+++ b/ubuntu/maverick/tdegames/debian/changelog
@@ -21,7 +21,7 @@ tdegames (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
     - Bump version of tdelibs4-dev build dep to 3.5.10
-    - Drop 11_include_kapplication.diff - applied upstream 
+    - Drop 11_include_tdeapplication.diff - applied upstream 
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:42:38 -0400
 
@@ -62,7 +62,7 @@ tdegames (4:3.5.8-1) unstable; urgency=low
 
 tdegames (4:3.5.7-2) unstable; urgency=low
 
-  * Add patch to include kapplication.h in katomic. Fixes build failure on
+  * Add patch to include tdeapplication.h in katomic. Fixes build failure on
     alpha. Thanks to Steve Langasek for the fix.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 22 Jan 2007 05:59:42 +0100
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
index e0e516f86..ca194e680 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -104,10 +104,10 @@ debian/tmp/opt/trinity/include/kabc/vcardformatplugin.h
 debian/tmp/opt/trinity/include/kabc/vcard.h
 debian/tmp/opt/trinity/include/kabc/vcardline.h
 debian/tmp/opt/trinity/include/kabc/vcardparser.h
-debian/tmp/opt/trinity/include/kaboutapplication.h
-debian/tmp/opt/trinity/include/kaboutdata.h
-debian/tmp/opt/trinity/include/kaboutdialog.h
-debian/tmp/opt/trinity/include/kaboutkde.h
+debian/tmp/opt/trinity/include/tdeaboutapplication.h
+debian/tmp/opt/trinity/include/tdeaboutdata.h
+debian/tmp/opt/trinity/include/tdeaboutdialog.h
+debian/tmp/opt/trinity/include/tdeabouttde.h
 debian/tmp/opt/trinity/include/tdeaccelgen.h
 debian/tmp/opt/trinity/include/tdeaccel.h
 debian/tmp/opt/trinity/include/tdeaccelmanager.h
@@ -121,7 +121,7 @@ debian/tmp/opt/trinity/include/kactivelabel.h
 debian/tmp/opt/trinity/include/kallocator.h
 debian/tmp/opt/trinity/include/kanimwidget.h
 debian/tmp/opt/trinity/include/kapp.h
-debian/tmp/opt/trinity/include/kapplication.h
+debian/tmp/opt/trinity/include/tdeapplication.h
 debian/tmp/opt/trinity/include/karchive.h
 debian/tmp/opt/trinity/include/kar.h
 debian/tmp/opt/trinity/include/karrowbutton.h
@@ -156,7 +156,7 @@ debian/tmp/opt/trinity/include/kcharselect.h
 debian/tmp/opt/trinity/include/kcharsets.h
 debian/tmp/opt/trinity/include/kclientsocketbase.h
 debian/tmp/opt/trinity/include/kclipboard.h
-debian/tmp/opt/trinity/include/kcmdlineargs.h
+debian/tmp/opt/trinity/include/tdecmdlineargs.h
 debian/tmp/opt/trinity/include/kcmenumngr.h
 debian/tmp/opt/trinity/include/tdecmodulecontainer.h
 debian/tmp/opt/trinity/include/tdecmodule.h
@@ -590,7 +590,7 @@ debian/tmp/opt/trinity/include/kstdguiitem.h
 debian/tmp/opt/trinity/include/kstreamsocket.h
 debian/tmp/opt/trinity/include/kstringhandler.h
 debian/tmp/opt/trinity/include/kstringvalidator.h
-debian/tmp/opt/trinity/include/kstyle.h
+debian/tmp/opt/trinity/include/tdestyle.h
 debian/tmp/opt/trinity/include/ksvgiconengine.h
 debian/tmp/opt/trinity/include/kswitchlanguagedialog.h
 debian/tmp/opt/trinity/include/tdesycocaentry.h
diff --git a/ubuntu/maverick_automake/applications/piklab/debian/copyright b/ubuntu/maverick_automake/applications/piklab/debian/copyright
index 5144c002c..3265a28c8 100644
--- a/ubuntu/maverick_automake/applications/piklab/debian/copyright
+++ b/ubuntu/maverick_automake/applications/piklab/debian/copyright
@@ -37,12 +37,12 @@ Copyright:
     src/progs/direct/base/direct.*: Copyright (C) Brian C. Lane
     src/common/gui/list_view.cpp: Copyright (C) 1992-2003 Trolltech AS.
     src/common/gui/editlistbox.cpp: Copyright (C) 2000 David Faure, Alexander Neundorf
-    src/common/nokde/nokde_kaboutdata.h: Copyright (C) 2000, Espen Sand
+    src/common/nokde/nokde_tdeaboutdata.h: Copyright (C) 2000, Espen Sand
     src/devices/pic/xml_data/*.xml: Copyright (C) 2007, Alan Page
     src/common/port/usb_port.cpp: Copyright (C) 2003-2005 Orion Sky Lawlor
     src/common/nokde/win32_utils.*: Copyright (C) 2004-2005, Jaroslaw Staniek
-    src/common/nokde/nokde_kcmdlineargs.*: Copyright (C) 1999, Waldo Bastian
-    src/common/nokde/nokde_kaboutdata.cpp: Copyright (C) 2000, Espen Sand
+    src/common/nokde/nokde_tdecmdlineargs.*: Copyright (C) 1999, Waldo Bastian
+    src/common/nokde/nokde_tdeaboutdata.cpp: Copyright (C) 2000, Espen Sand
 
 License:
 
diff --git a/ubuntu/maverick_automake/kdegames/debian/changelog b/ubuntu/maverick_automake/kdegames/debian/changelog
index 2bd5a46f0..a65449f2e 100644
--- a/ubuntu/maverick_automake/kdegames/debian/changelog
+++ b/ubuntu/maverick_automake/kdegames/debian/changelog
@@ -21,7 +21,7 @@ kdegames (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
     - Bump version of kdelibs4-dev build dep to 3.5.10
-    - Drop 11_include_kapplication.diff - applied upstream 
+    - Drop 11_include_tdeapplication.diff - applied upstream 
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:42:38 -0400
 
@@ -62,7 +62,7 @@ kdegames (4:3.5.8-1) unstable; urgency=low
 
 kdegames (4:3.5.7-2) unstable; urgency=low
 
-  * Add patch to include kapplication.h in katomic. Fixes build failure on
+  * Add patch to include tdeapplication.h in katomic. Fixes build failure on
     alpha. Thanks to Steve Langasek for the fix.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 22 Jan 2007 05:59:42 +0100
diff --git a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install
index c195dc46b..0a96b4e79 100644
--- a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install
+++ b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install
@@ -104,10 +104,10 @@ debian/tmp/opt/kde3/include/tde/kabc/vcardformatplugin.h
 debian/tmp/opt/kde3/include/tde/kabc/vcard.h
 debian/tmp/opt/kde3/include/tde/kabc/vcardline.h
 debian/tmp/opt/kde3/include/tde/kabc/vcardparser.h
-debian/tmp/opt/kde3/include/tde/kaboutapplication.h
-debian/tmp/opt/kde3/include/tde/kaboutdata.h
-debian/tmp/opt/kde3/include/tde/kaboutdialog.h
-debian/tmp/opt/kde3/include/tde/kaboutkde.h
+debian/tmp/opt/kde3/include/tde/tdeaboutapplication.h
+debian/tmp/opt/kde3/include/tde/tdeaboutdata.h
+debian/tmp/opt/kde3/include/tde/tdeaboutdialog.h
+debian/tmp/opt/kde3/include/tde/tdeabouttde.h
 debian/tmp/opt/kde3/include/tde/tdeaccelgen.h
 debian/tmp/opt/kde3/include/tde/tdeaccel.h
 debian/tmp/opt/kde3/include/tde/tdeaccelmanager.h
@@ -121,7 +121,7 @@ debian/tmp/opt/kde3/include/tde/kactivelabel.h
 debian/tmp/opt/kde3/include/tde/kallocator.h
 debian/tmp/opt/kde3/include/tde/kanimwidget.h
 debian/tmp/opt/kde3/include/tde/kapp.h
-debian/tmp/opt/kde3/include/tde/kapplication.h
+debian/tmp/opt/kde3/include/tde/tdeapplication.h
 debian/tmp/opt/kde3/include/tde/karchive.h
 debian/tmp/opt/kde3/include/tde/kar.h
 debian/tmp/opt/kde3/include/tde/karrowbutton.h
@@ -156,7 +156,7 @@ debian/tmp/opt/kde3/include/tde/kcharselect.h
 debian/tmp/opt/kde3/include/tde/kcharsets.h
 debian/tmp/opt/kde3/include/tde/kclientsocketbase.h
 debian/tmp/opt/kde3/include/tde/kclipboard.h
-debian/tmp/opt/kde3/include/tde/kcmdlineargs.h
+debian/tmp/opt/kde3/include/tde/tdecmdlineargs.h
 debian/tmp/opt/kde3/include/tde/kcmenumngr.h
 debian/tmp/opt/kde3/include/tde/tdecmodulecontainer.h
 debian/tmp/opt/kde3/include/tde/tdecmodule.h
@@ -588,7 +588,7 @@ debian/tmp/opt/kde3/include/tde/kstdguiitem.h
 debian/tmp/opt/kde3/include/tde/kstreamsocket.h
 debian/tmp/opt/kde3/include/tde/kstringhandler.h
 debian/tmp/opt/kde3/include/tde/kstringvalidator.h
-debian/tmp/opt/kde3/include/tde/kstyle.h
+debian/tmp/opt/kde3/include/tde/tdestyle.h
 debian/tmp/opt/kde3/include/tde/ksvgiconengine.h
 debian/tmp/opt/kde3/include/tde/kswitchlanguagedialog.h
 debian/tmp/opt/kde3/include/tde/tdesycocaentry.h
diff --git a/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_64_rosetta_translation.diff b/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
index 1525f8b00..d4808fb39 100644
--- a/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
+++ b/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
@@ -1,5 +1,5 @@
---- kdelibs/kdecore/kaboutdata.cpp	2006-03-17 10:19:05.000000000 +0000
-+++ kdelibs/kdecore/kaboutdata.cpp	2006-12-05 19:46:12.000000000 +0000
+--- kdelibs/kdecore/tdeaboutdata.cpp	2006-03-17 10:19:05.000000000 +0000
++++ kdelibs/kdecore/tdeaboutdata.cpp	2006-12-05 19:46:12.000000000 +0000
 @@ -389,7 +389,7 @@
              "of the translation teams all over the world.</p>"
              "<p>For more information on KDE internationalization "
diff --git a/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
index 24e242b82..1ee900501 100644
--- a/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
+++ b/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
@@ -27,8 +27,8 @@
  #include <tqfile.h>
 +#include <tqprocess.h>
  
- #include <kapplication.h>
- #include <kcmdlineargs.h>
+ #include <tdeapplication.h>
+ #include <tdecmdlineargs.h>
 @@ -45,10 +46,124 @@
  #include "kiosksync.h"
  
diff --git a/ubuntu/precise/applications/piklab/debian/copyright b/ubuntu/precise/applications/piklab/debian/copyright
index 5144c002c..3265a28c8 100644
--- a/ubuntu/precise/applications/piklab/debian/copyright
+++ b/ubuntu/precise/applications/piklab/debian/copyright
@@ -37,12 +37,12 @@ Copyright:
     src/progs/direct/base/direct.*: Copyright (C) Brian C. Lane
     src/common/gui/list_view.cpp: Copyright (C) 1992-2003 Trolltech AS.
     src/common/gui/editlistbox.cpp: Copyright (C) 2000 David Faure, Alexander Neundorf
-    src/common/nokde/nokde_kaboutdata.h: Copyright (C) 2000, Espen Sand
+    src/common/nokde/nokde_tdeaboutdata.h: Copyright (C) 2000, Espen Sand
     src/devices/pic/xml_data/*.xml: Copyright (C) 2007, Alan Page
     src/common/port/usb_port.cpp: Copyright (C) 2003-2005 Orion Sky Lawlor
     src/common/nokde/win32_utils.*: Copyright (C) 2004-2005, Jaroslaw Staniek
-    src/common/nokde/nokde_kcmdlineargs.*: Copyright (C) 1999, Waldo Bastian
-    src/common/nokde/nokde_kaboutdata.cpp: Copyright (C) 2000, Espen Sand
+    src/common/nokde/nokde_tdecmdlineargs.*: Copyright (C) 1999, Waldo Bastian
+    src/common/nokde/nokde_tdeaboutdata.cpp: Copyright (C) 2000, Espen Sand
 
 License:
 
diff --git a/ubuntu/precise/tdegames/debian/changelog b/ubuntu/precise/tdegames/debian/changelog
index 17e0e836e..2b3abf931 100644
--- a/ubuntu/precise/tdegames/debian/changelog
+++ b/ubuntu/precise/tdegames/debian/changelog
@@ -21,7 +21,7 @@ tdegames (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
     - Bump version of tdelibs4-dev build dep to 3.5.10
-    - Drop 11_include_kapplication.diff - applied upstream 
+    - Drop 11_include_tdeapplication.diff - applied upstream 
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:42:38 -0400
 
@@ -62,7 +62,7 @@ tdegames (4:3.5.8-1) unstable; urgency=low
 
 tdegames (4:3.5.7-2) unstable; urgency=low
 
-  * Add patch to include kapplication.h in katomic. Fixes build failure on
+  * Add patch to include tdeapplication.h in katomic. Fixes build failure on
     alpha. Thanks to Steve Langasek for the fix.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 22 Jan 2007 05:59:42 +0100
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install
index e0e516f86..ca194e680 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -104,10 +104,10 @@ debian/tmp/opt/trinity/include/kabc/vcardformatplugin.h
 debian/tmp/opt/trinity/include/kabc/vcard.h
 debian/tmp/opt/trinity/include/kabc/vcardline.h
 debian/tmp/opt/trinity/include/kabc/vcardparser.h
-debian/tmp/opt/trinity/include/kaboutapplication.h
-debian/tmp/opt/trinity/include/kaboutdata.h
-debian/tmp/opt/trinity/include/kaboutdialog.h
-debian/tmp/opt/trinity/include/kaboutkde.h
+debian/tmp/opt/trinity/include/tdeaboutapplication.h
+debian/tmp/opt/trinity/include/tdeaboutdata.h
+debian/tmp/opt/trinity/include/tdeaboutdialog.h
+debian/tmp/opt/trinity/include/tdeabouttde.h
 debian/tmp/opt/trinity/include/tdeaccelgen.h
 debian/tmp/opt/trinity/include/tdeaccel.h
 debian/tmp/opt/trinity/include/tdeaccelmanager.h
@@ -121,7 +121,7 @@ debian/tmp/opt/trinity/include/kactivelabel.h
 debian/tmp/opt/trinity/include/kallocator.h
 debian/tmp/opt/trinity/include/kanimwidget.h
 debian/tmp/opt/trinity/include/kapp.h
-debian/tmp/opt/trinity/include/kapplication.h
+debian/tmp/opt/trinity/include/tdeapplication.h
 debian/tmp/opt/trinity/include/karchive.h
 debian/tmp/opt/trinity/include/kar.h
 debian/tmp/opt/trinity/include/karrowbutton.h
@@ -156,7 +156,7 @@ debian/tmp/opt/trinity/include/kcharselect.h
 debian/tmp/opt/trinity/include/kcharsets.h
 debian/tmp/opt/trinity/include/kclientsocketbase.h
 debian/tmp/opt/trinity/include/kclipboard.h
-debian/tmp/opt/trinity/include/kcmdlineargs.h
+debian/tmp/opt/trinity/include/tdecmdlineargs.h
 debian/tmp/opt/trinity/include/kcmenumngr.h
 debian/tmp/opt/trinity/include/tdecmodulecontainer.h
 debian/tmp/opt/trinity/include/tdecmodule.h
@@ -590,7 +590,7 @@ debian/tmp/opt/trinity/include/kstdguiitem.h
 debian/tmp/opt/trinity/include/kstreamsocket.h
 debian/tmp/opt/trinity/include/kstringhandler.h
 debian/tmp/opt/trinity/include/kstringvalidator.h
-debian/tmp/opt/trinity/include/kstyle.h
+debian/tmp/opt/trinity/include/tdestyle.h
 debian/tmp/opt/trinity/include/ksvgiconengine.h
 debian/tmp/opt/trinity/include/kswitchlanguagedialog.h
 debian/tmp/opt/trinity/include/tdesycocaentry.h