Update tdebase on Debian and Ubuntu due to remove KControl Protols module

3 files changed, 15 insertions, 6 deletions

diff --git a/debian/wheezy/tdebase/debian/kcontrol-trinity.install b/debian/wheezy/tdebase/debian/kcontrol-trinity.install
index 5698b6ff9..ea2012d48 100644
--- a/debian/wheezy/tdebase/debian/kcontrol-trinity.install
+++ b/debian/wheezy/tdebase/debian/kcontrol-trinity.install
@@ -49,8 +49,6 @@ debian/tmp/opt/trinity/lib/trinity/kcm_info.la
 debian/tmp/opt/trinity/lib/trinity/kcm_info.so
 debian/tmp/opt/trinity/lib/trinity/kcm_input.la
 debian/tmp/opt/trinity/lib/trinity/kcm_input.so
-debian/tmp/opt/trinity/lib/trinity/kcm_ioslaveinfo.la
-debian/tmp/opt/trinity/lib/trinity/kcm_ioslaveinfo.so
 debian/tmp/opt/trinity/lib/trinity/kcm_joystick.la
 debian/tmp/opt/trinity/lib/trinity/kcm_joystick.so
 debian/tmp/opt/trinity/lib/trinity/kcm_kded.la
@@ -155,7 +153,6 @@ debian/tmp/opt/trinity/share/applications/tde/icons.desktop
 debian/tmp/opt/trinity/share/applications/tde/installktheme.desktop
 debian/tmp/opt/trinity/share/applications/tde/interrupts.desktop
 debian/tmp/opt/trinity/share/applications/tde/ioports.desktop
-debian/tmp/opt/trinity/share/applications/tde/ioslaveinfo.desktop
 debian/tmp/opt/trinity/share/applications/tde/joystick.desktop
 debian/tmp/opt/trinity/share/applications/tde/kcm_tdednssd.desktop
 debian/tmp/opt/trinity/share/applications/tde/kcmaccess.desktop
diff --git a/debian/wheezy/tdebase/debian/tdebase-data-trinity.install b/debian/wheezy/tdebase/debian/tdebase-data-trinity.install
index cda482406..7dbe02895 100644
--- a/debian/wheezy/tdebase/debian/tdebase-data-trinity.install
+++ b/debian/wheezy/tdebase/debian/tdebase-data-trinity.install
@@ -315,9 +315,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/privacy/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.docbook
diff --git a/debian/wheezy/tdebase/debian/tdebase-tdeio-plugins-trinity.install b/debian/wheezy/tdebase/debian/tdebase-tdeio-plugins-trinity.install
index cfdcf238c..db5f283d7 100644
--- a/debian/wheezy/tdebase/debian/tdebase-tdeio-plugins-trinity.install
+++ b/debian/wheezy/tdebase/debian/tdebase-tdeio-plugins-trinity.install
@@ -96,6 +96,9 @@ debian/tmp/opt/trinity/share/apps/systemview/media.desktop
 debian/tmp/opt/trinity/share/apps/systemview/remote.desktop
 debian/tmp/opt/trinity/share/apps/systemview/users.desktop
 debian/tmp/opt/trinity/share/config.kcfg/mediamanagersettings.kcfg
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/about
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/applications
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/ar
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/bzip
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/bzip2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/cgi
@@ -104,33 +107,45 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/file
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/finger
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/fish
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/floppy
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/fonts
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/ftp
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/ghelp
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/gopher
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/gzip
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/help
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/http
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/imap
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/info
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/iso
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/lan
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/ldap
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/mac
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/mailto
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/man
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/metainfo
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/mms
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/mrml
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/news
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/nfs
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/nntp
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/pnm
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/pop3
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/print
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/printdb
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/programs
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/rlogin
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/rtsp
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/settings
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/sftp
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/smb
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/smtp
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/ssh
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/tar
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/telnet
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/thumbnail
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/webdav
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/xz
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/zip
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/compact_flash_mount_decrypt.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/compact_flash_unmount_decrypt.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/compact_flash_unmount_encrypt.png