Update Debian and Ubuntu packaging for latest GIT

3 files changed, 38 insertions, 38 deletions

diff --git a/debian/lenny/tdelibs/debian/changelog b/debian/lenny/tdelibs/debian/changelog
index 3b293e399..28a76fe79 100644
--- a/debian/lenny/tdelibs/debian/changelog
+++ b/debian/lenny/tdelibs/debian/changelog
@@ -432,7 +432,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
+  * Add kubuntu_94_tdeselectaction.diff Closes: LP #155144
     Editable TDESelectAction stopped working for custom values
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 21 Oct 2007 00:09:25 +0100
@@ -1921,7 +1921,7 @@ tdelibs (4:3.4.2-2) unstable; urgency=low
 tdelibs (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release. Includes a forward declaration of KXMLGUIClient in
-    kactioncollection.h, which makes gcc-4.0 happy and thus closes: #317543,
+    tdeactioncollection.h, which makes gcc-4.0 happy and thus closes: #317543,
     #318017, #319154, #323093 (arson, smb4k, kile and amarok FTBFS).
 
   * KDE_3_4_BRANCH update.
@@ -2240,7 +2240,7 @@ tdelibs (4:3.3.2-5) unstable; urgency=medium
 
   * Add GFDL to debian/copyright.
 
-  * Add another kaccel patch that fixes non-English keyboards on
+  * Add another tdeaccel patch that fixes non-English keyboards on
     SunRay terminals. Thanks to Nikita Youshchenko. (Closes: #301971)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 22 Apr 2005 11:21:11 -0400
@@ -2354,7 +2354,7 @@ tdelibs (4:3.3.2-1) unstable; urgency=medium
   * Add patch to change the group set by KDE CUPS configurator to Debian's
     default, lpadmin, rather than sys. (Closes: #263430)
 
-  * Add kaccel hack that works around a Konqueror crash with Russian keyboards.
+  * Add tdeaccel hack that works around a Konqueror crash with Russian keyboards.
     (Closes: #287566)
 
   * Change debian/copyright file to refer to licenses, instead of copyright,
diff --git a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
index 43f22d823..dd503faf5 100644
--- a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
@@ -186,7 +186,7 @@ debian/tmp/opt/trinity/share/apps/tdeui/about/top-middle.png
 debian/tmp/opt/trinity/share/apps/tdeui/pics/aboutkde.png
 debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-background.png
 debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-bulb.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kactionselector.png
+debian/tmp/opt/trinity/share/apps/kdewidgets/pics/tdeactionselector.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kactivelabel.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kcharselect.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/tdecmodule.png
@@ -202,8 +202,8 @@ debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kdoublenuminput.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kdoublespinbox.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kdualcolorbutton.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/keditlistbox.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kfontcombo.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kfontrequester.png
+debian/tmp/opt/trinity/share/apps/kdewidgets/pics/tdefontcombo.png
+debian/tmp/opt/trinity/share/apps/kdewidgets/pics/tdefontrequester.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kgradientselector.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/khistorycombo.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/khsselector.png
@@ -214,8 +214,8 @@ debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kintspinbox.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kkeybutton.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kled.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/klineedit.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/klistbox.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/klistview.png
+debian/tmp/opt/trinity/share/apps/kdewidgets/pics/tdelistbox.png
+debian/tmp/opt/trinity/share/apps/kdewidgets/pics/tdelistview.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kpalettetable.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kpasswordedit.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kprogress.png
diff --git a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
index 1e0c80cca..431c16c55 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -108,15 +108,15 @@ 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/kaccelgen.h
-debian/tmp/opt/trinity/include/kaccel.h
-debian/tmp/opt/trinity/include/kaccelmanager.h
+debian/tmp/opt/trinity/include/tdeaccelgen.h
+debian/tmp/opt/trinity/include/tdeaccel.h
+debian/tmp/opt/trinity/include/tdeaccelmanager.h
 debian/tmp/opt/trinity/include/kacl.h
-debian/tmp/opt/trinity/include/kactionclasses.h
-debian/tmp/opt/trinity/include/kactioncollection.h
-debian/tmp/opt/trinity/include/kaction.h
-debian/tmp/opt/trinity/include/kactionselector.h
-debian/tmp/opt/trinity/include/kactionshortcutlist.h
+debian/tmp/opt/trinity/include/tdeactionclasses.h
+debian/tmp/opt/trinity/include/tdeactioncollection.h
+debian/tmp/opt/trinity/include/tdeaction.h
+debian/tmp/opt/trinity/include/tdeactionselector.h
+debian/tmp/opt/trinity/include/tdeactionshortcutlist.h
 debian/tmp/opt/trinity/include/kactivelabel.h
 debian/tmp/opt/trinity/include/kallocator.h
 debian/tmp/opt/trinity/include/kanimwidget.h
@@ -276,9 +276,9 @@ debian/tmp/opt/trinity/include/kfilterbase.h
 debian/tmp/opt/trinity/include/kfilterdev.h
 debian/tmp/opt/trinity/include/kfinddialog.h
 debian/tmp/opt/trinity/include/kfind.h
-debian/tmp/opt/trinity/include/kfontcombo.h
-debian/tmp/opt/trinity/include/kfontdialog.h
-debian/tmp/opt/trinity/include/kfontrequester.h
+debian/tmp/opt/trinity/include/tdefontcombo.h
+debian/tmp/opt/trinity/include/tdefontdialog.h
+debian/tmp/opt/trinity/include/tdefontrequester.h
 debian/tmp/opt/trinity/include/kgenericfactory.h
 debian/tmp/opt/trinity/include/kgenericfactory.tcc
 debian/tmp/opt/trinity/include/kglobalaccel.h
@@ -378,14 +378,14 @@ debian/tmp/opt/trinity/include/kled.h
 debian/tmp/opt/trinity/include/klibloader.h
 debian/tmp/opt/trinity/include/klineeditdlg.h
 debian/tmp/opt/trinity/include/klineedit.h
-debian/tmp/opt/trinity/include/klistbox.h
-debian/tmp/opt/trinity/include/klistview.h
-debian/tmp/opt/trinity/include/klistviewsearchline.h
+debian/tmp/opt/trinity/include/tdelistbox.h
+debian/tmp/opt/trinity/include/tdelistview.h
+debian/tmp/opt/trinity/include/tdelistviewsearchline.h
 debian/tmp/opt/trinity/include/klocale.h
 debian/tmp/opt/trinity/include/klockfile.h
 debian/tmp/opt/trinity/include/kmacroexpander.h
-debian/tmp/opt/trinity/include/kmainwindow.h
-debian/tmp/opt/trinity/include/kmainwindowiface.h
+debian/tmp/opt/trinity/include/tdemainwindow.h
+debian/tmp/opt/trinity/include/tdemainwindowiface.h
 debian/tmp/opt/trinity/include/kmanagerselection.h
 debian/tmp/opt/trinity/include/kmdcodec.h
 debian/tmp/opt/trinity/include/tdemdichildarea.h
@@ -446,7 +446,7 @@ debian/tmp/opt/trinity/include/tdeparts/browserextension.h
 debian/tmp/opt/trinity/include/tdeparts/browserinterface.h
 debian/tmp/opt/trinity/include/tdeparts/browserrun.h
 debian/tmp/opt/trinity/include/tdeparts/componentfactory.h
-debian/tmp/opt/trinity/include/tdeparts/dockmainwindow.h
+debian/tmp/opt/trinity/include/tdeparts/doctdemainwindow.h
 debian/tmp/opt/trinity/include/tdeparts/event.h
 debian/tmp/opt/trinity/include/tdeparts/factory.h
 debian/tmp/opt/trinity/include/tdeparts/genericfactory.h
@@ -467,7 +467,7 @@ debian/tmp/opt/trinity/include/kpixmapregionselectorwidget.h
 debian/tmp/opt/trinity/include/kpixmapsplitter.h
 debian/tmp/opt/trinity/include/kplugininfo.h
 debian/tmp/opt/trinity/include/kpluginselector.h
-debian/tmp/opt/trinity/include/kpopupmenu.h
+debian/tmp/opt/trinity/include/tdepopupmenu.h
 debian/tmp/opt/trinity/include/kpreviewwidgetbase.h
 debian/tmp/opt/trinity/include/kprintaction.h
 debian/tmp/opt/trinity/include/kprinter.h
@@ -483,7 +483,7 @@ debian/tmp/opt/trinity/include/kprotocolmanager.h
 debian/tmp/opt/trinity/include/kpty.h
 debian/tmp/opt/trinity/include/kpushbutton.h
 debian/tmp/opt/trinity/include/krandomsequence.h
-debian/tmp/opt/trinity/include/krecentdocument.h
+debian/tmp/opt/trinity/include/tderecentdocument.h
 debian/tmp/opt/trinity/include/kregexpeditorinterface.h
 debian/tmp/opt/trinity/include/kregexp.h
 debian/tmp/opt/trinity/include/kremoteencoding.h
@@ -513,7 +513,7 @@ debian/tmp/opt/trinity/include/ksconfig.h
 debian/tmp/opt/trinity/include/tdescreensaver.h
 debian/tmp/opt/trinity/include/tdescreensaver_vroot.h
 debian/tmp/opt/trinity/include/kscrollview.h
-debian/tmp/opt/trinity/include/kselect.h
+debian/tmp/opt/trinity/include/tdeselect.h
 debian/tmp/opt/trinity/include/kseparator.h
 debian/tmp/opt/trinity/include/kserversocket.h
 debian/tmp/opt/trinity/include/kservicegroup.h
@@ -527,9 +527,9 @@ debian/tmp/opt/trinity/include/ksharedpixmap.h
 debian/tmp/opt/trinity/include/ksharedptr.h
 debian/tmp/opt/trinity/include/kshellcompletion.h
 debian/tmp/opt/trinity/include/kshell.h
-debian/tmp/opt/trinity/include/kshortcutdialog.h
-debian/tmp/opt/trinity/include/kshortcut.h
-debian/tmp/opt/trinity/include/kshortcutlist.h
+debian/tmp/opt/trinity/include/tdeshortcutdialog.h
+debian/tmp/opt/trinity/include/tdeshortcut.h
+debian/tmp/opt/trinity/include/tdeshortcutlist.h
 debian/tmp/opt/trinity/include/kshred.h
 debian/tmp/opt/trinity/include/ksimpleconfig.h
 debian/tmp/opt/trinity/include/ksmimecrypto.h
@@ -583,7 +583,7 @@ debian/tmp/opt/trinity/include/kstandarddirs.h
 debian/tmp/opt/trinity/include/kstartupinfo.h
 debian/tmp/opt/trinity/include/kstaticdeleter.h
 debian/tmp/opt/trinity/include/kstatusbar.h
-debian/tmp/opt/trinity/include/kstdaccel.h
+debian/tmp/opt/trinity/include/tdestdaccel.h
 debian/tmp/opt/trinity/include/kstdaction.h
 debian/tmp/opt/trinity/include/kstddirs.h
 debian/tmp/opt/trinity/include/kstdguiitem.h
@@ -606,7 +606,7 @@ debian/tmp/opt/trinity/include/ktempdir.h
 debian/tmp/opt/trinity/include/ktempfile.h
 debian/tmp/opt/trinity/include/ktextbrowser.h
 debian/tmp/opt/trinity/include/ktextedit.h
-debian/tmp/opt/trinity/include/tdetexteditor/blockselectioninterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/bloctdeselectioninterface.h
 debian/tmp/opt/trinity/include/tdetexteditor/clipboardinterface.h
 debian/tmp/opt/trinity/include/tdetexteditor/codecompletioninterface.h
 debian/tmp/opt/trinity/include/tdetexteditor/configinterfaceextension.h
@@ -643,10 +643,10 @@ debian/tmp/opt/trinity/include/ktimewidget.h
 debian/tmp/opt/trinity/include/ktimezones.h
 debian/tmp/opt/trinity/include/ktimezonewidget.h
 debian/tmp/opt/trinity/include/ktip.h
-debian/tmp/opt/trinity/include/ktoolbarbutton.h
-debian/tmp/opt/trinity/include/ktoolbar.h
-debian/tmp/opt/trinity/include/ktoolbarlabelaction.h
-debian/tmp/opt/trinity/include/ktoolbarradiogroup.h
+debian/tmp/opt/trinity/include/tdetoolbarbutton.h
+debian/tmp/opt/trinity/include/tdetoolbar.h
+debian/tmp/opt/trinity/include/tdetoolbarlabelaction.h
+debian/tmp/opt/trinity/include/tdetoolbarradiogroup.h
 debian/tmp/opt/trinity/include/ktrader.h
 debian/tmp/opt/trinity/include/ktypelist.h
 debian/tmp/opt/trinity/include/kuniqueapp.h