Fix faulty renaming in the Debian and Ubuntu packaging

43 files changed, 262 insertions, 262 deletions

diff --git a/debian/lenny/applications/koffice/debian/chalk-data-trinity.install b/debian/lenny/applications/koffice/debian/chalk-data-trinity.install
index 0b02bd024..7bed60e6c 100644
--- a/debian/lenny/applications/koffice/debian/chalk-data-trinity.install
+++ b/debian/lenny/applications/koffice/debian/chalk-data-trinity.install
@@ -352,9 +352,9 @@ debian/tmp/opt/trinity/share/services/chalk_rgb_u16_plugin.desktop
 debian/tmp/opt/trinity/share/services/chalkrotateimage.desktop
 debian/tmp/opt/trinity/share/services/chalkroundcornersfilter.desktop
 debian/tmp/opt/trinity/share/services/chalkscreenshot.desktop
-debian/tmp/opt/trinity/share/services/chaltdescripting.desktop
-debian/tmp/opt/trinity/share/services/chaltdeselectiontools.desktop
-debian/tmp/opt/trinity/share/services/chaltdeselectopaque.desktop
+debian/tmp/opt/trinity/share/services/chalkscripting.desktop
+debian/tmp/opt/trinity/share/services/chalkselectiontools.desktop
+debian/tmp/opt/trinity/share/services/chalkselectopaque.desktop
 debian/tmp/opt/trinity/share/services/chalkseparatechannels.desktop
 debian/tmp/opt/trinity/share/services/chalkshearimage.desktop
 debian/tmp/opt/trinity/share/services/chalksmalltilesfilter.desktop
@@ -362,16 +362,16 @@ debian/tmp/opt/trinity/share/services/chalksobelfilter.desktop
 debian/tmp/opt/trinity/share/services/chalksubstrate.desktop
 debian/tmp/opt/trinity/share/services/chalk_tiff_export.desktop
 debian/tmp/opt/trinity/share/services/chalk_tiff_import.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolcrop.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolcurves.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolfilter.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolperspectivegrid.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolperspectivetransform.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolpolygon.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolpolyline.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolselectsimilar.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolstar.desktop
-debian/tmp/opt/trinity/share/services/chaltdetooltransform.desktop
+debian/tmp/opt/trinity/share/services/chalktoolcrop.desktop
+debian/tmp/opt/trinity/share/services/chalktoolcurves.desktop
+debian/tmp/opt/trinity/share/services/chalktoolfilter.desktop
+debian/tmp/opt/trinity/share/services/chalktoolperspectivegrid.desktop
+debian/tmp/opt/trinity/share/services/chalktoolperspectivetransform.desktop
+debian/tmp/opt/trinity/share/services/chalktoolpolygon.desktop
+debian/tmp/opt/trinity/share/services/chalktoolpolyline.desktop
+debian/tmp/opt/trinity/share/services/chalktoolselectsimilar.desktop
+debian/tmp/opt/trinity/share/services/chalktoolstar.desktop
+debian/tmp/opt/trinity/share/services/chalktooltransform.desktop
 debian/tmp/opt/trinity/share/services/chalkunsharpfilter.desktop
 debian/tmp/opt/trinity/share/services/chalkwavefilter.desktop
 debian/tmp/opt/trinity/share/services/chalkwetplugin.desktop
diff --git a/debian/lenny/applications/koffice/debian/chalk-trinity.install b/debian/lenny/applications/koffice/debian/chalk-trinity.install
index 3bd4c6757..4df24b77e 100644
--- a/debian/lenny/applications/koffice/debian/chalk-trinity.install
+++ b/debian/lenny/applications/koffice/debian/chalk-trinity.install
@@ -73,12 +73,12 @@ debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.la
 debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.so
-debian/tmp/opt/trinity/lib/trinity/chaltdescripting.la
-debian/tmp/opt/trinity/lib/trinity/chaltdescripting.so
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectiontools.la
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectiontools.so
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectopaque.la
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectopaque.so
+debian/tmp/opt/trinity/lib/trinity/chalkscripting.la
+debian/tmp/opt/trinity/lib/trinity/chalkscripting.so
+debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.la
+debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.so
+debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.la
+debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.so
 debian/tmp/opt/trinity/lib/trinity/chalkseparatechannels.la
 debian/tmp/opt/trinity/lib/trinity/chalkseparatechannels.so
 debian/tmp/opt/trinity/lib/trinity/chalkshearimage.la
@@ -90,26 +90,26 @@ debian/tmp/opt/trinity/lib/trinity/chalksobelfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalksobelfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalksubstrate.la
 debian/tmp/opt/trinity/lib/trinity/chalksubstrate.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcrop.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcrop.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcurves.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcurves.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolfilter.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolfilter.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivegrid.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivegrid.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivetransform.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivetransform.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolygon.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolygon.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolyline.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolyline.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolselectsimilar.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolselectsimilar.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolstar.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolstar.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetooltransform.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetooltransform.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolcrop.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolcrop.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolcurves.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolcurves.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolfilter.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolfilter.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivegrid.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivegrid.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivetransform.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivetransform.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolygon.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolygon.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolyline.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolyline.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolselectsimilar.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolselectsimilar.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolstar.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolstar.so
+debian/tmp/opt/trinity/lib/trinity/chalktooltransform.la
+debian/tmp/opt/trinity/lib/trinity/chalktooltransform.so
 debian/tmp/opt/trinity/lib/trinity/chalkunsharpfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalkunsharpfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalkwavefilter.la
@@ -152,6 +152,6 @@ debian/tmp/opt/trinity/lib/libchalkimage.so.*
 debian/tmp/opt/trinity/lib/libchalk_lms_*.so.*
 debian/tmp/opt/trinity/lib/libchalk_rgb_*.so.*
 debian/tmp/opt/trinity/lib/libchalkrgb.so.*
-debian/tmp/opt/trinity/lib/libchaltdescripting.so.*
+debian/tmp/opt/trinity/lib/libchalkscripting.so.*
 debian/tmp/opt/trinity/lib/libchalkui.so.*
 debian/tmp/opt/trinity/lib/libchalk_ycbcr_*.so.*
diff --git a/debian/lenny/applications/koffice/debian/chalk-trinity.lintian b/debian/lenny/applications/koffice/debian/chalk-trinity.lintian
index cdf64af56..08adc5291 100644
--- a/debian/lenny/applications/koffice/debian/chalk-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/chalk-trinity.lintian
@@ -1,4 +1,4 @@
 chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so
 chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchaltdescripting0 libchalkui1
+chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
 
diff --git a/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install b/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install
index f28ee3bef..4b80b83ec 100644
--- a/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install
+++ b/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install
@@ -79,8 +79,8 @@ debian/tmp/opt/trinity/lib/libchalkimage.la
 debian/tmp/opt/trinity/lib/libchalkimage.so
 debian/tmp/opt/trinity/lib/libchalkrgb.la
 debian/tmp/opt/trinity/lib/libchalkrgb.so
-debian/tmp/opt/trinity/lib/libchaltdescripting.la
-debian/tmp/opt/trinity/lib/libchaltdescripting.so
+debian/tmp/opt/trinity/lib/libchalkscripting.la
+debian/tmp/opt/trinity/lib/libchalkscripting.so
 debian/tmp/opt/trinity/lib/libchalkui.la
 debian/tmp/opt/trinity/lib/libchalkui.so
 debian/tmp/opt/trinity/lib/libkrossapi.la
diff --git a/debian/lenny/applications/koffice/debian/kplato-trinity.install b/debian/lenny/applications/koffice/debian/kplato-trinity.install
index d38914b77..8c3df29c3 100644
--- a/debian/lenny/applications/koffice/debian/kplato-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kplato-trinity.install
@@ -23,8 +23,8 @@ debian/tmp/opt/trinity/share/apps/kplato/kplato.rc
 debian/tmp/opt/trinity/share/apps/kplato/kplato_readonly.rc
 debian/tmp/opt/trinity/share/apps/kplato/reports/resourcelist.desktop
 debian/tmp/opt/trinity/share/apps/kplato/reports/.source/resourcelist.ktf
-debian/tmp/opt/trinity/share/apps/kplato/reports/.source/tastdelist.ktf
-debian/tmp/opt/trinity/share/apps/kplato/reports/tastdelist.desktop
+debian/tmp/opt/trinity/share/apps/kplato/reports/.source/tasklist.ktf
+debian/tmp/opt/trinity/share/apps/kplato/reports/tasklist.desktop
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/8HourDay-40HourWeek.desktop
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/.directory
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/Plain.desktop
diff --git a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
index c05dc0286..b9b169871 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -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/bloctdeselectioninterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/blockselectioninterface.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
diff --git a/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install b/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install
index 83535649d..e1ce52d78 100644
--- a/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install
+++ b/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install
@@ -37,8 +37,8 @@ debian/tmp/opt/trinity/include/kopete/kopeteversion.h
 debian/tmp/opt/trinity/include/kopete/managedconnectionaccount.h
 debian/tmp/opt/trinity/include/kopete/ui/accountselector.h
 debian/tmp/opt/trinity/include/kopete/ui/addcontactpage.h
-debian/tmp/opt/trinity/include/kopete/ui/addressbootdeselectordialog.h
-debian/tmp/opt/trinity/include/kopete/ui/addressbootdeselectorwidget.h
+debian/tmp/opt/trinity/include/kopete/ui/addressbookselectordialog.h
+debian/tmp/opt/trinity/include/kopete/ui/addressbookselectorwidget.h
 debian/tmp/opt/trinity/include/kopete/ui/editaccountwidget.h
 debian/tmp/opt/trinity/include/kopete/ui/fileconfirmbase.h
 debian/tmp/opt/trinity/include/kopete/ui/kopeteawaydialogbase.h
diff --git a/debian/squeeze/applications/koffice/debian/chalk-data-trinity.install b/debian/squeeze/applications/koffice/debian/chalk-data-trinity.install
index 0b02bd024..7bed60e6c 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-data-trinity.install
+++ b/debian/squeeze/applications/koffice/debian/chalk-data-trinity.install
@@ -352,9 +352,9 @@ debian/tmp/opt/trinity/share/services/chalk_rgb_u16_plugin.desktop
 debian/tmp/opt/trinity/share/services/chalkrotateimage.desktop
 debian/tmp/opt/trinity/share/services/chalkroundcornersfilter.desktop
 debian/tmp/opt/trinity/share/services/chalkscreenshot.desktop
-debian/tmp/opt/trinity/share/services/chaltdescripting.desktop
-debian/tmp/opt/trinity/share/services/chaltdeselectiontools.desktop
-debian/tmp/opt/trinity/share/services/chaltdeselectopaque.desktop
+debian/tmp/opt/trinity/share/services/chalkscripting.desktop
+debian/tmp/opt/trinity/share/services/chalkselectiontools.desktop
+debian/tmp/opt/trinity/share/services/chalkselectopaque.desktop
 debian/tmp/opt/trinity/share/services/chalkseparatechannels.desktop
 debian/tmp/opt/trinity/share/services/chalkshearimage.desktop
 debian/tmp/opt/trinity/share/services/chalksmalltilesfilter.desktop
@@ -362,16 +362,16 @@ debian/tmp/opt/trinity/share/services/chalksobelfilter.desktop
 debian/tmp/opt/trinity/share/services/chalksubstrate.desktop
 debian/tmp/opt/trinity/share/services/chalk_tiff_export.desktop
 debian/tmp/opt/trinity/share/services/chalk_tiff_import.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolcrop.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolcurves.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolfilter.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolperspectivegrid.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolperspectivetransform.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolpolygon.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolpolyline.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolselectsimilar.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolstar.desktop
-debian/tmp/opt/trinity/share/services/chaltdetooltransform.desktop
+debian/tmp/opt/trinity/share/services/chalktoolcrop.desktop
+debian/tmp/opt/trinity/share/services/chalktoolcurves.desktop
+debian/tmp/opt/trinity/share/services/chalktoolfilter.desktop
+debian/tmp/opt/trinity/share/services/chalktoolperspectivegrid.desktop
+debian/tmp/opt/trinity/share/services/chalktoolperspectivetransform.desktop
+debian/tmp/opt/trinity/share/services/chalktoolpolygon.desktop
+debian/tmp/opt/trinity/share/services/chalktoolpolyline.desktop
+debian/tmp/opt/trinity/share/services/chalktoolselectsimilar.desktop
+debian/tmp/opt/trinity/share/services/chalktoolstar.desktop
+debian/tmp/opt/trinity/share/services/chalktooltransform.desktop
 debian/tmp/opt/trinity/share/services/chalkunsharpfilter.desktop
 debian/tmp/opt/trinity/share/services/chalkwavefilter.desktop
 debian/tmp/opt/trinity/share/services/chalkwetplugin.desktop
diff --git a/debian/squeeze/applications/koffice/debian/chalk-trinity.install b/debian/squeeze/applications/koffice/debian/chalk-trinity.install
index 3bd4c6757..4df24b77e 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-trinity.install
+++ b/debian/squeeze/applications/koffice/debian/chalk-trinity.install
@@ -73,12 +73,12 @@ debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.la
 debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.so
-debian/tmp/opt/trinity/lib/trinity/chaltdescripting.la
-debian/tmp/opt/trinity/lib/trinity/chaltdescripting.so
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectiontools.la
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectiontools.so
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectopaque.la
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectopaque.so
+debian/tmp/opt/trinity/lib/trinity/chalkscripting.la
+debian/tmp/opt/trinity/lib/trinity/chalkscripting.so
+debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.la
+debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.so
+debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.la
+debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.so
 debian/tmp/opt/trinity/lib/trinity/chalkseparatechannels.la
 debian/tmp/opt/trinity/lib/trinity/chalkseparatechannels.so
 debian/tmp/opt/trinity/lib/trinity/chalkshearimage.la
@@ -90,26 +90,26 @@ debian/tmp/opt/trinity/lib/trinity/chalksobelfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalksobelfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalksubstrate.la
 debian/tmp/opt/trinity/lib/trinity/chalksubstrate.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcrop.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcrop.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcurves.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcurves.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolfilter.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolfilter.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivegrid.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivegrid.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivetransform.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivetransform.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolygon.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolygon.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolyline.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolyline.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolselectsimilar.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolselectsimilar.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolstar.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolstar.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetooltransform.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetooltransform.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolcrop.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolcrop.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolcurves.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolcurves.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolfilter.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolfilter.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivegrid.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivegrid.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivetransform.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivetransform.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolygon.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolygon.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolyline.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolyline.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolselectsimilar.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolselectsimilar.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolstar.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolstar.so
+debian/tmp/opt/trinity/lib/trinity/chalktooltransform.la
+debian/tmp/opt/trinity/lib/trinity/chalktooltransform.so
 debian/tmp/opt/trinity/lib/trinity/chalkunsharpfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalkunsharpfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalkwavefilter.la
@@ -152,6 +152,6 @@ debian/tmp/opt/trinity/lib/libchalkimage.so.*
 debian/tmp/opt/trinity/lib/libchalk_lms_*.so.*
 debian/tmp/opt/trinity/lib/libchalk_rgb_*.so.*
 debian/tmp/opt/trinity/lib/libchalkrgb.so.*
-debian/tmp/opt/trinity/lib/libchaltdescripting.so.*
+debian/tmp/opt/trinity/lib/libchalkscripting.so.*
 debian/tmp/opt/trinity/lib/libchalkui.so.*
 debian/tmp/opt/trinity/lib/libchalk_ycbcr_*.so.*
diff --git a/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian b/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian
index cdf64af56..08adc5291 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian
@@ -1,4 +1,4 @@
 chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so
 chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchaltdescripting0 libchalkui1
+chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
 
diff --git a/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install b/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install
index f28ee3bef..4b80b83ec 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install
+++ b/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install
@@ -79,8 +79,8 @@ debian/tmp/opt/trinity/lib/libchalkimage.la
 debian/tmp/opt/trinity/lib/libchalkimage.so
 debian/tmp/opt/trinity/lib/libchalkrgb.la
 debian/tmp/opt/trinity/lib/libchalkrgb.so
-debian/tmp/opt/trinity/lib/libchaltdescripting.la
-debian/tmp/opt/trinity/lib/libchaltdescripting.so
+debian/tmp/opt/trinity/lib/libchalkscripting.la
+debian/tmp/opt/trinity/lib/libchalkscripting.so
 debian/tmp/opt/trinity/lib/libchalkui.la
 debian/tmp/opt/trinity/lib/libchalkui.so
 debian/tmp/opt/trinity/lib/libkrossapi.la
diff --git a/debian/squeeze/applications/koffice/debian/kplato-trinity.install b/debian/squeeze/applications/koffice/debian/kplato-trinity.install
index d38914b77..8c3df29c3 100644
--- a/debian/squeeze/applications/koffice/debian/kplato-trinity.install
+++ b/debian/squeeze/applications/koffice/debian/kplato-trinity.install
@@ -23,8 +23,8 @@ debian/tmp/opt/trinity/share/apps/kplato/kplato.rc
 debian/tmp/opt/trinity/share/apps/kplato/kplato_readonly.rc
 debian/tmp/opt/trinity/share/apps/kplato/reports/resourcelist.desktop
 debian/tmp/opt/trinity/share/apps/kplato/reports/.source/resourcelist.ktf
-debian/tmp/opt/trinity/share/apps/kplato/reports/.source/tastdelist.ktf
-debian/tmp/opt/trinity/share/apps/kplato/reports/tastdelist.desktop
+debian/tmp/opt/trinity/share/apps/kplato/reports/.source/tasklist.ktf
+debian/tmp/opt/trinity/share/apps/kplato/reports/tasklist.desktop
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/8HourDay-40HourWeek.desktop
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/.directory
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/Plain.desktop
diff --git a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
index c05dc0286..b9b169871 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -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/bloctdeselectioninterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/blockselectioninterface.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
diff --git a/debian/squeeze/tdenetwork/debian/tdenetwork-trinity-dev.install b/debian/squeeze/tdenetwork/debian/tdenetwork-trinity-dev.install
index 83535649d..e1ce52d78 100644
--- a/debian/squeeze/tdenetwork/debian/tdenetwork-trinity-dev.install
+++ b/debian/squeeze/tdenetwork/debian/tdenetwork-trinity-dev.install
@@ -37,8 +37,8 @@ debian/tmp/opt/trinity/include/kopete/kopeteversion.h
 debian/tmp/opt/trinity/include/kopete/managedconnectionaccount.h
 debian/tmp/opt/trinity/include/kopete/ui/accountselector.h
 debian/tmp/opt/trinity/include/kopete/ui/addcontactpage.h
-debian/tmp/opt/trinity/include/kopete/ui/addressbootdeselectordialog.h
-debian/tmp/opt/trinity/include/kopete/ui/addressbootdeselectorwidget.h
+debian/tmp/opt/trinity/include/kopete/ui/addressbookselectordialog.h
+debian/tmp/opt/trinity/include/kopete/ui/addressbookselectorwidget.h
 debian/tmp/opt/trinity/include/kopete/ui/editaccountwidget.h
 debian/tmp/opt/trinity/include/kopete/ui/fileconfirmbase.h
 debian/tmp/opt/trinity/include/kopete/ui/kopeteawaydialogbase.h
diff --git a/debian/wheezy/applications/koffice/debian/chalk-data-trinity.install b/debian/wheezy/applications/koffice/debian/chalk-data-trinity.install
index 0b02bd024..7bed60e6c 100644
--- a/debian/wheezy/applications/koffice/debian/chalk-data-trinity.install
+++ b/debian/wheezy/applications/koffice/debian/chalk-data-trinity.install
@@ -352,9 +352,9 @@ debian/tmp/opt/trinity/share/services/chalk_rgb_u16_plugin.desktop
 debian/tmp/opt/trinity/share/services/chalkrotateimage.desktop
 debian/tmp/opt/trinity/share/services/chalkroundcornersfilter.desktop
 debian/tmp/opt/trinity/share/services/chalkscreenshot.desktop
-debian/tmp/opt/trinity/share/services/chaltdescripting.desktop
-debian/tmp/opt/trinity/share/services/chaltdeselectiontools.desktop
-debian/tmp/opt/trinity/share/services/chaltdeselectopaque.desktop
+debian/tmp/opt/trinity/share/services/chalkscripting.desktop
+debian/tmp/opt/trinity/share/services/chalkselectiontools.desktop
+debian/tmp/opt/trinity/share/services/chalkselectopaque.desktop
 debian/tmp/opt/trinity/share/services/chalkseparatechannels.desktop
 debian/tmp/opt/trinity/share/services/chalkshearimage.desktop
 debian/tmp/opt/trinity/share/services/chalksmalltilesfilter.desktop
@@ -362,16 +362,16 @@ debian/tmp/opt/trinity/share/services/chalksobelfilter.desktop
 debian/tmp/opt/trinity/share/services/chalksubstrate.desktop
 debian/tmp/opt/trinity/share/services/chalk_tiff_export.desktop
 debian/tmp/opt/trinity/share/services/chalk_tiff_import.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolcrop.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolcurves.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolfilter.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolperspectivegrid.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolperspectivetransform.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolpolygon.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolpolyline.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolselectsimilar.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolstar.desktop
-debian/tmp/opt/trinity/share/services/chaltdetooltransform.desktop
+debian/tmp/opt/trinity/share/services/chalktoolcrop.desktop
+debian/tmp/opt/trinity/share/services/chalktoolcurves.desktop
+debian/tmp/opt/trinity/share/services/chalktoolfilter.desktop
+debian/tmp/opt/trinity/share/services/chalktoolperspectivegrid.desktop
+debian/tmp/opt/trinity/share/services/chalktoolperspectivetransform.desktop
+debian/tmp/opt/trinity/share/services/chalktoolpolygon.desktop
+debian/tmp/opt/trinity/share/services/chalktoolpolyline.desktop
+debian/tmp/opt/trinity/share/services/chalktoolselectsimilar.desktop
+debian/tmp/opt/trinity/share/services/chalktoolstar.desktop
+debian/tmp/opt/trinity/share/services/chalktooltransform.desktop
 debian/tmp/opt/trinity/share/services/chalkunsharpfilter.desktop
 debian/tmp/opt/trinity/share/services/chalkwavefilter.desktop
 debian/tmp/opt/trinity/share/services/chalkwetplugin.desktop
diff --git a/debian/wheezy/applications/koffice/debian/chalk-trinity.install b/debian/wheezy/applications/koffice/debian/chalk-trinity.install
index 3bd4c6757..4df24b77e 100644
--- a/debian/wheezy/applications/koffice/debian/chalk-trinity.install
+++ b/debian/wheezy/applications/koffice/debian/chalk-trinity.install
@@ -73,12 +73,12 @@ debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.la
 debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.so
-debian/tmp/opt/trinity/lib/trinity/chaltdescripting.la
-debian/tmp/opt/trinity/lib/trinity/chaltdescripting.so
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectiontools.la
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectiontools.so
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectopaque.la
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectopaque.so
+debian/tmp/opt/trinity/lib/trinity/chalkscripting.la
+debian/tmp/opt/trinity/lib/trinity/chalkscripting.so
+debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.la
+debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.so
+debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.la
+debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.so
 debian/tmp/opt/trinity/lib/trinity/chalkseparatechannels.la
 debian/tmp/opt/trinity/lib/trinity/chalkseparatechannels.so
 debian/tmp/opt/trinity/lib/trinity/chalkshearimage.la
@@ -90,26 +90,26 @@ debian/tmp/opt/trinity/lib/trinity/chalksobelfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalksobelfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalksubstrate.la
 debian/tmp/opt/trinity/lib/trinity/chalksubstrate.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcrop.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcrop.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcurves.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcurves.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolfilter.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolfilter.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivegrid.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivegrid.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivetransform.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivetransform.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolygon.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolygon.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolyline.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolyline.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolselectsimilar.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolselectsimilar.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolstar.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolstar.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetooltransform.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetooltransform.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolcrop.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolcrop.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolcurves.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolcurves.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolfilter.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolfilter.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivegrid.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivegrid.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivetransform.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivetransform.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolygon.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolygon.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolyline.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolyline.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolselectsimilar.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolselectsimilar.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolstar.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolstar.so
+debian/tmp/opt/trinity/lib/trinity/chalktooltransform.la
+debian/tmp/opt/trinity/lib/trinity/chalktooltransform.so
 debian/tmp/opt/trinity/lib/trinity/chalkunsharpfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalkunsharpfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalkwavefilter.la
@@ -152,6 +152,6 @@ debian/tmp/opt/trinity/lib/libchalkimage.so.*
 debian/tmp/opt/trinity/lib/libchalk_lms_*.so.*
 debian/tmp/opt/trinity/lib/libchalk_rgb_*.so.*
 debian/tmp/opt/trinity/lib/libchalkrgb.so.*
-debian/tmp/opt/trinity/lib/libchaltdescripting.so.*
+debian/tmp/opt/trinity/lib/libchalkscripting.so.*
 debian/tmp/opt/trinity/lib/libchalkui.so.*
 debian/tmp/opt/trinity/lib/libchalk_ycbcr_*.so.*
diff --git a/debian/wheezy/applications/koffice/debian/chalk-trinity.lintian b/debian/wheezy/applications/koffice/debian/chalk-trinity.lintian
index cdf64af56..08adc5291 100644
--- a/debian/wheezy/applications/koffice/debian/chalk-trinity.lintian
+++ b/debian/wheezy/applications/koffice/debian/chalk-trinity.lintian
@@ -1,4 +1,4 @@
 chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so
 chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchaltdescripting0 libchalkui1
+chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
 
diff --git a/debian/wheezy/applications/koffice/debian/koffice-dev-trinity.install b/debian/wheezy/applications/koffice/debian/koffice-dev-trinity.install
index f28ee3bef..4b80b83ec 100644
--- a/debian/wheezy/applications/koffice/debian/koffice-dev-trinity.install
+++ b/debian/wheezy/applications/koffice/debian/koffice-dev-trinity.install
@@ -79,8 +79,8 @@ debian/tmp/opt/trinity/lib/libchalkimage.la
 debian/tmp/opt/trinity/lib/libchalkimage.so
 debian/tmp/opt/trinity/lib/libchalkrgb.la
 debian/tmp/opt/trinity/lib/libchalkrgb.so
-debian/tmp/opt/trinity/lib/libchaltdescripting.la
-debian/tmp/opt/trinity/lib/libchaltdescripting.so
+debian/tmp/opt/trinity/lib/libchalkscripting.la
+debian/tmp/opt/trinity/lib/libchalkscripting.so
 debian/tmp/opt/trinity/lib/libchalkui.la
 debian/tmp/opt/trinity/lib/libchalkui.so
 debian/tmp/opt/trinity/lib/libkrossapi.la
diff --git a/debian/wheezy/applications/koffice/debian/kplato-trinity.install b/debian/wheezy/applications/koffice/debian/kplato-trinity.install
index d38914b77..8c3df29c3 100644
--- a/debian/wheezy/applications/koffice/debian/kplato-trinity.install
+++ b/debian/wheezy/applications/koffice/debian/kplato-trinity.install
@@ -23,8 +23,8 @@ debian/tmp/opt/trinity/share/apps/kplato/kplato.rc
 debian/tmp/opt/trinity/share/apps/kplato/kplato_readonly.rc
 debian/tmp/opt/trinity/share/apps/kplato/reports/resourcelist.desktop
 debian/tmp/opt/trinity/share/apps/kplato/reports/.source/resourcelist.ktf
-debian/tmp/opt/trinity/share/apps/kplato/reports/.source/tastdelist.ktf
-debian/tmp/opt/trinity/share/apps/kplato/reports/tastdelist.desktop
+debian/tmp/opt/trinity/share/apps/kplato/reports/.source/tasklist.ktf
+debian/tmp/opt/trinity/share/apps/kplato/reports/tasklist.desktop
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/8HourDay-40HourWeek.desktop
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/.directory
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/Plain.desktop
diff --git a/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.install
index c05dc0286..b9b169871 100644
--- a/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -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/bloctdeselectioninterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/blockselectioninterface.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
diff --git a/debian/wheezy/tdenetwork/debian/tdenetwork-trinity-dev.install b/debian/wheezy/tdenetwork/debian/tdenetwork-trinity-dev.install
index 83535649d..e1ce52d78 100644
--- a/debian/wheezy/tdenetwork/debian/tdenetwork-trinity-dev.install
+++ b/debian/wheezy/tdenetwork/debian/tdenetwork-trinity-dev.install
@@ -37,8 +37,8 @@ debian/tmp/opt/trinity/include/kopete/kopeteversion.h
 debian/tmp/opt/trinity/include/kopete/managedconnectionaccount.h
 debian/tmp/opt/trinity/include/kopete/ui/accountselector.h
 debian/tmp/opt/trinity/include/kopete/ui/addcontactpage.h
-debian/tmp/opt/trinity/include/kopete/ui/addressbootdeselectordialog.h
-debian/tmp/opt/trinity/include/kopete/ui/addressbootdeselectorwidget.h
+debian/tmp/opt/trinity/include/kopete/ui/addressbookselectordialog.h
+debian/tmp/opt/trinity/include/kopete/ui/addressbookselectorwidget.h
 debian/tmp/opt/trinity/include/kopete/ui/editaccountwidget.h
 debian/tmp/opt/trinity/include/kopete/ui/fileconfirmbase.h
 debian/tmp/opt/trinity/include/kopete/ui/kopeteawaydialogbase.h
diff --git a/ubuntu/lucid_automake/applications/koffice/debian/kplato-kde3.install b/ubuntu/lucid_automake/applications/koffice/debian/kplato-kde3.install
index d463b2095..5314780b5 100644
--- a/ubuntu/lucid_automake/applications/koffice/debian/kplato-kde3.install
+++ b/ubuntu/lucid_automake/applications/koffice/debian/kplato-kde3.install
@@ -23,8 +23,8 @@ debian/tmp/opt/kde3/share/apps/kplato/kplato.rc
 debian/tmp/opt/kde3/share/apps/kplato/kplato_readonly.rc
 debian/tmp/opt/kde3/share/apps/kplato/reports/resourcelist.desktop
 debian/tmp/opt/kde3/share/apps/kplato/reports/.source/resourcelist.ktf
-debian/tmp/opt/kde3/share/apps/kplato/reports/.source/tastdelist.ktf
-debian/tmp/opt/kde3/share/apps/kplato/reports/tastdelist.desktop
+debian/tmp/opt/kde3/share/apps/kplato/reports/.source/tasklist.ktf
+debian/tmp/opt/kde3/share/apps/kplato/reports/tasklist.desktop
 debian/tmp/opt/kde3/share/apps/kplato/templates/Simple/8HourDay-40HourWeek.desktop
 debian/tmp/opt/kde3/share/apps/kplato/templates/Simple/.directory
 debian/tmp/opt/kde3/share/apps/kplato/templates/Simple/Plain.desktop
diff --git a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install
index 15da36df7..9c7b26014 100644
--- a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install
+++ b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install
@@ -604,7 +604,7 @@ debian/tmp/opt/kde3/include/tde/ktempdir.h
 debian/tmp/opt/kde3/include/tde/ktempfile.h
 debian/tmp/opt/kde3/include/tde/ktextbrowser.h
 debian/tmp/opt/kde3/include/tde/ktextedit.h
-debian/tmp/opt/kde3/include/tde/tdetexteditor/bloctdeselectioninterface.h
+debian/tmp/opt/kde3/include/tde/tdetexteditor/blockselectioninterface.h
 debian/tmp/opt/kde3/include/tde/tdetexteditor/clipboardinterface.h
 debian/tmp/opt/kde3/include/tde/tdetexteditor/codecompletioninterface.h
 debian/tmp/opt/kde3/include/tde/tdetexteditor/configinterfaceextension.h
diff --git a/ubuntu/lucid_automake/kdenetwork/debian/kdenetwork-kde3-dev.install b/ubuntu/lucid_automake/kdenetwork/debian/kdenetwork-kde3-dev.install
index 00dff61f8..cefc34345 100644
--- a/ubuntu/lucid_automake/kdenetwork/debian/kdenetwork-kde3-dev.install
+++ b/ubuntu/lucid_automake/kdenetwork/debian/kdenetwork-kde3-dev.install
@@ -37,8 +37,8 @@ debian/tmp/opt/kde3/include/tde/kopete/kopeteversion.h
 debian/tmp/opt/kde3/include/tde/kopete/managedconnectionaccount.h
 debian/tmp/opt/kde3/include/tde/kopete/ui/accountselector.h
 debian/tmp/opt/kde3/include/tde/kopete/ui/addcontactpage.h
-debian/tmp/opt/kde3/include/tde/kopete/ui/addressbootdeselectordialog.h
-debian/tmp/opt/kde3/include/tde/kopete/ui/addressbootdeselectorwidget.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/addressbookselectordialog.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/addressbookselectorwidget.h
 debian/tmp/opt/kde3/include/tde/kopete/ui/editaccountwidget.h
 debian/tmp/opt/kde3/include/tde/kopete/ui/fileconfirmbase.h
 debian/tmp/opt/kde3/include/tde/kopete/ui/kopeteawaydialogbase.h
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 b5af11a0a..789be3e4a 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
@@ -1,5 +1,5 @@
---- kiosktool/kiosktool/tdeioskrun.h	2005-04-25 10:46:33.000000000 +0100
-+++ kiosktool/kiosktool/tdeioskrun.h	2007-07-18 17:47:04.000000000 +0100
+--- kiosktool/kiosktool/kioskrun.h	2005-04-25 10:46:33.000000000 +0100
++++ kiosktool/kiosktool/kioskrun.h	2007-07-18 17:47:04.000000000 +0100
 @@ -37,6 +37,18 @@
  
  class KioskGui;
@@ -19,8 +19,8 @@
  class KioskRun : public TQObject
  {
    friend class KioskGui;
---- kiosktool/kiosktool/tdeioskrun.cpp	2005-04-25 10:46:33.000000000 +0100
-+++ kiosktool/kiosktool/tdeioskrun.cpp	2007-07-20 16:56:07.000000000 +0100
+--- kiosktool/kiosktool/kioskrun.cpp	2005-04-25 10:46:33.000000000 +0100
++++ kiosktool/kiosktool/kioskrun.cpp	2007-07-20 16:56:07.000000000 +0100
 @@ -28,6 +28,7 @@
  
  #include <tqdir.h>
@@ -34,7 +34,7 @@
  
  #include <tdeio/netaccess.h>
 -#define NETACCESS	KIO::NetAccess
-+// Kiostdetool wants to use fish://root@localhost/... which won't work on Kubuntu because we don't run ssh by default, we don't allow ssh to do root logins and root doesn't even have a password, so implement the functions here for local copies using tdesu instead
++// Kiosktool wants to use fish://root@localhost/... which won't work on Kubuntu because we don't run ssh by default, we don't allow ssh to do root logins and root doesn't even have a password, so implement the functions here for local copies using tdesu instead
 +// #define NETACCESS	KIO::NetAccess
  
  #undef DEBUG_ENTRIES
@@ -71,7 +71,7 @@
 +
 +TQString NETACCESS::lastErrorString()
 +{
-+  return "Error in Kiostdetool Kubuntu modifications";
++  return "Error in Kiosktool Kubuntu modifications";
 +}
 +
 +int NETACCESS::lastError()
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install b/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install
index 0b02bd024..7bed60e6c 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install
@@ -352,9 +352,9 @@ debian/tmp/opt/trinity/share/services/chalk_rgb_u16_plugin.desktop
 debian/tmp/opt/trinity/share/services/chalkrotateimage.desktop
 debian/tmp/opt/trinity/share/services/chalkroundcornersfilter.desktop
 debian/tmp/opt/trinity/share/services/chalkscreenshot.desktop
-debian/tmp/opt/trinity/share/services/chaltdescripting.desktop
-debian/tmp/opt/trinity/share/services/chaltdeselectiontools.desktop
-debian/tmp/opt/trinity/share/services/chaltdeselectopaque.desktop
+debian/tmp/opt/trinity/share/services/chalkscripting.desktop
+debian/tmp/opt/trinity/share/services/chalkselectiontools.desktop
+debian/tmp/opt/trinity/share/services/chalkselectopaque.desktop
 debian/tmp/opt/trinity/share/services/chalkseparatechannels.desktop
 debian/tmp/opt/trinity/share/services/chalkshearimage.desktop
 debian/tmp/opt/trinity/share/services/chalksmalltilesfilter.desktop
@@ -362,16 +362,16 @@ debian/tmp/opt/trinity/share/services/chalksobelfilter.desktop
 debian/tmp/opt/trinity/share/services/chalksubstrate.desktop
 debian/tmp/opt/trinity/share/services/chalk_tiff_export.desktop
 debian/tmp/opt/trinity/share/services/chalk_tiff_import.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolcrop.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolcurves.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolfilter.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolperspectivegrid.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolperspectivetransform.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolpolygon.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolpolyline.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolselectsimilar.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolstar.desktop
-debian/tmp/opt/trinity/share/services/chaltdetooltransform.desktop
+debian/tmp/opt/trinity/share/services/chalktoolcrop.desktop
+debian/tmp/opt/trinity/share/services/chalktoolcurves.desktop
+debian/tmp/opt/trinity/share/services/chalktoolfilter.desktop
+debian/tmp/opt/trinity/share/services/chalktoolperspectivegrid.desktop
+debian/tmp/opt/trinity/share/services/chalktoolperspectivetransform.desktop
+debian/tmp/opt/trinity/share/services/chalktoolpolygon.desktop
+debian/tmp/opt/trinity/share/services/chalktoolpolyline.desktop
+debian/tmp/opt/trinity/share/services/chalktoolselectsimilar.desktop
+debian/tmp/opt/trinity/share/services/chalktoolstar.desktop
+debian/tmp/opt/trinity/share/services/chalktooltransform.desktop
 debian/tmp/opt/trinity/share/services/chalkunsharpfilter.desktop
 debian/tmp/opt/trinity/share/services/chalkwavefilter.desktop
 debian/tmp/opt/trinity/share/services/chalkwetplugin.desktop
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install
index 3bd4c6757..4df24b77e 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install
@@ -73,12 +73,12 @@ debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.la
 debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.so
-debian/tmp/opt/trinity/lib/trinity/chaltdescripting.la
-debian/tmp/opt/trinity/lib/trinity/chaltdescripting.so
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectiontools.la
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectiontools.so
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectopaque.la
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectopaque.so
+debian/tmp/opt/trinity/lib/trinity/chalkscripting.la
+debian/tmp/opt/trinity/lib/trinity/chalkscripting.so
+debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.la
+debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.so
+debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.la
+debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.so
 debian/tmp/opt/trinity/lib/trinity/chalkseparatechannels.la
 debian/tmp/opt/trinity/lib/trinity/chalkseparatechannels.so
 debian/tmp/opt/trinity/lib/trinity/chalkshearimage.la
@@ -90,26 +90,26 @@ debian/tmp/opt/trinity/lib/trinity/chalksobelfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalksobelfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalksubstrate.la
 debian/tmp/opt/trinity/lib/trinity/chalksubstrate.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcrop.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcrop.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcurves.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcurves.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolfilter.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolfilter.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivegrid.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivegrid.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivetransform.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivetransform.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolygon.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolygon.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolyline.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolyline.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolselectsimilar.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolselectsimilar.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolstar.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolstar.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetooltransform.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetooltransform.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolcrop.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolcrop.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolcurves.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolcurves.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolfilter.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolfilter.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivegrid.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivegrid.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivetransform.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivetransform.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolygon.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolygon.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolyline.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolyline.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolselectsimilar.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolselectsimilar.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolstar.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolstar.so
+debian/tmp/opt/trinity/lib/trinity/chalktooltransform.la
+debian/tmp/opt/trinity/lib/trinity/chalktooltransform.so
 debian/tmp/opt/trinity/lib/trinity/chalkunsharpfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalkunsharpfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalkwavefilter.la
@@ -152,6 +152,6 @@ debian/tmp/opt/trinity/lib/libchalkimage.so.*
 debian/tmp/opt/trinity/lib/libchalk_lms_*.so.*
 debian/tmp/opt/trinity/lib/libchalk_rgb_*.so.*
 debian/tmp/opt/trinity/lib/libchalkrgb.so.*
-debian/tmp/opt/trinity/lib/libchaltdescripting.so.*
+debian/tmp/opt/trinity/lib/libchalkscripting.so.*
 debian/tmp/opt/trinity/lib/libchalkui.so.*
 debian/tmp/opt/trinity/lib/libchalk_ycbcr_*.so.*
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian
index cdf64af56..08adc5291 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian
@@ -1,4 +1,4 @@
 chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so
 chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchaltdescripting0 libchalkui1
+chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
 
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install b/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install
index f28ee3bef..4b80b83ec 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install
@@ -79,8 +79,8 @@ debian/tmp/opt/trinity/lib/libchalkimage.la
 debian/tmp/opt/trinity/lib/libchalkimage.so
 debian/tmp/opt/trinity/lib/libchalkrgb.la
 debian/tmp/opt/trinity/lib/libchalkrgb.so
-debian/tmp/opt/trinity/lib/libchaltdescripting.la
-debian/tmp/opt/trinity/lib/libchaltdescripting.so
+debian/tmp/opt/trinity/lib/libchalkscripting.la
+debian/tmp/opt/trinity/lib/libchalkscripting.so
 debian/tmp/opt/trinity/lib/libchalkui.la
 debian/tmp/opt/trinity/lib/libchalkui.so
 debian/tmp/opt/trinity/lib/libkrossapi.la
diff --git a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install b/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install
index d38914b77..8c3df29c3 100644
--- a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install
@@ -23,8 +23,8 @@ debian/tmp/opt/trinity/share/apps/kplato/kplato.rc
 debian/tmp/opt/trinity/share/apps/kplato/kplato_readonly.rc
 debian/tmp/opt/trinity/share/apps/kplato/reports/resourcelist.desktop
 debian/tmp/opt/trinity/share/apps/kplato/reports/.source/resourcelist.ktf
-debian/tmp/opt/trinity/share/apps/kplato/reports/.source/tastdelist.ktf
-debian/tmp/opt/trinity/share/apps/kplato/reports/tastdelist.desktop
+debian/tmp/opt/trinity/share/apps/kplato/reports/.source/tasklist.ktf
+debian/tmp/opt/trinity/share/apps/kplato/reports/tasklist.desktop
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/8HourDay-40HourWeek.desktop
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/.directory
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/Plain.desktop
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
index c05dc0286..b9b169871 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -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/bloctdeselectioninterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/blockselectioninterface.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
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install b/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install
index 83535649d..e1ce52d78 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install
@@ -37,8 +37,8 @@ debian/tmp/opt/trinity/include/kopete/kopeteversion.h
 debian/tmp/opt/trinity/include/kopete/managedconnectionaccount.h
 debian/tmp/opt/trinity/include/kopete/ui/accountselector.h
 debian/tmp/opt/trinity/include/kopete/ui/addcontactpage.h
-debian/tmp/opt/trinity/include/kopete/ui/addressbootdeselectordialog.h
-debian/tmp/opt/trinity/include/kopete/ui/addressbootdeselectorwidget.h
+debian/tmp/opt/trinity/include/kopete/ui/addressbookselectordialog.h
+debian/tmp/opt/trinity/include/kopete/ui/addressbookselectorwidget.h
 debian/tmp/opt/trinity/include/kopete/ui/editaccountwidget.h
 debian/tmp/opt/trinity/include/kopete/ui/fileconfirmbase.h
 debian/tmp/opt/trinity/include/kopete/ui/kopeteawaydialogbase.h
diff --git a/ubuntu/maverick_automake/applications/koffice/debian/kplato-kde3.install b/ubuntu/maverick_automake/applications/koffice/debian/kplato-kde3.install
index d463b2095..5314780b5 100644
--- a/ubuntu/maverick_automake/applications/koffice/debian/kplato-kde3.install
+++ b/ubuntu/maverick_automake/applications/koffice/debian/kplato-kde3.install
@@ -23,8 +23,8 @@ debian/tmp/opt/kde3/share/apps/kplato/kplato.rc
 debian/tmp/opt/kde3/share/apps/kplato/kplato_readonly.rc
 debian/tmp/opt/kde3/share/apps/kplato/reports/resourcelist.desktop
 debian/tmp/opt/kde3/share/apps/kplato/reports/.source/resourcelist.ktf
-debian/tmp/opt/kde3/share/apps/kplato/reports/.source/tastdelist.ktf
-debian/tmp/opt/kde3/share/apps/kplato/reports/tastdelist.desktop
+debian/tmp/opt/kde3/share/apps/kplato/reports/.source/tasklist.ktf
+debian/tmp/opt/kde3/share/apps/kplato/reports/tasklist.desktop
 debian/tmp/opt/kde3/share/apps/kplato/templates/Simple/8HourDay-40HourWeek.desktop
 debian/tmp/opt/kde3/share/apps/kplato/templates/Simple/.directory
 debian/tmp/opt/kde3/share/apps/kplato/templates/Simple/Plain.desktop
diff --git a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install
index 15da36df7..9c7b26014 100644
--- a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install
+++ b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install
@@ -604,7 +604,7 @@ debian/tmp/opt/kde3/include/tde/ktempdir.h
 debian/tmp/opt/kde3/include/tde/ktempfile.h
 debian/tmp/opt/kde3/include/tde/ktextbrowser.h
 debian/tmp/opt/kde3/include/tde/ktextedit.h
-debian/tmp/opt/kde3/include/tde/tdetexteditor/bloctdeselectioninterface.h
+debian/tmp/opt/kde3/include/tde/tdetexteditor/blockselectioninterface.h
 debian/tmp/opt/kde3/include/tde/tdetexteditor/clipboardinterface.h
 debian/tmp/opt/kde3/include/tde/tdetexteditor/codecompletioninterface.h
 debian/tmp/opt/kde3/include/tde/tdetexteditor/configinterfaceextension.h
diff --git a/ubuntu/maverick_automake/kdenetwork/debian/kdenetwork-kde3-dev.install b/ubuntu/maverick_automake/kdenetwork/debian/kdenetwork-kde3-dev.install
index 00dff61f8..cefc34345 100644
--- a/ubuntu/maverick_automake/kdenetwork/debian/kdenetwork-kde3-dev.install
+++ b/ubuntu/maverick_automake/kdenetwork/debian/kdenetwork-kde3-dev.install
@@ -37,8 +37,8 @@ debian/tmp/opt/kde3/include/tde/kopete/kopeteversion.h
 debian/tmp/opt/kde3/include/tde/kopete/managedconnectionaccount.h
 debian/tmp/opt/kde3/include/tde/kopete/ui/accountselector.h
 debian/tmp/opt/kde3/include/tde/kopete/ui/addcontactpage.h
-debian/tmp/opt/kde3/include/tde/kopete/ui/addressbootdeselectordialog.h
-debian/tmp/opt/kde3/include/tde/kopete/ui/addressbootdeselectorwidget.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/addressbookselectordialog.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/addressbookselectorwidget.h
 debian/tmp/opt/kde3/include/tde/kopete/ui/editaccountwidget.h
 debian/tmp/opt/kde3/include/tde/kopete/ui/fileconfirmbase.h
 debian/tmp/opt/kde3/include/tde/kopete/ui/kopeteawaydialogbase.h
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 b5af11a0a..789be3e4a 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
@@ -1,5 +1,5 @@
---- kiosktool/kiosktool/tdeioskrun.h	2005-04-25 10:46:33.000000000 +0100
-+++ kiosktool/kiosktool/tdeioskrun.h	2007-07-18 17:47:04.000000000 +0100
+--- kiosktool/kiosktool/kioskrun.h	2005-04-25 10:46:33.000000000 +0100
++++ kiosktool/kiosktool/kioskrun.h	2007-07-18 17:47:04.000000000 +0100
 @@ -37,6 +37,18 @@
  
  class KioskGui;
@@ -19,8 +19,8 @@
  class KioskRun : public TQObject
  {
    friend class KioskGui;
---- kiosktool/kiosktool/tdeioskrun.cpp	2005-04-25 10:46:33.000000000 +0100
-+++ kiosktool/kiosktool/tdeioskrun.cpp	2007-07-20 16:56:07.000000000 +0100
+--- kiosktool/kiosktool/kioskrun.cpp	2005-04-25 10:46:33.000000000 +0100
++++ kiosktool/kiosktool/kioskrun.cpp	2007-07-20 16:56:07.000000000 +0100
 @@ -28,6 +28,7 @@
  
  #include <tqdir.h>
@@ -34,7 +34,7 @@
  
  #include <tdeio/netaccess.h>
 -#define NETACCESS	KIO::NetAccess
-+// Kiostdetool wants to use fish://root@localhost/... which won't work on Kubuntu because we don't run ssh by default, we don't allow ssh to do root logins and root doesn't even have a password, so implement the functions here for local copies using tdesu instead
++// Kiosktool wants to use fish://root@localhost/... which won't work on Kubuntu because we don't run ssh by default, we don't allow ssh to do root logins and root doesn't even have a password, so implement the functions here for local copies using tdesu instead
 +// #define NETACCESS	KIO::NetAccess
  
  #undef DEBUG_ENTRIES
@@ -71,7 +71,7 @@
 +
 +TQString NETACCESS::lastErrorString()
 +{
-+  return "Error in Kiostdetool Kubuntu modifications";
++  return "Error in Kiosktool Kubuntu modifications";
 +}
 +
 +int NETACCESS::lastError()
diff --git a/ubuntu/precise/applications/koffice/debian/chalk-data-trinity.install b/ubuntu/precise/applications/koffice/debian/chalk-data-trinity.install
index 0b02bd024..7bed60e6c 100644
--- a/ubuntu/precise/applications/koffice/debian/chalk-data-trinity.install
+++ b/ubuntu/precise/applications/koffice/debian/chalk-data-trinity.install
@@ -352,9 +352,9 @@ debian/tmp/opt/trinity/share/services/chalk_rgb_u16_plugin.desktop
 debian/tmp/opt/trinity/share/services/chalkrotateimage.desktop
 debian/tmp/opt/trinity/share/services/chalkroundcornersfilter.desktop
 debian/tmp/opt/trinity/share/services/chalkscreenshot.desktop
-debian/tmp/opt/trinity/share/services/chaltdescripting.desktop
-debian/tmp/opt/trinity/share/services/chaltdeselectiontools.desktop
-debian/tmp/opt/trinity/share/services/chaltdeselectopaque.desktop
+debian/tmp/opt/trinity/share/services/chalkscripting.desktop
+debian/tmp/opt/trinity/share/services/chalkselectiontools.desktop
+debian/tmp/opt/trinity/share/services/chalkselectopaque.desktop
 debian/tmp/opt/trinity/share/services/chalkseparatechannels.desktop
 debian/tmp/opt/trinity/share/services/chalkshearimage.desktop
 debian/tmp/opt/trinity/share/services/chalksmalltilesfilter.desktop
@@ -362,16 +362,16 @@ debian/tmp/opt/trinity/share/services/chalksobelfilter.desktop
 debian/tmp/opt/trinity/share/services/chalksubstrate.desktop
 debian/tmp/opt/trinity/share/services/chalk_tiff_export.desktop
 debian/tmp/opt/trinity/share/services/chalk_tiff_import.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolcrop.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolcurves.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolfilter.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolperspectivegrid.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolperspectivetransform.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolpolygon.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolpolyline.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolselectsimilar.desktop
-debian/tmp/opt/trinity/share/services/chaltdetoolstar.desktop
-debian/tmp/opt/trinity/share/services/chaltdetooltransform.desktop
+debian/tmp/opt/trinity/share/services/chalktoolcrop.desktop
+debian/tmp/opt/trinity/share/services/chalktoolcurves.desktop
+debian/tmp/opt/trinity/share/services/chalktoolfilter.desktop
+debian/tmp/opt/trinity/share/services/chalktoolperspectivegrid.desktop
+debian/tmp/opt/trinity/share/services/chalktoolperspectivetransform.desktop
+debian/tmp/opt/trinity/share/services/chalktoolpolygon.desktop
+debian/tmp/opt/trinity/share/services/chalktoolpolyline.desktop
+debian/tmp/opt/trinity/share/services/chalktoolselectsimilar.desktop
+debian/tmp/opt/trinity/share/services/chalktoolstar.desktop
+debian/tmp/opt/trinity/share/services/chalktooltransform.desktop
 debian/tmp/opt/trinity/share/services/chalkunsharpfilter.desktop
 debian/tmp/opt/trinity/share/services/chalkwavefilter.desktop
 debian/tmp/opt/trinity/share/services/chalkwetplugin.desktop
diff --git a/ubuntu/precise/applications/koffice/debian/chalk-trinity.install b/ubuntu/precise/applications/koffice/debian/chalk-trinity.install
index 3bd4c6757..4df24b77e 100644
--- a/ubuntu/precise/applications/koffice/debian/chalk-trinity.install
+++ b/ubuntu/precise/applications/koffice/debian/chalk-trinity.install
@@ -73,12 +73,12 @@ debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.la
 debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.so
-debian/tmp/opt/trinity/lib/trinity/chaltdescripting.la
-debian/tmp/opt/trinity/lib/trinity/chaltdescripting.so
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectiontools.la
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectiontools.so
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectopaque.la
-debian/tmp/opt/trinity/lib/trinity/chaltdeselectopaque.so
+debian/tmp/opt/trinity/lib/trinity/chalkscripting.la
+debian/tmp/opt/trinity/lib/trinity/chalkscripting.so
+debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.la
+debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.so
+debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.la
+debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.so
 debian/tmp/opt/trinity/lib/trinity/chalkseparatechannels.la
 debian/tmp/opt/trinity/lib/trinity/chalkseparatechannels.so
 debian/tmp/opt/trinity/lib/trinity/chalkshearimage.la
@@ -90,26 +90,26 @@ debian/tmp/opt/trinity/lib/trinity/chalksobelfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalksobelfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalksubstrate.la
 debian/tmp/opt/trinity/lib/trinity/chalksubstrate.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcrop.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcrop.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcurves.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolcurves.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolfilter.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolfilter.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivegrid.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivegrid.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivetransform.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivetransform.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolygon.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolygon.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolyline.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolyline.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolselectsimilar.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolselectsimilar.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolstar.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetoolstar.so
-debian/tmp/opt/trinity/lib/trinity/chaltdetooltransform.la
-debian/tmp/opt/trinity/lib/trinity/chaltdetooltransform.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolcrop.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolcrop.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolcurves.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolcurves.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolfilter.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolfilter.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivegrid.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivegrid.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivetransform.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivetransform.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolygon.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolygon.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolyline.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolyline.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolselectsimilar.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolselectsimilar.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolstar.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolstar.so
+debian/tmp/opt/trinity/lib/trinity/chalktooltransform.la
+debian/tmp/opt/trinity/lib/trinity/chalktooltransform.so
 debian/tmp/opt/trinity/lib/trinity/chalkunsharpfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalkunsharpfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalkwavefilter.la
@@ -152,6 +152,6 @@ debian/tmp/opt/trinity/lib/libchalkimage.so.*
 debian/tmp/opt/trinity/lib/libchalk_lms_*.so.*
 debian/tmp/opt/trinity/lib/libchalk_rgb_*.so.*
 debian/tmp/opt/trinity/lib/libchalkrgb.so.*
-debian/tmp/opt/trinity/lib/libchaltdescripting.so.*
+debian/tmp/opt/trinity/lib/libchalkscripting.so.*
 debian/tmp/opt/trinity/lib/libchalkui.so.*
 debian/tmp/opt/trinity/lib/libchalk_ycbcr_*.so.*
diff --git a/ubuntu/precise/applications/koffice/debian/chalk-trinity.lintian b/ubuntu/precise/applications/koffice/debian/chalk-trinity.lintian
index cdf64af56..08adc5291 100644
--- a/ubuntu/precise/applications/koffice/debian/chalk-trinity.lintian
+++ b/ubuntu/precise/applications/koffice/debian/chalk-trinity.lintian
@@ -1,4 +1,4 @@
 chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so
 chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchaltdescripting0 libchalkui1
+chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
 
diff --git a/ubuntu/precise/applications/koffice/debian/koffice-dev-trinity.install b/ubuntu/precise/applications/koffice/debian/koffice-dev-trinity.install
index f28ee3bef..4b80b83ec 100644
--- a/ubuntu/precise/applications/koffice/debian/koffice-dev-trinity.install
+++ b/ubuntu/precise/applications/koffice/debian/koffice-dev-trinity.install
@@ -79,8 +79,8 @@ debian/tmp/opt/trinity/lib/libchalkimage.la
 debian/tmp/opt/trinity/lib/libchalkimage.so
 debian/tmp/opt/trinity/lib/libchalkrgb.la
 debian/tmp/opt/trinity/lib/libchalkrgb.so
-debian/tmp/opt/trinity/lib/libchaltdescripting.la
-debian/tmp/opt/trinity/lib/libchaltdescripting.so
+debian/tmp/opt/trinity/lib/libchalkscripting.la
+debian/tmp/opt/trinity/lib/libchalkscripting.so
 debian/tmp/opt/trinity/lib/libchalkui.la
 debian/tmp/opt/trinity/lib/libchalkui.so
 debian/tmp/opt/trinity/lib/libkrossapi.la
diff --git a/ubuntu/precise/applications/koffice/debian/kplato-trinity.install b/ubuntu/precise/applications/koffice/debian/kplato-trinity.install
index d38914b77..8c3df29c3 100644
--- a/ubuntu/precise/applications/koffice/debian/kplato-trinity.install
+++ b/ubuntu/precise/applications/koffice/debian/kplato-trinity.install
@@ -23,8 +23,8 @@ debian/tmp/opt/trinity/share/apps/kplato/kplato.rc
 debian/tmp/opt/trinity/share/apps/kplato/kplato_readonly.rc
 debian/tmp/opt/trinity/share/apps/kplato/reports/resourcelist.desktop
 debian/tmp/opt/trinity/share/apps/kplato/reports/.source/resourcelist.ktf
-debian/tmp/opt/trinity/share/apps/kplato/reports/.source/tastdelist.ktf
-debian/tmp/opt/trinity/share/apps/kplato/reports/tastdelist.desktop
+debian/tmp/opt/trinity/share/apps/kplato/reports/.source/tasklist.ktf
+debian/tmp/opt/trinity/share/apps/kplato/reports/tasklist.desktop
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/8HourDay-40HourWeek.desktop
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/.directory
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/Plain.desktop
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install
index c05dc0286..b9b169871 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -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/bloctdeselectioninterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/blockselectioninterface.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
diff --git a/ubuntu/precise/tdenetwork/debian/tdenetwork-trinity-dev.install b/ubuntu/precise/tdenetwork/debian/tdenetwork-trinity-dev.install
index 83535649d..e1ce52d78 100644
--- a/ubuntu/precise/tdenetwork/debian/tdenetwork-trinity-dev.install
+++ b/ubuntu/precise/tdenetwork/debian/tdenetwork-trinity-dev.install
@@ -37,8 +37,8 @@ debian/tmp/opt/trinity/include/kopete/kopeteversion.h
 debian/tmp/opt/trinity/include/kopete/managedconnectionaccount.h
 debian/tmp/opt/trinity/include/kopete/ui/accountselector.h
 debian/tmp/opt/trinity/include/kopete/ui/addcontactpage.h
-debian/tmp/opt/trinity/include/kopete/ui/addressbootdeselectordialog.h
-debian/tmp/opt/trinity/include/kopete/ui/addressbootdeselectorwidget.h
+debian/tmp/opt/trinity/include/kopete/ui/addressbookselectordialog.h
+debian/tmp/opt/trinity/include/kopete/ui/addressbookselectorwidget.h
 debian/tmp/opt/trinity/include/kopete/ui/editaccountwidget.h
 debian/tmp/opt/trinity/include/kopete/ui/fileconfirmbase.h
 debian/tmp/opt/trinity/include/kopete/ui/kopeteawaydialogbase.h