From ececdc858f22069c896fcc65f091ad098048f69c Mon Sep 17 00:00:00 2001
From: Timothy Pearson
For more information on KDE internationalization "
diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/maverick/tdelibs/debian/rules
index 4cdb2747a..119f2a4fe 100755
--- a/ubuntu/maverick/tdelibs/debian/rules
+++ b/ubuntu/maverick/tdelibs/debian/rules
@@ -31,7 +31,7 @@ DEB_FIXPERMS_EXCLUDE := \
opt/trinity/bin/fileshareset \
opt/trinity/bin/kgrantpty \
opt/trinity/bin/kpac_dhcp_helper \
- opt/trinity/bin/start_kdeinit
+ opt/trinity/bin/start_tdeinit
DEB_DH_STRIP_ARGS := --dbg-package=tdelibs-trinity-dbg
@@ -40,7 +40,7 @@ DEB_DH_MAKESHLIBS_ARGS_tdelibs4c2a-trinity := -V'tdelibs4c2a-trinity (>= 4:3.5.8
binary-install/tdelibs-data-trinity::
install -p -D -m644 kded/applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu
install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf
- uudecode debian/icons/aboutkde-kubuntu.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/apps/kdeui/pics/aboutkde.png
+ uudecode debian/icons/aboutkde-kubuntu.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/apps/tdeui/pics/aboutkde.png
uudecode debian/icons/cr16-device-system.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/16x16/devices/system.png
uudecode debian/icons/cr22-device-system.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/22x22/devices/system.png
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
index 22d939e81..6cd2a864c 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
@@ -8,7 +8,7 @@ debian/tmp/etc/trinity/katefiletyperc
debian/tmp/etc/trinity/katesyntaxhighlightingrc
debian/tmp/etc/trinity/kdebug.areas
debian/tmp/etc/trinity/kdebugrc
-debian/tmp/etc/trinity/kdeprintrc
+debian/tmp/etc/trinity/tdeprintrc
debian/tmp/etc/trinity/kio_isorc
debian/tmp/etc/trinity/ksslcalist
debian/tmp/etc/trinity/kthemestylerc
@@ -40,152 +40,152 @@ debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_instantmessenger.desk
debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_ktexteditor.desktop
debian/tmp/opt/trinity/share/apps/kconf_update/kcookiescfg.upd
debian/tmp/opt/trinity/share/apps/kconf_update/kded.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kdeprintrc.upd
+debian/tmp/opt/trinity/share/apps/kconf_update/tdeprintrc.upd
debian/tmp/opt/trinity/share/apps/kconf_update/kio_help.upd
debian/tmp/opt/trinity/share/apps/kconf_update/kioslave.upd
debian/tmp/opt/trinity/share/apps/kconf_update/move_kio_help_cache.sh
debian/tmp/opt/trinity/share/apps/kconf_update/proxytype.pl
debian/tmp/opt/trinity/share/apps/kconf_update/useragent.pl
-debian/tmp/opt/trinity/share/apps/kdeprint/apsdriver1
-debian/tmp/opt/trinity/share/apps/kdeprint/apsdriver2
-debian/tmp/opt/trinity/share/apps/kdeprint/cupsd.conf.template
-debian/tmp/opt/trinity/share/apps/kdeprint/cups_logo.png
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/enscript.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/enscript.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/imagetops.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/imagetops.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/pdf2ps.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/pdf2ps.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/pdfwrite.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/pdfwrite.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/poster.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/poster.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/ps2pdf.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/ps2pdf.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook1.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook1.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook2.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook2.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psnup.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psnup.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psselect.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psselect.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/actions/filterstop.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/actions/kdeprint_restartsrv.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/actions/kdeprint_uploadsmb.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_computer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_cancelled.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_completed.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_error.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_class.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_class_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_class_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_defect.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_remote.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_remote_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_remote_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/history.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_addprinter.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_addpseudo.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_configmgr.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_configsrv.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_defaulthard.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_defaultsoft.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_enableprinter.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_printer_infos.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_printstate.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_queuestate.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_report.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_restartsrv.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_stopprinter.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_testprinter.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_uploadsmb.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/package_utilities.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/actions/kdeprint_inklevel.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_class.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_class_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_class_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_defect.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_remote.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_remote_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_remote_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_users.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/48x48/apps/kdeprint_printer_class.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/48x48/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/64x64/apps/kdeprint_printer_class.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/64x64/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/kde_logo.png
-debian/tmp/opt/trinity/share/apps/kdeprint/lprngtooldriver1
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_collate.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_collate_reverse.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_color.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_duplex_long.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_duplex_none.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_duplex_short.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_grayscale.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_landscape.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_nup1.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_nup2.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_nup4.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_nupother.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_portrait.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_prettyprint.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_revlandscape.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_revportrait.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_uncollate.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_uncollate_reverse.png
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/cups.print
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/ext.print
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/lpdunix.print
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/lpr.print
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/rlpr.print
-debian/tmp/opt/trinity/share/apps/kdeprint/preview-mini.png
-debian/tmp/opt/trinity/share/apps/kdeprint/preview.png
-debian/tmp/opt/trinity/share/apps/kdeprint/side.png
-debian/tmp/opt/trinity/share/apps/kdeprint/specials.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/testprint.ps
-debian/tmp/opt/trinity/share/apps/kdeprint/tiledown.png
-debian/tmp/opt/trinity/share/apps/kdeprint/tileup.png
-debian/tmp/opt/trinity/share/apps/kdeprint/tools/escputil.desktop
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-middle-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-middle-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-top-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-top-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-middle-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-middle-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-top-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-top-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/kde_infopage.css
-debian/tmp/opt/trinity/share/apps/kdeui/about/kde_infopage_rtl.css
-debian/tmp/opt/trinity/share/apps/kdeui/about/top-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/pics/aboutkde.png
-debian/tmp/opt/trinity/share/apps/kdeui/pics/ktip-background.png
-debian/tmp/opt/trinity/share/apps/kdeui/pics/ktip-bulb.png
+debian/tmp/opt/trinity/share/apps/tdeprint/apsdriver1
+debian/tmp/opt/trinity/share/apps/tdeprint/apsdriver2
+debian/tmp/opt/trinity/share/apps/tdeprint/cupsd.conf.template
+debian/tmp/opt/trinity/share/apps/tdeprint/cups_logo.png
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/enscript.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/enscript.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/imagetops.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/imagetops.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/pdf2ps.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/pdf2ps.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/pdfwrite.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/pdfwrite.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/poster.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/poster.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/ps2pdf.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/ps2pdf.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook1.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook1.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook2.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook2.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psnup.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psnup.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psselect.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psselect.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/actions/filterstop.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/actions/tdeprint_restartsrv.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/actions/tdeprint_uploadsmb.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_computer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_cancelled.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_completed.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_error.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_class.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_class_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_class_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_defect.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_remote.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_remote_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_remote_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/history.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_addprinter.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_addpseudo.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_configmgr.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_configsrv.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_defaulthard.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_defaultsoft.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_enableprinter.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_printer_infos.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_printstate.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_queuestate.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_report.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_restartsrv.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_stopprinter.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_testprinter.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_uploadsmb.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/package_utilities.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/actions/tdeprint_inklevel.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_class.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_class_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_class_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_defect.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_remote.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_remote_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_remote_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_users.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/48x48/apps/tdeprint_printer_class.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/48x48/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/64x64/apps/tdeprint_printer_class.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/64x64/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/kde_logo.png
+debian/tmp/opt/trinity/share/apps/tdeprint/lprngtooldriver1
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_collate.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_collate_reverse.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_color.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_duplex_long.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_duplex_none.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_duplex_short.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_grayscale.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_landscape.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_nup1.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_nup2.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_nup4.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_nupother.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_portrait.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_prettyprint.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_revlandscape.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_revportrait.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_uncollate.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_uncollate_reverse.png
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/cups.print
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/ext.print
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/lpdunix.print
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/lpr.print
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/rlpr.print
+debian/tmp/opt/trinity/share/apps/tdeprint/preview-mini.png
+debian/tmp/opt/trinity/share/apps/tdeprint/preview.png
+debian/tmp/opt/trinity/share/apps/tdeprint/side.png
+debian/tmp/opt/trinity/share/apps/tdeprint/specials.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/testprint.ps
+debian/tmp/opt/trinity/share/apps/tdeprint/tiledown.png
+debian/tmp/opt/trinity/share/apps/tdeprint/tileup.png
+debian/tmp/opt/trinity/share/apps/tdeprint/tools/escputil.desktop
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-middle-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-middle-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-middle-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-middle-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage.css
+debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage_rtl.css
+debian/tmp/opt/trinity/share/apps/tdeui/about/top-left.png
+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/kactivelabel.png
debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kcharselect.png
@@ -3572,7 +3572,7 @@ debian/tmp/opt/trinity/share/services/katepart.desktop
debian/tmp/opt/trinity/share/services/kbzip2filter.desktop
debian/tmp/opt/trinity/share/services/kcertpart.desktop
debian/tmp/opt/trinity/share/services/kded/kcookiejar.desktop
-debian/tmp/opt/trinity/share/services/kded/kdeprintd.desktop
+debian/tmp/opt/trinity/share/services/kded/tdeprintd.desktop
debian/tmp/opt/trinity/share/services/kded/kdetrayproxy.desktop
debian/tmp/opt/trinity/share/services/kded/kpasswdserver.desktop
debian/tmp/opt/trinity/share/services/kded/kssld.desktop
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
index b065921dd..8f84589d6 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -204,33 +204,33 @@ debian/tmp/opt/trinity/include/kde_file.h
debian/tmp/opt/trinity/include/tdelibs_export.h
debian/tmp/opt/trinity/include/kdemacros.h
debian/tmp/opt/trinity/include/kde.pot
-debian/tmp/opt/trinity/include/kdeprint/driver.h
-debian/tmp/opt/trinity/include/kdeprint/kiconselectaction.h
-debian/tmp/opt/trinity/include/kdeprint/kmjob.h
-debian/tmp/opt/trinity/include/kdeprint/kmjobmanager.h
-debian/tmp/opt/trinity/include/kdeprint/kmjobviewer.h
-debian/tmp/opt/trinity/include/kdeprint/kmmainview.h
-debian/tmp/opt/trinity/include/kdeprint/kmmanager.h
-debian/tmp/opt/trinity/include/kdeprint/kmobject.h
-debian/tmp/opt/trinity/include/kdeprint/kmprinter.h
-debian/tmp/opt/trinity/include/kdeprint/kmprinterpage.h
-debian/tmp/opt/trinity/include/kdeprint/kmtimer.h
-debian/tmp/opt/trinity/include/kdeprint/kpreloadobject.h
-debian/tmp/opt/trinity/include/kdeprint/kprintdialog.h
-debian/tmp/opt/trinity/include/kdeprint/kprintdialogpage.h
-debian/tmp/opt/trinity/include/kdeprint/lpr/lprhandler.h
-debian/tmp/opt/trinity/include/kdeprint/lpr/lprsettings.h
-debian/tmp/opt/trinity/include/kdeprint/lpr/printcapentry.h
+debian/tmp/opt/trinity/include/tdeprint/driver.h
+debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h
+debian/tmp/opt/trinity/include/tdeprint/kmjob.h
+debian/tmp/opt/trinity/include/tdeprint/kmjobmanager.h
+debian/tmp/opt/trinity/include/tdeprint/kmjobviewer.h
+debian/tmp/opt/trinity/include/tdeprint/kmmainview.h
+debian/tmp/opt/trinity/include/tdeprint/kmmanager.h
+debian/tmp/opt/trinity/include/tdeprint/kmobject.h
+debian/tmp/opt/trinity/include/tdeprint/kmprinter.h
+debian/tmp/opt/trinity/include/tdeprint/kmprinterpage.h
+debian/tmp/opt/trinity/include/tdeprint/kmtimer.h
+debian/tmp/opt/trinity/include/tdeprint/kpreloadobject.h
+debian/tmp/opt/trinity/include/tdeprint/kprintdialog.h
+debian/tmp/opt/trinity/include/tdeprint/kprintdialogpage.h
+debian/tmp/opt/trinity/include/tdeprint/lpr/lprhandler.h
+debian/tmp/opt/trinity/include/tdeprint/lpr/lprsettings.h
+debian/tmp/opt/trinity/include/tdeprint/lpr/printcapentry.h
debian/tmp/opt/trinity/include/kdesktopfile.h
-debian/tmp/opt/trinity/include/kdesu/client.h
-debian/tmp/opt/trinity/include/kdesu/defaults.h
-debian/tmp/opt/trinity/include/kdesu/kcookie.h
-debian/tmp/opt/trinity/include/kdesu/kdesu_pty.h
-debian/tmp/opt/trinity/include/kdesu/process.h
-debian/tmp/opt/trinity/include/kdesu/pty.h
-debian/tmp/opt/trinity/include/kdesu/ssh.h
-debian/tmp/opt/trinity/include/kdesu/stub.h
-debian/tmp/opt/trinity/include/kdesu/su.h
+debian/tmp/opt/trinity/include/tdesu/client.h
+debian/tmp/opt/trinity/include/tdesu/defaults.h
+debian/tmp/opt/trinity/include/tdesu/kcookie.h
+debian/tmp/opt/trinity/include/tdesu/tdesu_pty.h
+debian/tmp/opt/trinity/include/tdesu/process.h
+debian/tmp/opt/trinity/include/tdesu/pty.h
+debian/tmp/opt/trinity/include/tdesu/ssh.h
+debian/tmp/opt/trinity/include/tdesu/stub.h
+debian/tmp/opt/trinity/include/tdesu/su.h
debian/tmp/opt/trinity/include/kde_terminal_interface.h
debian/tmp/opt/trinity/include/kdeversion.h
debian/tmp/opt/trinity/include/kdialogbase.h
@@ -324,7 +324,7 @@ debian/tmp/opt/trinity/include/kio/http_slave_defaults.h
debian/tmp/opt/trinity/include/kio/ioslave_defaults.h
debian/tmp/opt/trinity/include/kio/jobclasses.h
debian/tmp/opt/trinity/include/kio/job.h
-debian/tmp/opt/trinity/include/kio/kdesasl.h
+debian/tmp/opt/trinity/include/kio/tdesasl.h
debian/tmp/opt/trinity/include/kio/kmdbase.h
debian/tmp/opt/trinity/include/kio/kmdcodec.h
debian/tmp/opt/trinity/include/kio/kntlm.h
@@ -743,35 +743,35 @@ debian/tmp/opt/trinity/lib/libkabc_ldapkio.so
debian/tmp/opt/trinity/lib/libkabc.so
debian/tmp/opt/trinity/lib/libkatepartinterfaces.la
debian/tmp/opt/trinity/lib/libkatepartinterfaces.so
-debian/tmp/opt/trinity/lib/libkdecore.la
-debian/tmp/opt/trinity/lib/libkdecore.so
-debian/tmp/opt/trinity/lib/libkdefakes.la
-debian/tmp/opt/trinity/lib/libkdefakes_nonpic.a
-debian/tmp/opt/trinity/lib/libkdefakes_pic.a
-debian/tmp/opt/trinity/lib/libkdefakes.so
-debian/tmp/opt/trinity/lib/libkdefx.la
-debian/tmp/opt/trinity/lib/libkdefx.so
-debian/tmp/opt/trinity/lib/libkdeinit_cupsdconf.la
-debian/tmp/opt/trinity/lib/libkdeinit_dcopserver.la
-debian/tmp/opt/trinity/lib/libkdeinit_kaddprinterwizard.la
-debian/tmp/opt/trinity/lib/libkdeinit_kbuildsycoca.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcmshell.la
-debian/tmp/opt/trinity/lib/libkdeinit_kconf_update.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcookiejar.la
-debian/tmp/opt/trinity/lib/libkdeinit_kded.la
-debian/tmp/opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.la
-debian/tmp/opt/trinity/lib/libkdeinit_kio_uiserver.la
-debian/tmp/opt/trinity/lib/libkdeinit_klauncher.la
-debian/tmp/opt/trinity/lib/libkdeprint.la
-debian/tmp/opt/trinity/lib/libkdeprint_management.la
-debian/tmp/opt/trinity/lib/libkdeprint_management.so
-debian/tmp/opt/trinity/lib/libkdeprint.so
-debian/tmp/opt/trinity/lib/libkdesasl.la
-debian/tmp/opt/trinity/lib/libkdesasl.so
-debian/tmp/opt/trinity/lib/libkdesu.la
-debian/tmp/opt/trinity/lib/libkdesu.so
-debian/tmp/opt/trinity/lib/libkdeui.la
-debian/tmp/opt/trinity/lib/libkdeui.so
+debian/tmp/opt/trinity/lib/libtdecore.la
+debian/tmp/opt/trinity/lib/libtdecore.so
+debian/tmp/opt/trinity/lib/libtdefakes.la
+debian/tmp/opt/trinity/lib/libtdefakes_nonpic.a
+debian/tmp/opt/trinity/lib/libtdefakes_pic.a
+debian/tmp/opt/trinity/lib/libtdefakes.so
+debian/tmp/opt/trinity/lib/libtdefx.la
+debian/tmp/opt/trinity/lib/libtdefx.so
+debian/tmp/opt/trinity/lib/libtdeinit_cupsdconf.la
+debian/tmp/opt/trinity/lib/libtdeinit_dcopserver.la
+debian/tmp/opt/trinity/lib/libtdeinit_kaddprinterwizard.la
+debian/tmp/opt/trinity/lib/libtdeinit_kbuildsycoca.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcmshell.la
+debian/tmp/opt/trinity/lib/libtdeinit_kconf_update.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcookiejar.la
+debian/tmp/opt/trinity/lib/libtdeinit_kded.la
+debian/tmp/opt/trinity/lib/libtdeinit_kio_http_cache_cleaner.la
+debian/tmp/opt/trinity/lib/libtdeinit_kio_uiserver.la
+debian/tmp/opt/trinity/lib/libtdeinit_klauncher.la
+debian/tmp/opt/trinity/lib/libtdeprint.la
+debian/tmp/opt/trinity/lib/libtdeprint_management.la
+debian/tmp/opt/trinity/lib/libtdeprint_management.so
+debian/tmp/opt/trinity/lib/libtdeprint.so
+debian/tmp/opt/trinity/lib/libtdesasl.la
+debian/tmp/opt/trinity/lib/libtdesasl.so
+debian/tmp/opt/trinity/lib/libtdesu.la
+debian/tmp/opt/trinity/lib/libtdesu.so
+debian/tmp/opt/trinity/lib/libtdeui.la
+debian/tmp/opt/trinity/lib/libtdeui.so
debian/tmp/opt/trinity/lib/libkdnssd.la
debian/tmp/opt/trinity/lib/libkdnssd.so
debian/tmp/opt/trinity/lib/libkhtml.la
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
index 6ee941938..91c12cb5b 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -20,12 +20,12 @@ debian/tmp/opt/trinity/bin/kconf_update
debian/tmp/opt/trinity/bin/kcookiejar
debian/tmp/opt/trinity/bin/kde-config
debian/tmp/opt/trinity/bin/kded
-debian/tmp/opt/trinity/bin/kdeinit
-debian/tmp/opt/trinity/bin/kdeinit_shutdown
-debian/tmp/opt/trinity/bin/kdeinit_wrapper
+debian/tmp/opt/trinity/bin/tdeinit
+debian/tmp/opt/trinity/bin/tdeinit_shutdown
+debian/tmp/opt/trinity/bin/tdeinit_wrapper
debian/tmp/opt/trinity/bin/kdetcompmgr
debian/tmp/opt/trinity/bin/kde-menu
-debian/tmp/opt/trinity/bin/kdesu_stub
+debian/tmp/opt/trinity/bin/tdesu_stub
debian/tmp/opt/trinity/bin/kdontchangethehostname
debian/tmp/opt/trinity/bin/kdostartupconfig
debian/tmp/opt/trinity/bin/kfile
@@ -50,8 +50,8 @@ debian/tmp/opt/trinity/bin/lnusertemp
debian/tmp/opt/trinity/bin/make_driver_db_cups
debian/tmp/opt/trinity/bin/make_driver_db_lpr
debian/tmp/opt/trinity/bin/meinproc
-debian/tmp/opt/trinity/bin/start_kdeinit
-debian/tmp/opt/trinity/bin/start_kdeinit_wrapper
+debian/tmp/opt/trinity/bin/start_tdeinit
+debian/tmp/opt/trinity/bin/start_tdeinit_wrapper
debian/tmp/opt/trinity/lib/trinity/cupsdconf.la
debian/tmp/opt/trinity/lib/trinity/cupsdconf.so
debian/tmp/opt/trinity/lib/trinity/dcopserver.la
@@ -83,8 +83,8 @@ debian/tmp/opt/trinity/lib/trinity/kcookiejar.la
debian/tmp/opt/trinity/lib/trinity/kcookiejar.so
debian/tmp/opt/trinity/lib/trinity/kded_kcookiejar.la
debian/tmp/opt/trinity/lib/trinity/kded_kcookiejar.so
-debian/tmp/opt/trinity/lib/trinity/kded_kdeprintd.la
-debian/tmp/opt/trinity/lib/trinity/kded_kdeprintd.so
+debian/tmp/opt/trinity/lib/trinity/kded_tdeprintd.la
+debian/tmp/opt/trinity/lib/trinity/kded_tdeprintd.so
debian/tmp/opt/trinity/lib/trinity/kded_kdetrayproxy.la
debian/tmp/opt/trinity/lib/trinity/kded_kdetrayproxy.so
debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.la
@@ -97,18 +97,18 @@ debian/tmp/opt/trinity/lib/trinity/kded.la
debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.la
debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.so
debian/tmp/opt/trinity/lib/trinity/kded.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_cups.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_cups.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_ext.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_ext.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_lpdunix.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_lpdunix.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_lpr.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_lpr.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_rlpr.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_rlpr.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_tool_escputil.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_tool_escputil.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_cups.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_cups.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_ext.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_ext.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_lpdunix.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_lpdunix.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_lpr.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_lpr.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_rlpr.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_rlpr.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_tool_escputil.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_tool_escputil.so
debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.la
debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.so
debian/tmp/opt/trinity/lib/trinity/kgzipfilter.la
@@ -187,8 +187,8 @@ debian/tmp/opt/trinity/lib/trinity/libkatepart.la
debian/tmp/opt/trinity/lib/trinity/libkatepart.so
debian/tmp/opt/trinity/lib/trinity/libkcertpart.la
debian/tmp/opt/trinity/lib/trinity/libkcertpart.so
-debian/tmp/opt/trinity/lib/trinity/libkdeprint_management_module.la
-debian/tmp/opt/trinity/lib/trinity/libkdeprint_management_module.so
+debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.la
+debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.so
debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.la
debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.so
debian/tmp/opt/trinity/lib/trinity/libkmultipart.la
@@ -235,33 +235,33 @@ debian/tmp/opt/trinity/lib/libkabc.so.1
debian/tmp/opt/trinity/lib/libkabc.so.1.2.0
debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0
debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0.0.0
-debian/tmp/opt/trinity/lib/libkdecore.so.4
-debian/tmp/opt/trinity/lib/libkdecore.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdefakes.so.4
-debian/tmp/opt/trinity/lib/libkdefakes.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdefx.so.4
-debian/tmp/opt/trinity/lib/libkdefx.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdeinit_cupsdconf.so
-debian/tmp/opt/trinity/lib/libkdeinit_dcopserver.so
-debian/tmp/opt/trinity/lib/libkdeinit_kaddprinterwizard.so
-debian/tmp/opt/trinity/lib/libkdeinit_kbuildsycoca.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcmshell.so
-debian/tmp/opt/trinity/lib/libkdeinit_kconf_update.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcookiejar.so
-debian/tmp/opt/trinity/lib/libkdeinit_kded.so
-debian/tmp/opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.so
-debian/tmp/opt/trinity/lib/libkdeinit_kio_uiserver.so
-debian/tmp/opt/trinity/lib/libkdeinit_klauncher.so
-debian/tmp/opt/trinity/lib/libkdeprint_management.so.4
-debian/tmp/opt/trinity/lib/libkdeprint_management.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdeprint.so.4
-debian/tmp/opt/trinity/lib/libkdeprint.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdesasl.so.1
-debian/tmp/opt/trinity/lib/libkdesasl.so.1.2.0
-debian/tmp/opt/trinity/lib/libkdesu.so.4
-debian/tmp/opt/trinity/lib/libkdesu.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdeui.so.4
-debian/tmp/opt/trinity/lib/libkdeui.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdecore.so.4
+debian/tmp/opt/trinity/lib/libtdecore.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdefakes.so.4
+debian/tmp/opt/trinity/lib/libtdefakes.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdefx.so.4
+debian/tmp/opt/trinity/lib/libtdefx.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeinit_cupsdconf.so
+debian/tmp/opt/trinity/lib/libtdeinit_dcopserver.so
+debian/tmp/opt/trinity/lib/libtdeinit_kaddprinterwizard.so
+debian/tmp/opt/trinity/lib/libtdeinit_kbuildsycoca.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcmshell.so
+debian/tmp/opt/trinity/lib/libtdeinit_kconf_update.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcookiejar.so
+debian/tmp/opt/trinity/lib/libtdeinit_kded.so
+debian/tmp/opt/trinity/lib/libtdeinit_kio_http_cache_cleaner.so
+debian/tmp/opt/trinity/lib/libtdeinit_kio_uiserver.so
+debian/tmp/opt/trinity/lib/libtdeinit_klauncher.so
+debian/tmp/opt/trinity/lib/libtdeprint_management.so.4
+debian/tmp/opt/trinity/lib/libtdeprint_management.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeprint.so.4
+debian/tmp/opt/trinity/lib/libtdeprint.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdesasl.so.1
+debian/tmp/opt/trinity/lib/libtdesasl.so.1.2.0
+debian/tmp/opt/trinity/lib/libtdesu.so.4
+debian/tmp/opt/trinity/lib/libtdesu.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeui.so.4
+debian/tmp/opt/trinity/lib/libtdeui.so.4.2.0
debian/tmp/opt/trinity/lib/libkdnssd.so.1
debian/tmp/opt/trinity/lib/libkdnssd.so.1.0.0
debian/tmp/opt/trinity/lib/libkhtml.so.4
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.lintian b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.lintian
index 68997d62e..593ec30ed 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.lintian
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.lintian
@@ -1,15 +1,15 @@
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kaddprinterwizard.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_cupsdconf.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_dcopserver.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcmshell.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kbuildsycoca.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kded.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcookiejar.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_klauncher.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kconf_update.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_uiserver.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcmshell.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kio_http_cache_cleaner.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kbuildsycoca.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_klauncher.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kconf_update.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kio_uiserver.so
tdelibs4c2a binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
tdelibs4c2a binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
tdelibs4c2a binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/start_kdeinit 4755 root/root
+tdelibs4c2a binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages
index eba677adb..00ed3a04e 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages
@@ -20,7 +20,7 @@ debian/man/out/ksendbugmail-trinity.1
debian/man/out/ktelnetservice-trinity.1
debian/man/out/lnusertemp-trinity.1
debian/man/out/meinproc-trinity.1
-./debian/man/kdeinit-trinity.1
+./debian/man/tdeinit-trinity.1
./debian/man/cupsdoprint-trinity.1
./debian/man/dcopclient-trinity.1
./debian/man/dcopobject-trinity.1
@@ -31,9 +31,9 @@ debian/man/out/meinproc-trinity.1
./debian/man/imagetops-trinity.1
./debian/man/kab2kabc-trinity.1
./debian/man/kcmshell-trinity.1
-./debian/man/kdeinit_shutdown-trinity.1
+./debian/man/tdeinit_shutdown-trinity.1
./debian/man/kde-menu-trinity.1
-./debian/man/kdesu_stub-trinity.1
+./debian/man/tdesu_stub-trinity.1
./debian/man/kgrantpty-trinity.1
./debian/man/khotnewstuff-trinity.1
./debian/man/kioexec-trinity.1
--
cgit v1.2.1
From 215688643b73c528718887bd5b52bc901d7c4a84 Mon Sep 17 00:00:00 2001
From: Timothy Pearson