Update Debian and Ubuntu packaging for latest GIT changes

12 files changed, 21 insertions, 21 deletions

diff --git a/debian/lenny/applications/digikam/debian/changelog b/debian/lenny/applications/digikam/debian/changelog
index e421b82b9..d0d2f1f2f 100644
--- a/debian/lenny/applications/digikam/debian/changelog
+++ b/debian/lenny/applications/digikam/debian/changelog
@@ -338,7 +338,7 @@ digikam (2:0.9.1-3) unstable; urgency=low
 digikam (2:0.9.1-2) unstable; urgency=low
 
   [ Achim Bohnet ]
-  * Depend on tdebase-kio-plugins.  The pkg contains kio_trash and makes
+  * Depend on tdebase-kio-plugins.  The pkg contains tdeio_trash and makes
    'Move to Trash' working for e.g. Gnome sessions. Fixes report on
    digikam-user mailing list and closes malone #75435.
 
diff --git a/debian/lenny/applications/k3b/debian/changelog b/debian/lenny/applications/k3b/debian/changelog
index 61061c0a5..c14ef39c5 100644
--- a/debian/lenny/applications/k3b/debian/changelog
+++ b/debian/lenny/applications/k3b/debian/changelog
@@ -229,14 +229,14 @@ k3b (1.0.4-2ubuntu4) hardy; urgency=low
 k3b (1.0.4-2ubuntu3) hardy; urgency=low
 
   * Fixed libk3b2.install:
-    - kio_videodvd.so and kio_videodvd.la are installed
+    - tdeio_videodvd.so and tdeio_videodvd.la are installed
 
  -- Anthony Mercatante <tonio@kubuntu.org>  Tue, 22 Jan 2008 13:27:55 +0100
 
 k3b (1.0.4-2ubuntu2) hardy; urgency=low
 
   [ Stefan Skotte ]
-  * kio_videodvd wasn't installed correctly
+  * tdeio_videodvd wasn't installed correctly
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 20 Dec 2007 11:08:20 +0000
 
diff --git a/debian/lenny/applications/kio-umountwrapper/debian/control b/debian/lenny/applications/kio-umountwrapper/debian/control
index 0265c9588..6b6b2d3c3 100644
--- a/debian/lenny/applications/kio-umountwrapper/debian/control
+++ b/debian/lenny/applications/kio-umountwrapper/debian/control
@@ -11,7 +11,7 @@ Depends: ${shlibs:Depends}
 Replaces: kio-umountwrapper-trinity (<< 4:14.0.0)
 Breaks: kio-umountwrapper-trinity (<< 4:14.0.0)
 Description: progress dialog for safely removing devices in Trinity.
- Wrapper around kio_media_mountwrapper.
+ Wrapper around tdeio_media_mountwrapper.
  Provides a progress dialog for Safely Removing of devices in Trinity.
  .
   Homepage: http://frode.kde.no/misc/tdeio_umountwrapper/
diff --git a/debian/lenny/applications/kio-umountwrapper/debian/media_safelyremove.desktop b/debian/lenny/applications/kio-umountwrapper/debian/media_safelyremove.desktop
index 22b716ad5..38fa25d92 100644
--- a/debian/lenny/applications/kio-umountwrapper/debian/media_safelyremove.desktop
+++ b/debian/lenny/applications/kio-umountwrapper/debian/media_safelyremove.desktop
@@ -69,6 +69,6 @@ Name[vi]=Gỡ ra An toàn
 Name[wa]=Ositer e såvrité
 Name[zh_CN]=安全删除
 Name[zh_TW]=安全的移除
-Exec=kio_umountwrapper %u
+Exec=tdeio_umountwrapper %u
 
 X-Ubuntu-Gettext-Domain=desktop_tdebase
diff --git a/debian/lenny/applications/krusader/debian/rules b/debian/lenny/applications/krusader/debian/rules
index f2fc8f971..5a95e522d 100755
--- a/debian/lenny/applications/krusader/debian/rules
+++ b/debian/lenny/applications/krusader/debian/rules
@@ -43,7 +43,7 @@ install/krusader-trinity::
 		$(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_root.xpm
 	install -D -p -m0644 pics/cr32-app-krusader_user.xpm \
 		$(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_user.xpm
-	# install properly kio_isorc
+	# install properly tdeio_isorc
 	install -D -p -m0644 iso/tdeio_isorc \
 		$(DEB_DESTDIR)/opt/trinity/share/config/tdeio_isorc
 	# install lintian override
diff --git a/debian/lenny/tdebase/debian/changelog b/debian/lenny/tdebase/debian/changelog
index 1a4cbbd7d..b78c606b3 100644
--- a/debian/lenny/tdebase/debian/changelog
+++ b/debian/lenny/tdebase/debian/changelog
@@ -367,7 +367,7 @@ tdebase (4:3.5.9-0ubuntu3) hardy; urgency=low
 
 tdebase (4:3.5.9-0ubuntu2) hardy; urgency=low
 
-  * Add kubuntu_9922_kio_man_utf8.diff: Recode manual pages to UTF-8 
+  * Add kubuntu_9922_tdeio_man_utf8.diff: Recode manual pages to UTF-8 
     (LP: #44548)
     - Patch thanks to Colin Watson <cjwatson@ubuntu.com>
   * Update 25_khelp_htdig.diff with correct $kdekdehtmldir location
@@ -850,7 +850,7 @@ tdebase (4:3.5.7-1ubuntu13) gutsy; urgency=low
 tdebase (4:3.5.7-1ubuntu12) gutsy; urgency=low
 
   * Remove kubuntu_95_safely-remove_umount_dialog.diff as
-    kio_umountwrapper is being promoted to main
+    tdeio_umountwrapper is being promoted to main
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jul 2007 11:41:02 +0100
 
diff --git a/debian/lenny/tdebase/debian/man/tdeio_media_mounthelper-trinity.1 b/debian/lenny/tdebase/debian/man/tdeio_media_mounthelper-trinity.1
index 1a6fd6971..2411d91d6 100644
--- a/debian/lenny/tdebase/debian/man/tdeio_media_mounthelper-trinity.1
+++ b/debian/lenny/tdebase/debian/man/tdeio_media_mounthelper-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KIO_MEDIA_MOUNTHELPER 1 "June 2006" "K Desktop Environment" "helper program"
 .SH NAME
-kio_media_mounthelper
-\- kio_media_mounthelper
+tdeio_media_mounthelper
+\- tdeio_media_mounthelper
 .SH SYNOPSIS
-\fBkio_media_mounthelper\fP [Qt\-options] [KDE\-options] [options] URL 
+\fBtdeio_media_mounthelper\fP [Qt\-options] [KDE\-options] [options] URL 
 .SH DESCRIPTION
-\fBkio_media_mounthelper\fP is a helper program to handle the mounting of media in KDE. It is part of the KIO subsystem.
+\fBtdeio_media_mounthelper\fP is a helper program to handle the mounting of media in KDE. It is part of the KIO subsystem.
 .SH OPTIONS
 .SS
 .SS Arguments:
diff --git a/debian/lenny/tdebase/debian/man/tdeio_system_documenthelper-trinity.1 b/debian/lenny/tdebase/debian/man/tdeio_system_documenthelper-trinity.1
index 9779578e6..f700510ad 100644
--- a/debian/lenny/tdebase/debian/man/tdeio_system_documenthelper-trinity.1
+++ b/debian/lenny/tdebase/debian/man/tdeio_system_documenthelper-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  kio_system_documenthelper 1 "June 2006" "K Desktop Environment" "helper script"
+.TH  tdeio_system_documenthelper 1 "June 2006" "K Desktop Environment" "helper script"
 .SH NAME
-kio_system_documenthelper
+tdeio_system_documenthelper
 \- KDE helper script used by document.desktop
 .SH SYNOPSIS
-\fBkio_system_documenthelper\fP
+\fBtdeio_system_documenthelper\fP
 
 .SH DESCRIPTION
 The script is used by document.desktop entry to determine if it must be shown or not.
diff --git a/debian/lenny/tdelibs/debian/changelog b/debian/lenny/tdelibs/debian/changelog
index fc839a83c..e55b19a9c 100644
--- a/debian/lenny/tdelibs/debian/changelog
+++ b/debian/lenny/tdelibs/debian/changelog
@@ -2816,7 +2816,7 @@ tdelibs (4:2.2.2-4) unstable; urgency=low
   * Cleanup documentation for freeze
   * Cleanup dh-make files
   * Default to Reject for cookie acceptions. (Closes: #121750)
-  * kio_https.* no longer exists and due to diversions we could end up 
+  * tdeio_https.* no longer exists and due to diversions we could end up 
     with the files existing but not tied to any package..so let's make
     sure to remove them.
 
diff --git a/debian/lenny/tdepim/debian/changelog b/debian/lenny/tdepim/debian/changelog
index 268556215..313f2e913 100644
--- a/debian/lenny/tdepim/debian/changelog
+++ b/debian/lenny/tdepim/debian/changelog
@@ -978,7 +978,7 @@ tdepim (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * Add kubuntu_10_imap4_loop.diff from Dirk Mueller
     "When a message is sent to a kmail user with a > 71 characters long filename in
-     the content disposition header and kio_imap4 was compiled with gcc >= 4.0,
+     the content disposition header and tdeio_imap4 was compiled with gcc >= 4.0,
      then it goes into an endless loop eating up all available system memory."
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  4 May 2006 19:07:10 +0100
diff --git a/debian/lenny/tdevelop/debian/changelog b/debian/lenny/tdevelop/debian/changelog
index 2511a3b86..526fc52c7 100644
--- a/debian/lenny/tdevelop/debian/changelog
+++ b/debian/lenny/tdevelop/debian/changelog
@@ -463,7 +463,7 @@ tdevelop3 (4:3.2.2-0.1) unstable; urgency=low
   * Fix lintian warnings:
    - Update to Standards-Version 3.6.2
    - Replace possible bashism "-a" by "&&" in debian/config  
-  * Add Suggests on tdesdk-misc to provide kio_svn files
+  * Add Suggests on tdesdk-misc to provide tdeio_svn files
   * Translation fixes:
    - Fix debian/templates.master, run debconf-updatepo (Closes: #312161) 
    - Add Vietnamese debconf translation (Closes: #312160)
@@ -504,7 +504,7 @@ tdevelop3 (4:3.2.1-0ubuntu1) breezy; urgency=low
 
 tdevelop3 (4:3.2.0-3) unstable; urgency=low
 
-  * Fixed up the creation and removal of the symlinks for kio_svn
+  * Fixed up the creation and removal of the symlinks for tdeio_svn
     files (Closes: #310684)
 
  -- Norman Jordan <njordan@debian.org>  Wed, 25 May 2005 10:18:35 -0700
@@ -516,7 +516,7 @@ tdevelop3 (4:3.2.0-2) unstable; urgency=medium
     (Closes: #308198)
   * Fixed icon path (Closes: #299522)
   * Added pt_BR debconf translation (Closes: #304419)
-  * Moved the kio_svn files out of the way. Symlinks are created for
+  * Moved the tdeio_svn files out of the way. Symlinks are created for
     them if they are not already there. (Closes: #309379)
 
  -- Norman Jordan <njordan@debian.org>  Mon,  23 May 2005 03:52:16 -0700
diff --git a/debian/lenny/tdevelop/debian/tdevelop-data-trinity.lintian b/debian/lenny/tdevelop/debian/tdevelop-data-trinity.lintian
index 9f3b99d47..a0041fc4c 100644
--- a/debian/lenny/tdevelop/debian/tdevelop-data-trinity.lintian
+++ b/debian/lenny/tdevelop/debian/tdevelop-data-trinity.lintian
@@ -5,7 +5,7 @@ tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/L
 tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.BSD
 # This file is a template, not a script.
 tdevelop-data: script-not-executable ./usr/share/apps/kdevfilecreate/file-templates/pl
-# This file is used internally by kio_pydoc.la and invoked explicitly with python.
+# This file is used internally by tdeio_pydoc.la and invoked explicitly with python.
 tdevelop-data: script-not-executable ./usr/share/apps/tdeio_pydoc/kde_pydoc.py
 # This file is used internally by libkdevcvsservice.la and invoked explicitly with sh.
 tdevelop-data: script-not-executable ./usr/share/apps/kdevcvsservice/buildcvs.sh