Use new tdeio names on Debian and Ubuntu

6 files changed, 68 insertions, 68 deletions

diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog
index 1cffd2663..15ecc465c 100644
--- a/ubuntu/maverick/tdelibs/debian/changelog
+++ b/ubuntu/maverick/tdelibs/debian/changelog
@@ -2394,7 +2394,7 @@ tdelibs (4:3.3.2-0pre1) experimental; urgency=low
     - usr/share/apps/ksgmltools2/customization/cs/entities/underLGPL.docbook
 
   * New entries in debian/tdelibs4-dev.install:
-    - usr/include/kiobuffer.h
+    - usr/include/tdeiobuffer.h
     - usr/include/tdewallettypes.h
 
   * debian/control:
@@ -2443,9 +2443,9 @@ tdelibs (4:3.3.1-2) unstable; urgency=medium
 
     - post-3.3.1-tdelibs-kio.diff: the patch as given in the KDE Advisory
       can't be used, since tdelibs 3.3.1-1 includes a KDE_3_3_BRANCH pull that
-      already modifies kio/kio/job.cpp and makes the supplied patch unusable.
+      already modifies tdeio/tdeio/job.cpp and makes the supplied patch unusable.
 
-      Regenerated patch from CVS: Diff for /tdelibs/kio/kio/job.cpp between
+      Regenerated patch from CVS: Diff for /tdelibs/tdeio/tdeio/job.cpp between
       version 1.397.2.7 and 1.397.2.8.
 
  -- Adeodato Simó <asp16@alu.ua.es>  Sat, 11 Dec 2004 00:23:09 +0100
diff --git a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
index 715b2bd22..faa57c5ba 100644
--- a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
+++ b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
@@ -1,5 +1,5 @@
---- a/kio/kio/kprotocolmanager.cpp
-+++ b/kio/kio/kprotocolmanager.cpp
+--- a/tdeio/tdeio/kprotocolmanager.cpp
++++ b/tdeio/tdeio/kprotocolmanager.cpp
 @@ -450,14 +450,19 @@
       return d->useragent;
  
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
index 98ccf5d11..bdf9bb4f7 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
@@ -9,7 +9,7 @@ debian/tmp/etc/trinity/katesyntaxhighlightingrc
 debian/tmp/etc/trinity/kdebug.areas
 debian/tmp/etc/trinity/kdebugrc
 debian/tmp/etc/trinity/tdeprintrc
-debian/tmp/etc/trinity/kio_isorc
+debian/tmp/etc/trinity/tdeio_isorc
 debian/tmp/etc/trinity/ksslcalist
 debian/tmp/etc/trinity/kthemestylerc
 debian/tmp/etc/trinity/language.codes
@@ -41,7 +41,7 @@ debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_tdetexteditor.desktop
 debian/tmp/opt/trinity/share/apps/tdeconf_update/kcookiescfg.upd
 debian/tmp/opt/trinity/share/apps/tdeconf_update/kded.upd
 debian/tmp/opt/trinity/share/apps/tdeconf_update/tdeprintrc.upd
-debian/tmp/opt/trinity/share/apps/tdeconf_update/kio_help.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/tdeio_help.upd
 debian/tmp/opt/trinity/share/apps/tdeconf_update/tdeioslave.upd
 debian/tmp/opt/trinity/share/apps/tdeconf_update/move_kio_help_cache.sh
 debian/tmp/opt/trinity/share/apps/tdeconf_update/proxytype.pl
@@ -3594,7 +3594,7 @@ debian/tmp/opt/trinity/share/services/http_cache_cleaner.desktop
 debian/tmp/opt/trinity/share/services/http.protocol
 debian/tmp/opt/trinity/share/services/https.protocol
 debian/tmp/opt/trinity/share/services/iso.protocol
-debian/tmp/opt/trinity/share/applnk/kio_iso.desktop
+debian/tmp/opt/trinity/share/applnk/tdeio_iso.desktop
 debian/tmp/opt/trinity/share/services/ico.kimgio
 debian/tmp/opt/trinity/share/services/jp2.kimgio
 debian/tmp/opt/trinity/share/services/jpeg.kimgio
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
index 267909be7..503e1c360 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -312,44 +312,44 @@ debian/tmp/opt/trinity/include/tdeimproxy.h
 debian/tmp/opt/trinity/include/tdeimproxyiface.h
 debian/tmp/opt/trinity/include/kinputdialog.h
 debian/tmp/opt/trinity/include/kinstance.h
-debian/tmp/opt/trinity/include/kio/authinfo.h
-debian/tmp/opt/trinity/include/kiobuffer.h
-debian/tmp/opt/trinity/include/kio/chmodjob.h
-debian/tmp/opt/trinity/include/kio/connection.h
-debian/tmp/opt/trinity/include/kio/davjob.h
-debian/tmp/opt/trinity/include/kio/defaultprogress.h
-debian/tmp/opt/trinity/include/kio/file.h
-debian/tmp/opt/trinity/include/kio/forwardingslavebase.h
-debian/tmp/opt/trinity/include/kio/global.h
-debian/tmp/opt/trinity/include/kio/http.h
-debian/tmp/opt/trinity/include/kio/http_slave_defaults.h
-debian/tmp/opt/trinity/include/kio/ioslave_defaults.h
-debian/tmp/opt/trinity/include/kio/jobclasses.h
-debian/tmp/opt/trinity/include/kio/job.h
-debian/tmp/opt/trinity/include/kio/tdesasl.h
-debian/tmp/opt/trinity/include/kio/kmdbase.h
-debian/tmp/opt/trinity/include/kio/kmdcodec.h
-debian/tmp/opt/trinity/include/kio/tdentlm.h
-debian/tmp/opt/trinity/include/kio/metainfojob.h
-debian/tmp/opt/trinity/include/kio/netaccess.h
-debian/tmp/opt/trinity/include/kio/observer.h
-debian/tmp/opt/trinity/include/kio/passdlg.h
-debian/tmp/opt/trinity/include/kio/paste.h
-debian/tmp/opt/trinity/include/kio/previewjob.h
-debian/tmp/opt/trinity/include/kio/progressbase.h
-debian/tmp/opt/trinity/include/kio/renamedlg.h
-debian/tmp/opt/trinity/include/kio/scheduler.h
-debian/tmp/opt/trinity/include/kio/sessiondata.h
-debian/tmp/opt/trinity/include/kio/skipdlg.h
-debian/tmp/opt/trinity/include/kio/slavebase.h
-debian/tmp/opt/trinity/include/kio/slaveconfig.h
-debian/tmp/opt/trinity/include/kio/slave.h
-debian/tmp/opt/trinity/include/kio/slaveinterface.h
-debian/tmp/opt/trinity/include/kio/statusbarprogress.h
-debian/tmp/opt/trinity/include/kio/tcpslavebase.h
-debian/tmp/opt/trinity/include/kio/thumbcreator.h
-debian/tmp/opt/trinity/include/kio/uiserver.h
-debian/tmp/opt/trinity/include/kio/uiserver_stub.h
+debian/tmp/opt/trinity/include/tdeio/authinfo.h
+debian/tmp/opt/trinity/include/tdeiobuffer.h
+debian/tmp/opt/trinity/include/tdeio/chmodjob.h
+debian/tmp/opt/trinity/include/tdeio/connection.h
+debian/tmp/opt/trinity/include/tdeio/davjob.h
+debian/tmp/opt/trinity/include/tdeio/defaultprogress.h
+debian/tmp/opt/trinity/include/tdeio/file.h
+debian/tmp/opt/trinity/include/tdeio/forwardingslavebase.h
+debian/tmp/opt/trinity/include/tdeio/global.h
+debian/tmp/opt/trinity/include/tdeio/http.h
+debian/tmp/opt/trinity/include/tdeio/http_slave_defaults.h
+debian/tmp/opt/trinity/include/tdeio/ioslave_defaults.h
+debian/tmp/opt/trinity/include/tdeio/jobclasses.h
+debian/tmp/opt/trinity/include/tdeio/job.h
+debian/tmp/opt/trinity/include/tdeio/tdesasl.h
+debian/tmp/opt/trinity/include/tdeio/kmdbase.h
+debian/tmp/opt/trinity/include/tdeio/kmdcodec.h
+debian/tmp/opt/trinity/include/tdeio/tdentlm.h
+debian/tmp/opt/trinity/include/tdeio/metainfojob.h
+debian/tmp/opt/trinity/include/tdeio/netaccess.h
+debian/tmp/opt/trinity/include/tdeio/observer.h
+debian/tmp/opt/trinity/include/tdeio/passdlg.h
+debian/tmp/opt/trinity/include/tdeio/paste.h
+debian/tmp/opt/trinity/include/tdeio/previewjob.h
+debian/tmp/opt/trinity/include/tdeio/progressbase.h
+debian/tmp/opt/trinity/include/tdeio/renamedlg.h
+debian/tmp/opt/trinity/include/tdeio/scheduler.h
+debian/tmp/opt/trinity/include/tdeio/sessiondata.h
+debian/tmp/opt/trinity/include/tdeio/skipdlg.h
+debian/tmp/opt/trinity/include/tdeio/slavebase.h
+debian/tmp/opt/trinity/include/tdeio/slaveconfig.h
+debian/tmp/opt/trinity/include/tdeio/slave.h
+debian/tmp/opt/trinity/include/tdeio/slaveinterface.h
+debian/tmp/opt/trinity/include/tdeio/statusbarprogress.h
+debian/tmp/opt/trinity/include/tdeio/tcpslavebase.h
+debian/tmp/opt/trinity/include/tdeio/thumbcreator.h
+debian/tmp/opt/trinity/include/tdeio/uiserver.h
+debian/tmp/opt/trinity/include/tdeio/uiserver_stub.h
 debian/tmp/opt/trinity/include/kipc.h
 debian/tmp/opt/trinity/include/kjanuswidget.h
 debian/tmp/opt/trinity/include/kjs/completion.h
@@ -780,8 +780,8 @@ debian/tmp/opt/trinity/lib/libtdehtml.la
 debian/tmp/opt/trinity/lib/libtdehtml.so
 debian/tmp/opt/trinity/lib/libtdeimproxy.la
 debian/tmp/opt/trinity/lib/libtdeimproxy.so
-debian/tmp/opt/trinity/lib/libkio.la
-debian/tmp/opt/trinity/lib/libkio.so
+debian/tmp/opt/trinity/lib/libtdeio.la
+debian/tmp/opt/trinity/lib/libtdeio.so
 debian/tmp/opt/trinity/lib/libkjava.la
 debian/tmp/opt/trinity/lib/libkjava.so
 debian/tmp/opt/trinity/lib/libkjs.la
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
index 182f67f3e..5d8c4e3aa 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -35,7 +35,7 @@ debian/tmp/opt/trinity/bin/kgrantpty
 debian/tmp/opt/trinity/bin/tdehotnewstuff
 debian/tmp/opt/trinity/bin/kinstalltheme
 debian/tmp/opt/trinity/bin/tdeioexec
-debian/tmp/opt/trinity/bin/kio_http_cache_cleaner
+debian/tmp/opt/trinity/bin/tdeio_http_cache_cleaner
 debian/tmp/opt/trinity/bin/tdeioslave
 debian/tmp/opt/trinity/bin/tdeio_uiserver
 debian/tmp/opt/trinity/bin/tdelauncher
@@ -143,22 +143,22 @@ debian/tmp/opt/trinity/lib/trinity/kimg_xcf.la
 debian/tmp/opt/trinity/lib/trinity/kimg_xcf.so
 debian/tmp/opt/trinity/lib/trinity/kimg_xview.la
 debian/tmp/opt/trinity/lib/trinity/kimg_xview.so
-debian/tmp/opt/trinity/lib/trinity/kio_file.la
-debian/tmp/opt/trinity/lib/trinity/kio_file.so
-debian/tmp/opt/trinity/lib/trinity/kio_ftp.la
-debian/tmp/opt/trinity/lib/trinity/kio_ftp.so
-debian/tmp/opt/trinity/lib/trinity/kio_ghelp.la
-debian/tmp/opt/trinity/lib/trinity/kio_ghelp.so
-debian/tmp/opt/trinity/lib/trinity/kio_help.la
-debian/tmp/opt/trinity/lib/trinity/kio_help.so
-debian/tmp/opt/trinity/lib/trinity/kio_http_cache_cleaner.la
-debian/tmp/opt/trinity/lib/trinity/kio_http_cache_cleaner.so
-debian/tmp/opt/trinity/lib/trinity/kio_http.la
-debian/tmp/opt/trinity/lib/trinity/kio_http.so
-debian/tmp/opt/trinity/lib/trinity/kio_iso.la
-debian/tmp/opt/trinity/lib/trinity/kio_iso.so
-debian/tmp/opt/trinity/lib/trinity/kio_metainfo.la
-debian/tmp/opt/trinity/lib/trinity/kio_metainfo.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_file.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_file.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_ftp.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_ftp.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_ghelp.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_ghelp.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_help.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_help.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_http_cache_cleaner.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_http_cache_cleaner.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_http.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_http.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_iso.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_iso.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_metainfo.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_metainfo.so
 debian/tmp/opt/trinity/lib/trinity/tdeio_uiserver.la
 debian/tmp/opt/trinity/lib/trinity/tdeio_uiserver.so
 debian/tmp/opt/trinity/lib/trinity/kjavaappletviewer.la
@@ -270,8 +270,8 @@ debian/tmp/opt/trinity/lib/libtdehtml.so.4
 debian/tmp/opt/trinity/lib/libtdehtml.so.4.2.0
 debian/tmp/opt/trinity/lib/libtdeimproxy.so.0
 debian/tmp/opt/trinity/lib/libtdeimproxy.so.0.0.0
-debian/tmp/opt/trinity/lib/libkio.so.4
-debian/tmp/opt/trinity/lib/libkio.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeio.so.4
+debian/tmp/opt/trinity/lib/libtdeio.so.4.2.0
 debian/tmp/opt/trinity/lib/libkjava.so.1
 debian/tmp/opt/trinity/lib/libkjava.so.1.0.0
 debian/tmp/opt/trinity/lib/libkjs.so.1
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages
index 505fcc7c9..7c2d23170 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages
@@ -13,7 +13,7 @@ debian/man/out/kded-trinity.1
 debian/man/out/kdontchangethehostname-trinity.1
 debian/man/out/tdefile-trinity.1
 debian/man/out/kinstalltheme-trinity.1
-debian/man/out/kio_http_cache_cleaner-trinity.1
+debian/man/out/tdeio_http_cache_cleaner-trinity.1
 debian/man/out/tdeio_uiserver-trinity.1
 debian/man/out/tdemailservice-trinity.1
 debian/man/out/tdesendbugmail-trinity.1