Add new handbooks to tdepim on Debian and Ubuntu

120 files changed, 234 insertions, 198 deletions

diff --git a/debian/lenny/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/lenny/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 9a68eac1d..d31d2c6e9 100644
--- a/debian/lenny/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/lenny/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -1,6 +1,6 @@
 Not build using tar inside .orig, no DEB_KDE_CVS_MAKE := yes
 Don't build-dep on libgnokii-dev, not in main
-Install /usr/share/services/kontact/knode* in knode and add replaces
+Install /opt/trinity/share/services/kontact/knode* in knode and add replaces
 don't build-dep on gnokii or automake1.9
 make kontact depend on kmail, korganizer, kaddressbook
 Remove 16_kde_modulename.diff, module name isn't changed in Ubuntu
diff --git a/debian/lenny/tdepim/debian/akregator-trinity.install b/debian/lenny/tdepim/debian/akregator-trinity.install
index 74762a959..0110b9760 100644
--- a/debian/lenny/tdepim/debian/akregator-trinity.install
+++ b/debian/lenny/tdepim/debian/akregator-trinity.install
@@ -12,6 +12,7 @@
 /opt/trinity/share/config.kcfg/akregator.kcfg
 /opt/trinity/share/config.kcfg/mk4config.kcfg
 /opt/trinity/share/doc/tde/HTML/en/akregator
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/feed
 /opt/trinity/share/icons/hicolor/128x128/apps/akregator.png
 /opt/trinity/share/icons/crystalsvg/16x16/actions/rss_tag.png
 /opt/trinity/share/icons/crystalsvg/22x22/actions/rss_tag.png
diff --git a/debian/lenny/tdepim/debian/korganizer-trinity.install b/debian/lenny/tdepim/debian/korganizer-trinity.install
index 4444d98a5..bf83660e5 100644
--- a/debian/lenny/tdepim/debian/korganizer-trinity.install
+++ b/debian/lenny/tdepim/debian/korganizer-trinity.install
@@ -24,6 +24,7 @@
 /opt/trinity/share/autostart/korgac.desktop
 /opt/trinity/share/config.kcfg/korganizer.kcfg
 /opt/trinity/share/doc/tde/HTML/en/korganizer
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/webcal
 /opt/trinity/share/icons/hicolor/128x128/apps/korganizer.png
 /opt/trinity/share/icons/hicolor/16x16/apps/korganizer.png
 /opt/trinity/share/icons/hicolor/32x32/apps/korganizer.png
diff --git a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
index 9abd3d67b..a89f82f40 100644
--- a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
+++ b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
@@ -5,5 +5,5 @@ Abstract: KAddressBook is the KDE address book.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kaddressbook/index.html
-Files: /usr/share/doc/tde/HTML/en/kaddressbook/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kaddressbook/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kaddressbook/*.html
diff --git a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kalarm b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kalarm
index 5a547ebc8..12fc2dace 100644
--- a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kalarm
+++ b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kalarm
@@ -6,5 +6,5 @@ Abstract: KAlarm is a personal alarm message, command and email
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kalarm/index.html
-Files: /usr/share/doc/tde/HTML/en/kalarm/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kalarm/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kalarm/*.html
diff --git a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kandy b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kandy
index a947b70a0..6ca2dc33a 100644
--- a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kandy
+++ b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kandy
@@ -6,5 +6,5 @@ Abstract: Kandy is an application for synchronizing the data on a mobile
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kandy/index.html
-Files: /usr/share/doc/tde/HTML/en/kandy/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kandy/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kandy/*.html
diff --git a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.karm b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.karm
index 40811c94b..8ff0970d3 100644
--- a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.karm
+++ b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.karm
@@ -5,5 +5,5 @@ Abstract: KArm tracks time spent on various tasks.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/karm/index.html
-Files: /usr/share/doc/tde/HTML/en/karm/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/karm/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/karm/*.html
diff --git a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kleopatra b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
index 59f829e56..95da59a9b 100644
--- a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
+++ b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
@@ -5,5 +5,5 @@ Abstract: Kleopatra is a tool for managing X.509 certificates.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kleopatra/index.html
-Files: /usr/share/doc/tde/HTML/en/kleopatra/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kleopatra/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kleopatra/*.html
diff --git a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kmail b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kmail
index 2c4405d79..4de6e31a5 100644
--- a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kmail
+++ b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kmail
@@ -5,5 +5,5 @@ Abstract: KMail is KDE's powerful and user friendly email client.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kmail/index.html
-Files: /usr/share/doc/tde/HTML/en/kmail/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kmail/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kmail/*.html
diff --git a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.knode b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.knode
index 675dbdb2f..759307042 100644
--- a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.knode
+++ b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.knode
@@ -5,5 +5,5 @@ Abstract: KNode is an easy-to-use newsreader.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/knode/index.html
-Files: /usr/share/doc/tde/HTML/en/knode/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/knode/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/knode/*.html
diff --git a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.knotes b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.knotes
index 1292db38f..a305098af 100644
--- a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.knotes
+++ b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.knotes
@@ -5,5 +5,5 @@ Abstract: KNotes is a sticky notes application for the desktop.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/knotes/index.html
-Files: /usr/share/doc/tde/HTML/en/knotes/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/knotes/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/knotes/*.html
diff --git a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
index e9a0e6459..3ed0d42be 100644
--- a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
+++ b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
@@ -5,5 +5,5 @@ Abstract: KonsoleKalendar is a command line interface to KDE calendars.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/konsolekalendar/index.html
-Files: /usr/share/doc/tde/HTML/en/konsolekalendar/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/konsolekalendar/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/konsolekalendar/*.html
diff --git a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kontact b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kontact
index 52e2946ff..74af7cbd4 100644
--- a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kontact
+++ b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kontact
@@ -5,5 +5,5 @@ Abstract: Kontact is a command line interface to KDE calendars.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kontact/index.html
-Files: /usr/share/doc/tde/HTML/en/kontact/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kontact/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kontact/*.html
diff --git a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.korganizer b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.korganizer
index 96f8aae6a..858d1c9b5 100644
--- a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.korganizer
+++ b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.korganizer
@@ -5,5 +5,5 @@ Abstract: KOrganizer is an easy to use personal information manager.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/korganizer/index.html
-Files: /usr/share/doc/tde/HTML/en/korganizer/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/korganizer/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/korganizer/*.html
diff --git a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.korn b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.korn
index 5d731fded..1b7312787 100644
--- a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.korn
+++ b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.korn
@@ -5,5 +5,5 @@ Abstract: KOrn is a mail monitor.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/korn/index.html
-Files: /usr/share/doc/tde/HTML/en/korn/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/korn/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/korn/*.html
diff --git a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kpilot b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kpilot
index b724ef964..3256dc551 100644
--- a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kpilot
+++ b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kpilot
@@ -6,5 +6,5 @@ Abstract: KPilot is the KDE version of the Desktop HotSync software for
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpilot/index.html
-Files: /usr/share/doc/tde/HTML/en/kpilot/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpilot/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpilot/*.html
diff --git a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.ktnef b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.ktnef
index ad5a72fb6..6a144e01f 100644
--- a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.ktnef
+++ b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.ktnef
@@ -5,5 +5,5 @@ Abstract: The TNEF File Viewer is an application for TNEF mail attachments.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/ktnef/index.html
-Files: /usr/share/doc/tde/HTML/en/ktnef/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/ktnef/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/ktnef/*.html
diff --git a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
index 720eb2a89..fdf9ea7f6 100644
--- a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
+++ b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
@@ -5,5 +5,5 @@ Abstract: KWatchGnuPG is a simple GnuPG log viewer.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kwatchgnupg/index.html
-Files: /usr/share/doc/tde/HTML/en/kwatchgnupg/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kwatchgnupg/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kwatchgnupg/*.html
diff --git a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.multisynk b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.multisynk
index 41f0d96d0..830d874c1 100644
--- a/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.multisynk
+++ b/debian/lenny/tdepim/debian/tdepim-doc-html.doc-base.multisynk
@@ -5,5 +5,5 @@ Abstract: KDE synchronization application.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/multisynk/index.html
-Files: /usr/share/doc/tde/HTML/en/multisynk/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/multisynk/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/multisynk/*.html
diff --git a/debian/lenny/tdepim/debian/tdepim-tdeio-plugins-trinity.install b/debian/lenny/tdepim/debian/tdepim-tdeio-plugins-trinity.install
index b04ea7b6d..c88e198d8 100644
--- a/debian/lenny/tdepim/debian/tdepim-tdeio-plugins-trinity.install
+++ b/debian/lenny/tdepim/debian/tdepim-tdeio-plugins-trinity.install
@@ -8,6 +8,10 @@
 /opt/trinity/lib/trinity/tdeio_scalix.so
 /opt/trinity/lib/trinity/tdeio_sieve.la
 /opt/trinity/lib/trinity/tdeio_sieve.so
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/groupwise
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/mbox
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/scalix
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/sieve
 /opt/trinity/share/services/groupwise.protocol
 /opt/trinity/share/services/groupwises.protocol
 /opt/trinity/share/services/imap4.protocol
diff --git a/debian/squeeze/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/squeeze/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 9a68eac1d..d31d2c6e9 100644
--- a/debian/squeeze/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/squeeze/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -1,6 +1,6 @@
 Not build using tar inside .orig, no DEB_KDE_CVS_MAKE := yes
 Don't build-dep on libgnokii-dev, not in main
-Install /usr/share/services/kontact/knode* in knode and add replaces
+Install /opt/trinity/share/services/kontact/knode* in knode and add replaces
 don't build-dep on gnokii or automake1.9
 make kontact depend on kmail, korganizer, kaddressbook
 Remove 16_kde_modulename.diff, module name isn't changed in Ubuntu
diff --git a/debian/squeeze/tdepim/debian/akregator-trinity.install b/debian/squeeze/tdepim/debian/akregator-trinity.install
index 74762a959..0110b9760 100644
--- a/debian/squeeze/tdepim/debian/akregator-trinity.install
+++ b/debian/squeeze/tdepim/debian/akregator-trinity.install
@@ -12,6 +12,7 @@
 /opt/trinity/share/config.kcfg/akregator.kcfg
 /opt/trinity/share/config.kcfg/mk4config.kcfg
 /opt/trinity/share/doc/tde/HTML/en/akregator
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/feed
 /opt/trinity/share/icons/hicolor/128x128/apps/akregator.png
 /opt/trinity/share/icons/crystalsvg/16x16/actions/rss_tag.png
 /opt/trinity/share/icons/crystalsvg/22x22/actions/rss_tag.png
diff --git a/debian/squeeze/tdepim/debian/korganizer-trinity.install b/debian/squeeze/tdepim/debian/korganizer-trinity.install
index 4444d98a5..bf83660e5 100644
--- a/debian/squeeze/tdepim/debian/korganizer-trinity.install
+++ b/debian/squeeze/tdepim/debian/korganizer-trinity.install
@@ -24,6 +24,7 @@
 /opt/trinity/share/autostart/korgac.desktop
 /opt/trinity/share/config.kcfg/korganizer.kcfg
 /opt/trinity/share/doc/tde/HTML/en/korganizer
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/webcal
 /opt/trinity/share/icons/hicolor/128x128/apps/korganizer.png
 /opt/trinity/share/icons/hicolor/16x16/apps/korganizer.png
 /opt/trinity/share/icons/hicolor/32x32/apps/korganizer.png
diff --git a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
index 9abd3d67b..a89f82f40 100644
--- a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
+++ b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
@@ -5,5 +5,5 @@ Abstract: KAddressBook is the KDE address book.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kaddressbook/index.html
-Files: /usr/share/doc/tde/HTML/en/kaddressbook/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kaddressbook/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kaddressbook/*.html
diff --git a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kalarm b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kalarm
index 5a547ebc8..12fc2dace 100644
--- a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kalarm
+++ b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kalarm
@@ -6,5 +6,5 @@ Abstract: KAlarm is a personal alarm message, command and email
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kalarm/index.html
-Files: /usr/share/doc/tde/HTML/en/kalarm/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kalarm/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kalarm/*.html
diff --git a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kandy b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kandy
index a947b70a0..6ca2dc33a 100644
--- a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kandy
+++ b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kandy
@@ -6,5 +6,5 @@ Abstract: Kandy is an application for synchronizing the data on a mobile
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kandy/index.html
-Files: /usr/share/doc/tde/HTML/en/kandy/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kandy/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kandy/*.html
diff --git a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.karm b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.karm
index 40811c94b..8ff0970d3 100644
--- a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.karm
+++ b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.karm
@@ -5,5 +5,5 @@ Abstract: KArm tracks time spent on various tasks.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/karm/index.html
-Files: /usr/share/doc/tde/HTML/en/karm/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/karm/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/karm/*.html
diff --git a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kleopatra b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
index 59f829e56..95da59a9b 100644
--- a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
+++ b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
@@ -5,5 +5,5 @@ Abstract: Kleopatra is a tool for managing X.509 certificates.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kleopatra/index.html
-Files: /usr/share/doc/tde/HTML/en/kleopatra/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kleopatra/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kleopatra/*.html
diff --git a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kmail b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kmail
index 2c4405d79..4de6e31a5 100644
--- a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kmail
+++ b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kmail
@@ -5,5 +5,5 @@ Abstract: KMail is KDE's powerful and user friendly email client.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kmail/index.html
-Files: /usr/share/doc/tde/HTML/en/kmail/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kmail/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kmail/*.html
diff --git a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.knode b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.knode
index 675dbdb2f..759307042 100644
--- a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.knode
+++ b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.knode
@@ -5,5 +5,5 @@ Abstract: KNode is an easy-to-use newsreader.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/knode/index.html
-Files: /usr/share/doc/tde/HTML/en/knode/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/knode/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/knode/*.html
diff --git a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.knotes b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.knotes
index 1292db38f..a305098af 100644
--- a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.knotes
+++ b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.knotes
@@ -5,5 +5,5 @@ Abstract: KNotes is a sticky notes application for the desktop.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/knotes/index.html
-Files: /usr/share/doc/tde/HTML/en/knotes/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/knotes/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/knotes/*.html
diff --git a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
index e9a0e6459..3ed0d42be 100644
--- a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
+++ b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
@@ -5,5 +5,5 @@ Abstract: KonsoleKalendar is a command line interface to KDE calendars.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/konsolekalendar/index.html
-Files: /usr/share/doc/tde/HTML/en/konsolekalendar/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/konsolekalendar/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/konsolekalendar/*.html
diff --git a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kontact b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kontact
index 52e2946ff..74af7cbd4 100644
--- a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kontact
+++ b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kontact
@@ -5,5 +5,5 @@ Abstract: Kontact is a command line interface to KDE calendars.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kontact/index.html
-Files: /usr/share/doc/tde/HTML/en/kontact/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kontact/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kontact/*.html
diff --git a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.korganizer b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.korganizer
index 96f8aae6a..858d1c9b5 100644
--- a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.korganizer
+++ b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.korganizer
@@ -5,5 +5,5 @@ Abstract: KOrganizer is an easy to use personal information manager.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/korganizer/index.html
-Files: /usr/share/doc/tde/HTML/en/korganizer/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/korganizer/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/korganizer/*.html
diff --git a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.korn b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.korn
index 5d731fded..1b7312787 100644
--- a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.korn
+++ b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.korn
@@ -5,5 +5,5 @@ Abstract: KOrn is a mail monitor.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/korn/index.html
-Files: /usr/share/doc/tde/HTML/en/korn/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/korn/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/korn/*.html
diff --git a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kpilot b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kpilot
index b724ef964..3256dc551 100644
--- a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kpilot
+++ b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kpilot
@@ -6,5 +6,5 @@ Abstract: KPilot is the KDE version of the Desktop HotSync software for
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpilot/index.html
-Files: /usr/share/doc/tde/HTML/en/kpilot/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpilot/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpilot/*.html
diff --git a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.ktnef b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.ktnef
index ad5a72fb6..6a144e01f 100644
--- a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.ktnef
+++ b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.ktnef
@@ -5,5 +5,5 @@ Abstract: The TNEF File Viewer is an application for TNEF mail attachments.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/ktnef/index.html
-Files: /usr/share/doc/tde/HTML/en/ktnef/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/ktnef/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/ktnef/*.html
diff --git a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
index 720eb2a89..fdf9ea7f6 100644
--- a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
+++ b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
@@ -5,5 +5,5 @@ Abstract: KWatchGnuPG is a simple GnuPG log viewer.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kwatchgnupg/index.html
-Files: /usr/share/doc/tde/HTML/en/kwatchgnupg/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kwatchgnupg/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kwatchgnupg/*.html
diff --git a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.multisynk b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.multisynk
index 41f0d96d0..830d874c1 100644
--- a/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.multisynk
+++ b/debian/squeeze/tdepim/debian/tdepim-doc-html.doc-base.multisynk
@@ -5,5 +5,5 @@ Abstract: KDE synchronization application.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/multisynk/index.html
-Files: /usr/share/doc/tde/HTML/en/multisynk/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/multisynk/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/multisynk/*.html
diff --git a/debian/squeeze/tdepim/debian/tdepim-tdeio-plugins-trinity.install b/debian/squeeze/tdepim/debian/tdepim-tdeio-plugins-trinity.install
index b04ea7b6d..c88e198d8 100644
--- a/debian/squeeze/tdepim/debian/tdepim-tdeio-plugins-trinity.install
+++ b/debian/squeeze/tdepim/debian/tdepim-tdeio-plugins-trinity.install
@@ -8,6 +8,10 @@
 /opt/trinity/lib/trinity/tdeio_scalix.so
 /opt/trinity/lib/trinity/tdeio_sieve.la
 /opt/trinity/lib/trinity/tdeio_sieve.so
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/groupwise
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/mbox
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/scalix
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/sieve
 /opt/trinity/share/services/groupwise.protocol
 /opt/trinity/share/services/groupwises.protocol
 /opt/trinity/share/services/imap4.protocol
diff --git a/debian/wheezy/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/wheezy/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 9a68eac1d..d31d2c6e9 100644
--- a/debian/wheezy/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/wheezy/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -1,6 +1,6 @@
 Not build using tar inside .orig, no DEB_KDE_CVS_MAKE := yes
 Don't build-dep on libgnokii-dev, not in main
-Install /usr/share/services/kontact/knode* in knode and add replaces
+Install /opt/trinity/share/services/kontact/knode* in knode and add replaces
 don't build-dep on gnokii or automake1.9
 make kontact depend on kmail, korganizer, kaddressbook
 Remove 16_kde_modulename.diff, module name isn't changed in Ubuntu
diff --git a/debian/wheezy/tdepim/debian/akregator-trinity.install b/debian/wheezy/tdepim/debian/akregator-trinity.install
index 74762a959..0110b9760 100644
--- a/debian/wheezy/tdepim/debian/akregator-trinity.install
+++ b/debian/wheezy/tdepim/debian/akregator-trinity.install
@@ -12,6 +12,7 @@
 /opt/trinity/share/config.kcfg/akregator.kcfg
 /opt/trinity/share/config.kcfg/mk4config.kcfg
 /opt/trinity/share/doc/tde/HTML/en/akregator
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/feed
 /opt/trinity/share/icons/hicolor/128x128/apps/akregator.png
 /opt/trinity/share/icons/crystalsvg/16x16/actions/rss_tag.png
 /opt/trinity/share/icons/crystalsvg/22x22/actions/rss_tag.png
diff --git a/debian/wheezy/tdepim/debian/korganizer-trinity.install b/debian/wheezy/tdepim/debian/korganizer-trinity.install
index 4444d98a5..bf83660e5 100644
--- a/debian/wheezy/tdepim/debian/korganizer-trinity.install
+++ b/debian/wheezy/tdepim/debian/korganizer-trinity.install
@@ -24,6 +24,7 @@
 /opt/trinity/share/autostart/korgac.desktop
 /opt/trinity/share/config.kcfg/korganizer.kcfg
 /opt/trinity/share/doc/tde/HTML/en/korganizer
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/webcal
 /opt/trinity/share/icons/hicolor/128x128/apps/korganizer.png
 /opt/trinity/share/icons/hicolor/16x16/apps/korganizer.png
 /opt/trinity/share/icons/hicolor/32x32/apps/korganizer.png
diff --git a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
index 9abd3d67b..a89f82f40 100644
--- a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
+++ b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
@@ -5,5 +5,5 @@ Abstract: KAddressBook is the KDE address book.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kaddressbook/index.html
-Files: /usr/share/doc/tde/HTML/en/kaddressbook/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kaddressbook/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kaddressbook/*.html
diff --git a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kalarm b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kalarm
index 5a547ebc8..12fc2dace 100644
--- a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kalarm
+++ b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kalarm
@@ -6,5 +6,5 @@ Abstract: KAlarm is a personal alarm message, command and email
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kalarm/index.html
-Files: /usr/share/doc/tde/HTML/en/kalarm/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kalarm/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kalarm/*.html
diff --git a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kandy b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kandy
index a947b70a0..6ca2dc33a 100644
--- a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kandy
+++ b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kandy
@@ -6,5 +6,5 @@ Abstract: Kandy is an application for synchronizing the data on a mobile
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kandy/index.html
-Files: /usr/share/doc/tde/HTML/en/kandy/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kandy/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kandy/*.html
diff --git a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.karm b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.karm
index 40811c94b..8ff0970d3 100644
--- a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.karm
+++ b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.karm
@@ -5,5 +5,5 @@ Abstract: KArm tracks time spent on various tasks.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/karm/index.html
-Files: /usr/share/doc/tde/HTML/en/karm/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/karm/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/karm/*.html
diff --git a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kleopatra b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
index 59f829e56..95da59a9b 100644
--- a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
+++ b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
@@ -5,5 +5,5 @@ Abstract: Kleopatra is a tool for managing X.509 certificates.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kleopatra/index.html
-Files: /usr/share/doc/tde/HTML/en/kleopatra/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kleopatra/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kleopatra/*.html
diff --git a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kmail b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kmail
index 2c4405d79..4de6e31a5 100644
--- a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kmail
+++ b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kmail
@@ -5,5 +5,5 @@ Abstract: KMail is KDE's powerful and user friendly email client.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kmail/index.html
-Files: /usr/share/doc/tde/HTML/en/kmail/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kmail/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kmail/*.html
diff --git a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.knode b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.knode
index 675dbdb2f..759307042 100644
--- a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.knode
+++ b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.knode
@@ -5,5 +5,5 @@ Abstract: KNode is an easy-to-use newsreader.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/knode/index.html
-Files: /usr/share/doc/tde/HTML/en/knode/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/knode/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/knode/*.html
diff --git a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.knotes b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.knotes
index 1292db38f..a305098af 100644
--- a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.knotes
+++ b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.knotes
@@ -5,5 +5,5 @@ Abstract: KNotes is a sticky notes application for the desktop.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/knotes/index.html
-Files: /usr/share/doc/tde/HTML/en/knotes/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/knotes/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/knotes/*.html
diff --git a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
index e9a0e6459..3ed0d42be 100644
--- a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
+++ b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
@@ -5,5 +5,5 @@ Abstract: KonsoleKalendar is a command line interface to KDE calendars.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/konsolekalendar/index.html
-Files: /usr/share/doc/tde/HTML/en/konsolekalendar/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/konsolekalendar/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/konsolekalendar/*.html
diff --git a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kontact b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kontact
index 52e2946ff..74af7cbd4 100644
--- a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kontact
+++ b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kontact
@@ -5,5 +5,5 @@ Abstract: Kontact is a command line interface to KDE calendars.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kontact/index.html
-Files: /usr/share/doc/tde/HTML/en/kontact/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kontact/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kontact/*.html
diff --git a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.korganizer b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.korganizer
index 96f8aae6a..858d1c9b5 100644
--- a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.korganizer
+++ b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.korganizer
@@ -5,5 +5,5 @@ Abstract: KOrganizer is an easy to use personal information manager.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/korganizer/index.html
-Files: /usr/share/doc/tde/HTML/en/korganizer/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/korganizer/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/korganizer/*.html
diff --git a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.korn b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.korn
index 5d731fded..1b7312787 100644
--- a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.korn
+++ b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.korn
@@ -5,5 +5,5 @@ Abstract: KOrn is a mail monitor.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/korn/index.html
-Files: /usr/share/doc/tde/HTML/en/korn/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/korn/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/korn/*.html
diff --git a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kpilot b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kpilot
index b724ef964..3256dc551 100644
--- a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kpilot
+++ b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kpilot
@@ -6,5 +6,5 @@ Abstract: KPilot is the KDE version of the Desktop HotSync software for
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpilot/index.html
-Files: /usr/share/doc/tde/HTML/en/kpilot/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpilot/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpilot/*.html
diff --git a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.ktnef b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.ktnef
index ad5a72fb6..6a144e01f 100644
--- a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.ktnef
+++ b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.ktnef
@@ -5,5 +5,5 @@ Abstract: The TNEF File Viewer is an application for TNEF mail attachments.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/ktnef/index.html
-Files: /usr/share/doc/tde/HTML/en/ktnef/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/ktnef/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/ktnef/*.html
diff --git a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
index 720eb2a89..fdf9ea7f6 100644
--- a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
+++ b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
@@ -5,5 +5,5 @@ Abstract: KWatchGnuPG is a simple GnuPG log viewer.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kwatchgnupg/index.html
-Files: /usr/share/doc/tde/HTML/en/kwatchgnupg/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kwatchgnupg/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kwatchgnupg/*.html
diff --git a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.multisynk b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.multisynk
index 41f0d96d0..830d874c1 100644
--- a/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.multisynk
+++ b/debian/wheezy/tdepim/debian/tdepim-doc-html.doc-base.multisynk
@@ -5,5 +5,5 @@ Abstract: KDE synchronization application.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/multisynk/index.html
-Files: /usr/share/doc/tde/HTML/en/multisynk/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/multisynk/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/multisynk/*.html
diff --git a/debian/wheezy/tdepim/debian/tdepim-tdeio-plugins-trinity.install b/debian/wheezy/tdepim/debian/tdepim-tdeio-plugins-trinity.install
index b04ea7b6d..c88e198d8 100644
--- a/debian/wheezy/tdepim/debian/tdepim-tdeio-plugins-trinity.install
+++ b/debian/wheezy/tdepim/debian/tdepim-tdeio-plugins-trinity.install
@@ -8,6 +8,10 @@
 /opt/trinity/lib/trinity/tdeio_scalix.so
 /opt/trinity/lib/trinity/tdeio_sieve.la
 /opt/trinity/lib/trinity/tdeio_sieve.so
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/groupwise
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/mbox
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/scalix
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/sieve
 /opt/trinity/share/services/groupwise.protocol
 /opt/trinity/share/services/groupwises.protocol
 /opt/trinity/share/services/imap4.protocol
diff --git a/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 9a68eac1d..d31d2c6e9 100644
--- a/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -1,6 +1,6 @@
 Not build using tar inside .orig, no DEB_KDE_CVS_MAKE := yes
 Don't build-dep on libgnokii-dev, not in main
-Install /usr/share/services/kontact/knode* in knode and add replaces
+Install /opt/trinity/share/services/kontact/knode* in knode and add replaces
 don't build-dep on gnokii or automake1.9
 make kontact depend on kmail, korganizer, kaddressbook
 Remove 16_kde_modulename.diff, module name isn't changed in Ubuntu
diff --git a/ubuntu/maverick/tdepim/debian/akregator-trinity.install b/ubuntu/maverick/tdepim/debian/akregator-trinity.install
index 74762a959..0110b9760 100644
--- a/ubuntu/maverick/tdepim/debian/akregator-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/akregator-trinity.install
@@ -12,6 +12,7 @@
 /opt/trinity/share/config.kcfg/akregator.kcfg
 /opt/trinity/share/config.kcfg/mk4config.kcfg
 /opt/trinity/share/doc/tde/HTML/en/akregator
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/feed
 /opt/trinity/share/icons/hicolor/128x128/apps/akregator.png
 /opt/trinity/share/icons/crystalsvg/16x16/actions/rss_tag.png
 /opt/trinity/share/icons/crystalsvg/22x22/actions/rss_tag.png
diff --git a/ubuntu/maverick/tdepim/debian/korganizer-trinity.install b/ubuntu/maverick/tdepim/debian/korganizer-trinity.install
index 4444d98a5..bf83660e5 100644
--- a/ubuntu/maverick/tdepim/debian/korganizer-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/korganizer-trinity.install
@@ -24,6 +24,7 @@
 /opt/trinity/share/autostart/korgac.desktop
 /opt/trinity/share/config.kcfg/korganizer.kcfg
 /opt/trinity/share/doc/tde/HTML/en/korganizer
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/webcal
 /opt/trinity/share/icons/hicolor/128x128/apps/korganizer.png
 /opt/trinity/share/icons/hicolor/16x16/apps/korganizer.png
 /opt/trinity/share/icons/hicolor/32x32/apps/korganizer.png
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
index 9abd3d67b..a89f82f40 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
@@ -5,5 +5,5 @@ Abstract: KAddressBook is the KDE address book.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kaddressbook/index.html
-Files: /usr/share/doc/tde/HTML/en/kaddressbook/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kaddressbook/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kaddressbook/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kalarm b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kalarm
index 5a547ebc8..12fc2dace 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kalarm
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kalarm
@@ -6,5 +6,5 @@ Abstract: KAlarm is a personal alarm message, command and email
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kalarm/index.html
-Files: /usr/share/doc/tde/HTML/en/kalarm/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kalarm/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kalarm/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kandy b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kandy
index a947b70a0..6ca2dc33a 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kandy
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kandy
@@ -6,5 +6,5 @@ Abstract: Kandy is an application for synchronizing the data on a mobile
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kandy/index.html
-Files: /usr/share/doc/tde/HTML/en/kandy/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kandy/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kandy/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.karm b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.karm
index 40811c94b..8ff0970d3 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.karm
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.karm
@@ -5,5 +5,5 @@ Abstract: KArm tracks time spent on various tasks.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/karm/index.html
-Files: /usr/share/doc/tde/HTML/en/karm/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/karm/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/karm/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kleopatra b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
index 59f829e56..95da59a9b 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
@@ -5,5 +5,5 @@ Abstract: Kleopatra is a tool for managing X.509 certificates.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kleopatra/index.html
-Files: /usr/share/doc/tde/HTML/en/kleopatra/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kleopatra/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kleopatra/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kmail b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kmail
index 2c4405d79..4de6e31a5 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kmail
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kmail
@@ -5,5 +5,5 @@ Abstract: KMail is KDE's powerful and user friendly email client.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kmail/index.html
-Files: /usr/share/doc/tde/HTML/en/kmail/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kmail/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kmail/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knode b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knode
index 675dbdb2f..759307042 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knode
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knode
@@ -5,5 +5,5 @@ Abstract: KNode is an easy-to-use newsreader.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/knode/index.html
-Files: /usr/share/doc/tde/HTML/en/knode/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/knode/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/knode/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knotes b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knotes
index 1292db38f..a305098af 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knotes
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knotes
@@ -5,5 +5,5 @@ Abstract: KNotes is a sticky notes application for the desktop.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/knotes/index.html
-Files: /usr/share/doc/tde/HTML/en/knotes/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/knotes/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/knotes/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
index e9a0e6459..3ed0d42be 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
@@ -5,5 +5,5 @@ Abstract: KonsoleKalendar is a command line interface to KDE calendars.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/konsolekalendar/index.html
-Files: /usr/share/doc/tde/HTML/en/konsolekalendar/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/konsolekalendar/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/konsolekalendar/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kontact b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kontact
index 52e2946ff..74af7cbd4 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kontact
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kontact
@@ -5,5 +5,5 @@ Abstract: Kontact is a command line interface to KDE calendars.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kontact/index.html
-Files: /usr/share/doc/tde/HTML/en/kontact/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kontact/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kontact/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korganizer b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korganizer
index 96f8aae6a..858d1c9b5 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korganizer
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korganizer
@@ -5,5 +5,5 @@ Abstract: KOrganizer is an easy to use personal information manager.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/korganizer/index.html
-Files: /usr/share/doc/tde/HTML/en/korganizer/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/korganizer/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/korganizer/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korn b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korn
index 5d731fded..1b7312787 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korn
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korn
@@ -5,5 +5,5 @@ Abstract: KOrn is a mail monitor.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/korn/index.html
-Files: /usr/share/doc/tde/HTML/en/korn/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/korn/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/korn/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kpilot b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kpilot
index b724ef964..3256dc551 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kpilot
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kpilot
@@ -6,5 +6,5 @@ Abstract: KPilot is the KDE version of the Desktop HotSync software for
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpilot/index.html
-Files: /usr/share/doc/tde/HTML/en/kpilot/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpilot/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpilot/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.ktnef b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.ktnef
index ad5a72fb6..6a144e01f 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.ktnef
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.ktnef
@@ -5,5 +5,5 @@ Abstract: The TNEF File Viewer is an application for TNEF mail attachments.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/ktnef/index.html
-Files: /usr/share/doc/tde/HTML/en/ktnef/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/ktnef/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/ktnef/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
index 720eb2a89..fdf9ea7f6 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
@@ -5,5 +5,5 @@ Abstract: KWatchGnuPG is a simple GnuPG log viewer.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kwatchgnupg/index.html
-Files: /usr/share/doc/tde/HTML/en/kwatchgnupg/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kwatchgnupg/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kwatchgnupg/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.multisynk b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.multisynk
index 41f0d96d0..830d874c1 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.multisynk
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.multisynk
@@ -5,5 +5,5 @@ Abstract: KDE synchronization application.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/multisynk/index.html
-Files: /usr/share/doc/tde/HTML/en/multisynk/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/multisynk/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/multisynk/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-tdeio-plugins-trinity.install b/ubuntu/maverick/tdepim/debian/tdepim-tdeio-plugins-trinity.install
index b04ea7b6d..c88e198d8 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-tdeio-plugins-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/tdepim-tdeio-plugins-trinity.install
@@ -8,6 +8,10 @@
 /opt/trinity/lib/trinity/tdeio_scalix.so
 /opt/trinity/lib/trinity/tdeio_sieve.la
 /opt/trinity/lib/trinity/tdeio_sieve.so
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/groupwise
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/mbox
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/scalix
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/sieve
 /opt/trinity/share/services/groupwise.protocol
 /opt/trinity/share/services/groupwises.protocol
 /opt/trinity/share/services/imap4.protocol
diff --git a/ubuntu/precise/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/precise/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 9a68eac1d..d31d2c6e9 100644
--- a/ubuntu/precise/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/precise/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -1,6 +1,6 @@
 Not build using tar inside .orig, no DEB_KDE_CVS_MAKE := yes
 Don't build-dep on libgnokii-dev, not in main
-Install /usr/share/services/kontact/knode* in knode and add replaces
+Install /opt/trinity/share/services/kontact/knode* in knode and add replaces
 don't build-dep on gnokii or automake1.9
 make kontact depend on kmail, korganizer, kaddressbook
 Remove 16_kde_modulename.diff, module name isn't changed in Ubuntu
diff --git a/ubuntu/precise/tdepim/debian/akregator-trinity.install b/ubuntu/precise/tdepim/debian/akregator-trinity.install
index 74762a959..0110b9760 100644
--- a/ubuntu/precise/tdepim/debian/akregator-trinity.install
+++ b/ubuntu/precise/tdepim/debian/akregator-trinity.install
@@ -12,6 +12,7 @@
 /opt/trinity/share/config.kcfg/akregator.kcfg
 /opt/trinity/share/config.kcfg/mk4config.kcfg
 /opt/trinity/share/doc/tde/HTML/en/akregator
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/feed
 /opt/trinity/share/icons/hicolor/128x128/apps/akregator.png
 /opt/trinity/share/icons/crystalsvg/16x16/actions/rss_tag.png
 /opt/trinity/share/icons/crystalsvg/22x22/actions/rss_tag.png
diff --git a/ubuntu/precise/tdepim/debian/korganizer-trinity.install b/ubuntu/precise/tdepim/debian/korganizer-trinity.install
index 4444d98a5..bf83660e5 100644
--- a/ubuntu/precise/tdepim/debian/korganizer-trinity.install
+++ b/ubuntu/precise/tdepim/debian/korganizer-trinity.install
@@ -24,6 +24,7 @@
 /opt/trinity/share/autostart/korgac.desktop
 /opt/trinity/share/config.kcfg/korganizer.kcfg
 /opt/trinity/share/doc/tde/HTML/en/korganizer
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/webcal
 /opt/trinity/share/icons/hicolor/128x128/apps/korganizer.png
 /opt/trinity/share/icons/hicolor/16x16/apps/korganizer.png
 /opt/trinity/share/icons/hicolor/32x32/apps/korganizer.png
diff --git a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
index 9abd3d67b..a89f82f40 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
+++ b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
@@ -5,5 +5,5 @@ Abstract: KAddressBook is the KDE address book.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kaddressbook/index.html
-Files: /usr/share/doc/tde/HTML/en/kaddressbook/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kaddressbook/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kaddressbook/*.html
diff --git a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kalarm b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kalarm
index 5a547ebc8..12fc2dace 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kalarm
+++ b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kalarm
@@ -6,5 +6,5 @@ Abstract: KAlarm is a personal alarm message, command and email
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kalarm/index.html
-Files: /usr/share/doc/tde/HTML/en/kalarm/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kalarm/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kalarm/*.html
diff --git a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kandy b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kandy
index a947b70a0..6ca2dc33a 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kandy
+++ b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kandy
@@ -6,5 +6,5 @@ Abstract: Kandy is an application for synchronizing the data on a mobile
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kandy/index.html
-Files: /usr/share/doc/tde/HTML/en/kandy/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kandy/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kandy/*.html
diff --git a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.karm b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.karm
index 40811c94b..8ff0970d3 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.karm
+++ b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.karm
@@ -5,5 +5,5 @@ Abstract: KArm tracks time spent on various tasks.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/karm/index.html
-Files: /usr/share/doc/tde/HTML/en/karm/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/karm/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/karm/*.html
diff --git a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kleopatra b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
index 59f829e56..95da59a9b 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
+++ b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
@@ -5,5 +5,5 @@ Abstract: Kleopatra is a tool for managing X.509 certificates.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kleopatra/index.html
-Files: /usr/share/doc/tde/HTML/en/kleopatra/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kleopatra/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kleopatra/*.html
diff --git a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kmail b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kmail
index 2c4405d79..4de6e31a5 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kmail
+++ b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kmail
@@ -5,5 +5,5 @@ Abstract: KMail is KDE's powerful and user friendly email client.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kmail/index.html
-Files: /usr/share/doc/tde/HTML/en/kmail/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kmail/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kmail/*.html
diff --git a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.knode b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.knode
index 675dbdb2f..759307042 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.knode
+++ b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.knode
@@ -5,5 +5,5 @@ Abstract: KNode is an easy-to-use newsreader.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/knode/index.html
-Files: /usr/share/doc/tde/HTML/en/knode/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/knode/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/knode/*.html
diff --git a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.knotes b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.knotes
index 1292db38f..a305098af 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.knotes
+++ b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.knotes
@@ -5,5 +5,5 @@ Abstract: KNotes is a sticky notes application for the desktop.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/knotes/index.html
-Files: /usr/share/doc/tde/HTML/en/knotes/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/knotes/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/knotes/*.html
diff --git a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
index e9a0e6459..3ed0d42be 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
+++ b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
@@ -5,5 +5,5 @@ Abstract: KonsoleKalendar is a command line interface to KDE calendars.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/konsolekalendar/index.html
-Files: /usr/share/doc/tde/HTML/en/konsolekalendar/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/konsolekalendar/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/konsolekalendar/*.html
diff --git a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kontact b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kontact
index 52e2946ff..74af7cbd4 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kontact
+++ b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kontact
@@ -5,5 +5,5 @@ Abstract: Kontact is a command line interface to KDE calendars.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kontact/index.html
-Files: /usr/share/doc/tde/HTML/en/kontact/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kontact/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kontact/*.html
diff --git a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.korganizer b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.korganizer
index 96f8aae6a..858d1c9b5 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.korganizer
+++ b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.korganizer
@@ -5,5 +5,5 @@ Abstract: KOrganizer is an easy to use personal information manager.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/korganizer/index.html
-Files: /usr/share/doc/tde/HTML/en/korganizer/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/korganizer/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/korganizer/*.html
diff --git a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.korn b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.korn
index 5d731fded..1b7312787 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.korn
+++ b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.korn
@@ -5,5 +5,5 @@ Abstract: KOrn is a mail monitor.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/korn/index.html
-Files: /usr/share/doc/tde/HTML/en/korn/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/korn/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/korn/*.html
diff --git a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kpilot b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kpilot
index b724ef964..3256dc551 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kpilot
+++ b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kpilot
@@ -6,5 +6,5 @@ Abstract: KPilot is the KDE version of the Desktop HotSync software for
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpilot/index.html
-Files: /usr/share/doc/tde/HTML/en/kpilot/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpilot/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpilot/*.html
diff --git a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.ktnef b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.ktnef
index ad5a72fb6..6a144e01f 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.ktnef
+++ b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.ktnef
@@ -5,5 +5,5 @@ Abstract: The TNEF File Viewer is an application for TNEF mail attachments.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/ktnef/index.html
-Files: /usr/share/doc/tde/HTML/en/ktnef/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/ktnef/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/ktnef/*.html
diff --git a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
index 720eb2a89..fdf9ea7f6 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
+++ b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
@@ -5,5 +5,5 @@ Abstract: KWatchGnuPG is a simple GnuPG log viewer.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kwatchgnupg/index.html
-Files: /usr/share/doc/tde/HTML/en/kwatchgnupg/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kwatchgnupg/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kwatchgnupg/*.html
diff --git a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.multisynk b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.multisynk
index 41f0d96d0..830d874c1 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.multisynk
+++ b/ubuntu/precise/tdepim/debian/tdepim-doc-html.doc-base.multisynk
@@ -5,5 +5,5 @@ Abstract: KDE synchronization application.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/multisynk/index.html
-Files: /usr/share/doc/tde/HTML/en/multisynk/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/multisynk/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/multisynk/*.html
diff --git a/ubuntu/precise/tdepim/debian/tdepim-tdeio-plugins-trinity.install b/ubuntu/precise/tdepim/debian/tdepim-tdeio-plugins-trinity.install
index b04ea7b6d..c88e198d8 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-tdeio-plugins-trinity.install
+++ b/ubuntu/precise/tdepim/debian/tdepim-tdeio-plugins-trinity.install
@@ -8,6 +8,10 @@
 /opt/trinity/lib/trinity/tdeio_scalix.so
 /opt/trinity/lib/trinity/tdeio_sieve.la
 /opt/trinity/lib/trinity/tdeio_sieve.so
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/groupwise
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/mbox
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/scalix
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/sieve
 /opt/trinity/share/services/groupwise.protocol
 /opt/trinity/share/services/groupwises.protocol
 /opt/trinity/share/services/imap4.protocol
diff --git a/ubuntu/raring/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/raring/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 9a68eac1d..d31d2c6e9 100644
--- a/ubuntu/raring/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/raring/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -1,6 +1,6 @@
 Not build using tar inside .orig, no DEB_KDE_CVS_MAKE := yes
 Don't build-dep on libgnokii-dev, not in main
-Install /usr/share/services/kontact/knode* in knode and add replaces
+Install /opt/trinity/share/services/kontact/knode* in knode and add replaces
 don't build-dep on gnokii or automake1.9
 make kontact depend on kmail, korganizer, kaddressbook
 Remove 16_kde_modulename.diff, module name isn't changed in Ubuntu
diff --git a/ubuntu/raring/tdepim/debian/akregator-trinity.install b/ubuntu/raring/tdepim/debian/akregator-trinity.install
index 74762a959..0110b9760 100644
--- a/ubuntu/raring/tdepim/debian/akregator-trinity.install
+++ b/ubuntu/raring/tdepim/debian/akregator-trinity.install
@@ -12,6 +12,7 @@
 /opt/trinity/share/config.kcfg/akregator.kcfg
 /opt/trinity/share/config.kcfg/mk4config.kcfg
 /opt/trinity/share/doc/tde/HTML/en/akregator
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/feed
 /opt/trinity/share/icons/hicolor/128x128/apps/akregator.png
 /opt/trinity/share/icons/crystalsvg/16x16/actions/rss_tag.png
 /opt/trinity/share/icons/crystalsvg/22x22/actions/rss_tag.png
diff --git a/ubuntu/raring/tdepim/debian/korganizer-trinity.install b/ubuntu/raring/tdepim/debian/korganizer-trinity.install
index 4444d98a5..bf83660e5 100644
--- a/ubuntu/raring/tdepim/debian/korganizer-trinity.install
+++ b/ubuntu/raring/tdepim/debian/korganizer-trinity.install
@@ -24,6 +24,7 @@
 /opt/trinity/share/autostart/korgac.desktop
 /opt/trinity/share/config.kcfg/korganizer.kcfg
 /opt/trinity/share/doc/tde/HTML/en/korganizer
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/webcal
 /opt/trinity/share/icons/hicolor/128x128/apps/korganizer.png
 /opt/trinity/share/icons/hicolor/16x16/apps/korganizer.png
 /opt/trinity/share/icons/hicolor/32x32/apps/korganizer.png
diff --git a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
index 9abd3d67b..a89f82f40 100644
--- a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
+++ b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
@@ -5,5 +5,5 @@ Abstract: KAddressBook is the KDE address book.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kaddressbook/index.html
-Files: /usr/share/doc/tde/HTML/en/kaddressbook/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kaddressbook/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kaddressbook/*.html
diff --git a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kalarm b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kalarm
index 5a547ebc8..12fc2dace 100644
--- a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kalarm
+++ b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kalarm
@@ -6,5 +6,5 @@ Abstract: KAlarm is a personal alarm message, command and email
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kalarm/index.html
-Files: /usr/share/doc/tde/HTML/en/kalarm/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kalarm/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kalarm/*.html
diff --git a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kandy b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kandy
index a947b70a0..6ca2dc33a 100644
--- a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kandy
+++ b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kandy
@@ -6,5 +6,5 @@ Abstract: Kandy is an application for synchronizing the data on a mobile
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kandy/index.html
-Files: /usr/share/doc/tde/HTML/en/kandy/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kandy/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kandy/*.html
diff --git a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.karm b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.karm
index 40811c94b..8ff0970d3 100644
--- a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.karm
+++ b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.karm
@@ -5,5 +5,5 @@ Abstract: KArm tracks time spent on various tasks.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/karm/index.html
-Files: /usr/share/doc/tde/HTML/en/karm/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/karm/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/karm/*.html
diff --git a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kleopatra b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
index 59f829e56..95da59a9b 100644
--- a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
+++ b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
@@ -5,5 +5,5 @@ Abstract: Kleopatra is a tool for managing X.509 certificates.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kleopatra/index.html
-Files: /usr/share/doc/tde/HTML/en/kleopatra/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kleopatra/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kleopatra/*.html
diff --git a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kmail b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kmail
index 2c4405d79..4de6e31a5 100644
--- a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kmail
+++ b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kmail
@@ -5,5 +5,5 @@ Abstract: KMail is KDE's powerful and user friendly email client.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kmail/index.html
-Files: /usr/share/doc/tde/HTML/en/kmail/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kmail/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kmail/*.html
diff --git a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.knode b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.knode
index 675dbdb2f..759307042 100644
--- a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.knode
+++ b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.knode
@@ -5,5 +5,5 @@ Abstract: KNode is an easy-to-use newsreader.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/knode/index.html
-Files: /usr/share/doc/tde/HTML/en/knode/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/knode/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/knode/*.html
diff --git a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.knotes b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.knotes
index 1292db38f..a305098af 100644
--- a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.knotes
+++ b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.knotes
@@ -5,5 +5,5 @@ Abstract: KNotes is a sticky notes application for the desktop.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/knotes/index.html
-Files: /usr/share/doc/tde/HTML/en/knotes/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/knotes/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/knotes/*.html
diff --git a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
index e9a0e6459..3ed0d42be 100644
--- a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
+++ b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
@@ -5,5 +5,5 @@ Abstract: KonsoleKalendar is a command line interface to KDE calendars.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/konsolekalendar/index.html
-Files: /usr/share/doc/tde/HTML/en/konsolekalendar/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/konsolekalendar/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/konsolekalendar/*.html
diff --git a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kontact b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kontact
index 52e2946ff..74af7cbd4 100644
--- a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kontact
+++ b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kontact
@@ -5,5 +5,5 @@ Abstract: Kontact is a command line interface to KDE calendars.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kontact/index.html
-Files: /usr/share/doc/tde/HTML/en/kontact/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kontact/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kontact/*.html
diff --git a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.korganizer b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.korganizer
index 96f8aae6a..858d1c9b5 100644
--- a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.korganizer
+++ b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.korganizer
@@ -5,5 +5,5 @@ Abstract: KOrganizer is an easy to use personal information manager.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/korganizer/index.html
-Files: /usr/share/doc/tde/HTML/en/korganizer/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/korganizer/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/korganizer/*.html
diff --git a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.korn b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.korn
index 5d731fded..1b7312787 100644
--- a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.korn
+++ b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.korn
@@ -5,5 +5,5 @@ Abstract: KOrn is a mail monitor.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/korn/index.html
-Files: /usr/share/doc/tde/HTML/en/korn/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/korn/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/korn/*.html
diff --git a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kpilot b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kpilot
index b724ef964..3256dc551 100644
--- a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kpilot
+++ b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kpilot
@@ -6,5 +6,5 @@ Abstract: KPilot is the KDE version of the Desktop HotSync software for
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpilot/index.html
-Files: /usr/share/doc/tde/HTML/en/kpilot/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpilot/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpilot/*.html
diff --git a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.ktnef b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.ktnef
index ad5a72fb6..6a144e01f 100644
--- a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.ktnef
+++ b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.ktnef
@@ -5,5 +5,5 @@ Abstract: The TNEF File Viewer is an application for TNEF mail attachments.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/ktnef/index.html
-Files: /usr/share/doc/tde/HTML/en/ktnef/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/ktnef/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/ktnef/*.html
diff --git a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
index 720eb2a89..fdf9ea7f6 100644
--- a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
+++ b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
@@ -5,5 +5,5 @@ Abstract: KWatchGnuPG is a simple GnuPG log viewer.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kwatchgnupg/index.html
-Files: /usr/share/doc/tde/HTML/en/kwatchgnupg/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kwatchgnupg/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kwatchgnupg/*.html
diff --git a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.multisynk b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.multisynk
index 41f0d96d0..830d874c1 100644
--- a/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.multisynk
+++ b/ubuntu/raring/tdepim/debian/tdepim-doc-html.doc-base.multisynk
@@ -5,5 +5,5 @@ Abstract: KDE synchronization application.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/multisynk/index.html
-Files: /usr/share/doc/tde/HTML/en/multisynk/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/multisynk/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/multisynk/*.html
diff --git a/ubuntu/raring/tdepim/debian/tdepim-tdeio-plugins-trinity.install b/ubuntu/raring/tdepim/debian/tdepim-tdeio-plugins-trinity.install
index b04ea7b6d..c88e198d8 100644
--- a/ubuntu/raring/tdepim/debian/tdepim-tdeio-plugins-trinity.install
+++ b/ubuntu/raring/tdepim/debian/tdepim-tdeio-plugins-trinity.install
@@ -8,6 +8,10 @@
 /opt/trinity/lib/trinity/tdeio_scalix.so
 /opt/trinity/lib/trinity/tdeio_sieve.la
 /opt/trinity/lib/trinity/tdeio_sieve.so
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/groupwise
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/mbox
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/scalix
+/opt/trinity/share/doc/tde/HTML/en/tdeioslave/sieve
 /opt/trinity/share/services/groupwise.protocol
 /opt/trinity/share/services/groupwises.protocol
 /opt/trinity/share/services/imap4.protocol