8 files changed, 14 insertions, 14 deletions
diff --git a/ubuntu/precise/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/precise/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
index 042ffdb21..f5a54d259 100644
--- a/ubuntu/precise/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/ubuntu/precise/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
@@ -36,7 +36,7 @@ in konsole.README.Debian s/fontconfig/fontconfig-config
 
 in tdm.postinst install at s/99/13/
 
-from tdebase-kio-plugins.install remove debian/tmp/usr/share/services/tdefile_trash.desktop (that's to remove the trash from the "system applet")
+from tdebase-tdeio-plugins.install remove debian/tmp/usr/share/services/tdefile_trash.desktop (that's to remove the trash from the "system applet")
 
 add debian/ubuntu.xmodmap  debian/80ubuntu-xmodmap and add install rules to binary-install/tdebase-bin::
 
diff --git a/ubuntu/precise/tdebase/debian/control b/ubuntu/precise/tdebase/debian/control
index a1b152959..8bbd21468 100644
--- a/ubuntu/precise/tdebase/debian/control
+++ b/ubuntu/precise/tdebase/debian/control
@@ -14,7 +14,7 @@ Section: tde
 Architecture: all
 Replaces: kdebase-trinity (<< 4:14.0.0)
 Breaks: kdebase-trinity (<< 4:14.0.0)
-Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
+Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-tdeio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
 Recommends: tdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
 Suggests: tdebase-trinity-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -180,13 +180,13 @@ Description: KDE base documentation in HTML format
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: tdebase-kio-plugins-trinity
+Package: tdebase-tdeio-plugins-trinity
 Section: tde
 Architecture: any
 Replaces: kdebase-kio-plugins-trinity (<< 4:14.0.0)
 Breaks: kdebase-kio-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, kdesktop-trinity, libsasl2-modules, psmisc, cryptsetup, man-db (>= 2.5.1-1)
-Recommends: hal-trinity, pmount, kamera-trinity, tdemultimedia-kio-plugins-trinity
+Recommends: hal-trinity, pmount, kamera-trinity, tdemultimedia-tdeio-plugins-trinity
 Suggests: khelpcenter-trinity, mtools
 Conflicts: tdebase-libs-trinity (<< 4:3.0.0), mediamanager
 Description: core I/O slaves for KDE
@@ -360,7 +360,7 @@ Architecture: any
 Replaces: konqueror-trinity (<< 4:14.0.0)
 Breaks: konqueror-trinity (<< 4:14.0.0)
 Provides: info-browser, man-browser, www-browser, konqueror
-Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), tdebase-kio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version}), konqueror-nsplugins-trinity
+Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), tdebase-tdeio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version}), konqueror-nsplugins-trinity
 Suggests: khelpcenter-trinity, konq-plugins-trinity, ksvg-trinity, gij-4.1, libgcj7-awt, libjessie-java
 Conflicts: tdebase-audiolibs-trinity (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0)
 Description: KDE's advanced file manager, web browser and document viewer
diff --git a/ubuntu/precise/tdebase/debian/control.in b/ubuntu/precise/tdebase/debian/control.in
index 387728c4e..c20726136 100644
--- a/ubuntu/precise/tdebase/debian/control.in
+++ b/ubuntu/precise/tdebase/debian/control.in
@@ -12,7 +12,7 @@ Standards-Version: 3.8.4
 Package: tdebase
 Section: tde
 Architecture: all
-Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), twin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
+Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-tdeio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), twin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
 Recommends: tdm (>= ${Source-Version})
 Suggests: tdebase-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -158,11 +158,11 @@ Description: KDE base documentation in HTML format
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde' and 'tdebase' packages for more information.
 
-Package: tdebase-kio-plugins
+Package: tdebase-tdeio-plugins
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}, kdesktop, libsasl2-modules, psmisc, cryptsetup, man-db (>= 2.5.1-1)
-Recommends: hal, pmount, kamera, tdemultimedia-kio-plugins
+Recommends: hal, pmount, kamera, tdemultimedia-tdeio-plugins
 Suggests: khelpcenter, mtools
 Conflicts: tdebase-libs (<< 4:3.0.0)
 Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0), tdebase-bin (<< 4:3.5.5a.dfsg.1-1ubuntu18)
@@ -323,7 +323,7 @@ Package: konqueror
 Section: web
 Architecture: any
 Provides: info-browser, man-browser, www-browser
-Depends: ${shlibs:Depends}, kcontrol (= ${Source-Version}), tdebase-kio-plugins (= ${Source-Version}), kdesktop (= ${Source-Version}), kfind (= ${Source-Version})
+Depends: ${shlibs:Depends}, kcontrol (= ${Source-Version}), tdebase-tdeio-plugins (= ${Source-Version}), kdesktop (= ${Source-Version}), kfind (= ${Source-Version})
 Suggests: khelpcenter, konq-plugins, ksvg, gij-4.1, libgcj7-awt, libjessie-java
 Conflicts: tdebase-audiolibs (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0)
 Replaces: tdebase (<< 4:3.0.0), tdebase-audiolibs (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0)
diff --git a/ubuntu/precise/tdebase/debian/rules b/ubuntu/precise/tdebase/debian/rules
index 96f73eb06..505510f24 100755
--- a/ubuntu/precise/tdebase/debian/rules
+++ b/ubuntu/precise/tdebase/debian/rules
@@ -203,11 +203,11 @@ makebuilddir::
 common-install-prehook-arch::
 	grep -v -e joystick -e view1394  debian/kcontrol-trinity.install > debian/kcontrol-trinity.install.kfreebsd-i386
 	grep -v -e joystick -e view1394  debian/kcontrol-trinity.install > debian/kcontrol-trinity.install.kfreebsd-amd64
-	grep -v -e media_propsdlgplugin  debian/tdebase-kio-plugins-trinity.install > debian/tdebase-kio-plugins-trinity.install.kfreebsd-i386
-	grep -v -e media_propsdlgplugin  debian/tdebase-kio-plugins-trinity.install > debian/tdebase-kio-plugins-trinity.install.kfreebsd-amd64
+	grep -v -e media_propsdlgplugin  debian/tdebase-tdeio-plugins-trinity.install > debian/tdebase-tdeio-plugins-trinity.install.kfreebsd-i386
+	grep -v -e media_propsdlgplugin  debian/tdebase-tdeio-plugins-trinity.install > debian/tdebase-tdeio-plugins-trinity.install.kfreebsd-amd64
 
 clean::
-	rm -f debian/kcontrol-trinity.install.kfreebsd* debian/tdebase-kio-plugins-trinity.install.kfreebs*
+	rm -f debian/kcontrol-trinity.install.kfreebsd* debian/tdebase-tdeio-plugins-trinity.install.kfreebs*
 	rm -f kcontrol/pics/cr*-app-energy_star.png kcontrol/energy/pics/energybig.png kcontrol/energy/pics/lo-energy.png
 	# KIO Media LUKS Icons
 	rm -f pics/crystalsvg/cr*decrypt.png pics/crystalsvg/cr*encrypt.png
diff --git a/ubuntu/precise/tdebase/debian/tdebase-kio-plugins-trinity.README.Debian b/ubuntu/precise/tdebase/debian/tdebase-tdeio-plugins-trinity.README.Debian
index 404b60f67..37f0e0986 100644
--- a/ubuntu/precise/tdebase/debian/tdebase-kio-plugins-trinity.README.Debian
+++ b/ubuntu/precise/tdebase/debian/tdebase-tdeio-plugins-trinity.README.Debian
@@ -8,7 +8,7 @@ cameras, and many other types of equipment.
 While some functionality is available without the use of HAL, media works
 best with HAL (and therefore udev), in combination with pmount. Media
 also extends the functionality of many other tdeioslaves. Check which
-packages are recommended by the tdebase-kio-plugins package, and install
+packages are recommended by the tdebase-tdeio-plugins package, and install
 accordingly.
 
 Note that for regular users to use media in conjunction with HAL, they must
diff --git a/ubuntu/precise/tdebase/debian/tdebase-kio-plugins-trinity.install b/ubuntu/precise/tdebase/debian/tdebase-tdeio-plugins-trinity.install
index 47f0abc0c..47f0abc0c 100644
--- a/ubuntu/precise/tdebase/debian/tdebase-kio-plugins-trinity.install
+++ b/ubuntu/precise/tdebase/debian/tdebase-tdeio-plugins-trinity.install
diff --git a/ubuntu/precise/tdebase/debian/tdebase-kio-plugins-trinity.manpages b/ubuntu/precise/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages
index 249292ad7..249292ad7 100644
--- a/ubuntu/precise/tdebase/debian/tdebase-kio-plugins-trinity.manpages
+++ b/ubuntu/precise/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages
diff --git a/ubuntu/precise/tdebase/debian/tdebase-trinity.README.Debian b/ubuntu/precise/tdebase/debian/tdebase-trinity.README.Debian
index e7a871ce9..9944d8af8 100644
--- a/ubuntu/precise/tdebase/debian/tdebase-trinity.README.Debian
+++ b/ubuntu/precise/tdebase/debian/tdebase-trinity.README.Debian
@@ -14,7 +14,7 @@ cameras, and many other types of equipment.
 While some functionality is available without the use of HAL, media works
 best with HAL (and therefore udev), in combination with pmount. Media
 also extends the functionality of many other tdeioslaves. Check which
-packages are recommended by the tdebase-kio-plugins package, and install
+packages are recommended by the tdebase-tdeio-plugins package, and install
 accordingly.
 
 Note that for regular users to use media in conjunction with HAL, they must