Update Debian and Ubuntu packaging with the latest renaming in GIT

7 files changed, 46 insertions, 46 deletions

diff --git a/debian/lenny/tdenetwork/debian/changelog b/debian/lenny/tdenetwork/debian/changelog
index 4510420ac..9a3af2560 100644
--- a/debian/lenny/tdenetwork/debian/changelog
+++ b/debian/lenny/tdenetwork/debian/changelog
@@ -558,7 +558,7 @@ tdenetwork (4:3.5.1-1) unstable; urgency=low
 
   +++ Changes by Isaac Clerencia:
 
-  * Put zeroconf kioslave and other tdednssd stuff in a new package, tdednssd.
+  * Put zeroconf tdeioslave and other tdednssd stuff in a new package, tdednssd.
 
   +++ Changes by Christopher Martin:
 
@@ -928,7 +928,7 @@ tdenetwork (4:3.4.0-0ubuntu1) hoary; urgency=low
 
 tdenetwork (4:3.4.0-0pre1ubuntu2) hoary; urgency=low
 
-  * Add dependency on tdenetwork-kfile-plugins to tdenetwork meta-package.
+  * Add dependency on tdenetwork-tdefile-plugins to tdenetwork meta-package.
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue,  8 Mar 2005 13:09:19 +0000
 
@@ -951,7 +951,7 @@ tdenetwork (4:3.4.0-0pre2) alioth; urgency=low
 
   * Switch to CDBS for packaging.
 
-  * Added new package tdenetwork-kfile-plugins.
+  * Added new package tdenetwork-tdefile-plugins.
 
   * ksirc now recommends libio-socket-ssl-perl, needed for SSL IRC servers
    (Closes: #294331)
diff --git a/debian/lenny/tdenetwork/debian/control b/debian/lenny/tdenetwork/debian/control
index a95cc81a7..407a4224b 100644
--- a/debian/lenny/tdenetwork/debian/control
+++ b/debian/lenny/tdenetwork/debian/control
@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdenetwork-trinity (<< 4:14.0.0)
 Breaks: kdenetwork-trinity (<< 4:14.0.0)
-Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-kfile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), tdednssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version})
+Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-tdefile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), tdednssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version})
 Recommends: tdenetwork-filesharing-trinity (>= ${Source-Version}), ktalkd-trinity (>= ${Source-Version}), lisa-trinity (>= ${Source-Version})
 Suggests: tdenetwork-trinity-doc-html (>= ${Source-Version})
 Description: network-related apps from the official Trinity release
@@ -61,17 +61,17 @@ Description: Trinity network documentation in HTML format
  This package is part of KDE, and a component of the KDE network module.
  See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
-Package: tdenetwork-kfile-plugins-trinity
+Package: tdenetwork-tdefile-plugins-trinity
 Section: tde
 Architecture: any
-Replaces: kdenetwork-kfile-plugins-trinity (<< 4:14.0.0)
-Breaks: kdenetwork-kfile-plugins-trinity (<< 4:14.0.0)
+Replaces: kdenetwork-tdefile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdenetwork-tdefile-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Enhances: konqueror-trinity
 Description: torrent metainfo plugin for Trinity
  This package provides a metainformation plugin for bittorrent files.
  .
- Kde uses kfile-plugins to provide metainfo tab in the files properties
+ Kde uses tdefile-plugins to provide metainfo tab in the files properties
  dialog in konqueror and other file-handling applications.
  .
  This package is part of Trinity, as a component of the KDE network module.
@@ -340,7 +340,7 @@ Depends: ${shlibs:Depends}
 Recommends: avahi-daemon
 Suggests: avahi-autoipd | zeroconf
 Description: Zeroconf support for KDE
- A kioslave and kded module that provide Zeroconf support. Try
+ A tdeioslave and kded module that provide Zeroconf support. Try
  "zeroconf:/" in Konqueror.
  .
  This package is part of KDE, as a component of the KDE network module.
diff --git a/debian/lenny/tdenetwork/debian/control.in b/debian/lenny/tdenetwork/debian/control.in
index 7c7dfdc41..3c9f904e6 100644
--- a/debian/lenny/tdenetwork/debian/control.in
+++ b/debian/lenny/tdenetwork/debian/control.in
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdenetwork
 Section: tde
 Architecture: all
-Depends: dcoprss (>= ${Source-Version}), tdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), tdednssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version})
+Depends: dcoprss (>= ${Source-Version}), tdenetwork-tdefile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), tdednssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version})
 Recommends: tdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version})
 Suggests: tdenetwork-doc-html (>= ${Source-Version})
 Description: network-related apps from the official KDE release
@@ -55,7 +55,7 @@ Description: KDE network documentation in HTML format
  This package is part of KDE, and a component of the KDE network module.
  See the 'kde' and 'tdenetwork' packages for more information.
 
-Package: tdenetwork-kfile-plugins
+Package: tdenetwork-tdefile-plugins
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -63,7 +63,7 @@ Enhances: konqueror
 Description: torrent metainfo plugin for KDE
  This package provides a metainformation plugin for bittorrent files.
  .
- Kde uses kfile-plugins to provide metainfo tab in the files properties
+ Kde uses tdefile-plugins to provide metainfo tab in the files properties
  dialog in konqueror and other file-handling applications.
  .
  This package is part of KDE, as a component of the KDE network module.
@@ -306,7 +306,7 @@ Depends: ${shlibs:Depends}
 Recommends: avahi-daemon
 Suggests: avahi-autoipd | zeroconf
 Description: Zeroconf support for KDE
- A kioslave and kded module that provide Zeroconf support. Try
+ A tdeioslave and kded module that provide Zeroconf support. Try
  "zeroconf:/" in Konqueror.
  .
  This package is part of KDE, as a component of the KDE network module.
diff --git a/debian/lenny/tdenetwork/debian/knewsticker-trinity.install b/debian/lenny/tdenetwork/debian/knewsticker-trinity.install
index 43560f7e5..a424a10a5 100644
--- a/debian/lenny/tdenetwork/debian/knewsticker-trinity.install
+++ b/debian/lenny/tdenetwork/debian/knewsticker-trinity.install
@@ -5,8 +5,8 @@ debian/tmp/opt/trinity/lib/trinity/libkntsrcfilepropsdlg.la
 debian/tmp/opt/trinity/lib/trinity/libkntsrcfilepropsdlg.so
 debian/tmp/opt/trinity/share/applications/tde/knewsticker-standalone.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/knewstickerstub.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/knewsticker.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/knt-0.1-0.2.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/knewsticker.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/knt-0.1-0.2.pl
 debian/tmp/opt/trinity/share/apps/kicker/applets/knewsticker.desktop
 debian/tmp/opt/trinity/share/apps/knewsticker/eventsrc
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/about-icon.png
diff --git a/debian/lenny/tdenetwork/debian/kopete-trinity.install b/debian/lenny/tdenetwork/debian/kopete-trinity.install
index f6ad9caa2..8f133483d 100644
--- a/debian/lenny/tdenetwork/debian/kopete-trinity.install
+++ b/debian/lenny/tdenetwork/debian/kopete-trinity.install
@@ -4,9 +4,9 @@ debian/tmp/opt/trinity/include/kopete/kopetepicture.h
 debian/tmp/opt/trinity/include/kopete/kopeteprefs.h
 debian/tmp/opt/trinity/include/kopete/ui/addressbooklinkwidget.h
 debian/tmp/opt/trinity/include/kopete/webcamwidget.h
-debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-account-kconf_update
-debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-nameTracking-kconf_update
-debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-pluginloader2-kconf_update
+debian/tmp/opt/trinity/lib/tdeconf_update_bin/kopete-account-tdeconf_update
+debian/tmp/opt/trinity/lib/tdeconf_update_bin/kopete-nameTracking-tdeconf_update
+debian/tmp/opt/trinity/lib/tdeconf_update_bin/kopete-pluginloader2-tdeconf_update
 debian/tmp/opt/trinity/lib/trinity/kcm_kopete_accountconfig.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kopete_accountconfig.so
 debian/tmp/opt/trinity/lib/trinity/kcm_kopete_addbookmarks.la
@@ -112,18 +112,18 @@ debian/tmp/opt/trinity/lib/libkopete.so.1.0.0
 debian/tmp/opt/trinity/lib/libkopete_videodevice.so.0
 debian/tmp/opt/trinity/lib/libkopete_videodevice.so.0.0.0
 debian/tmp/opt/trinity/share/applications/tde/kopete.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-account-0.10.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-account-kconf_update.sh
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-account-kconf_update.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-jabberpriorityaddition-kconf_update.sh
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-jabberpriorityaddition-kconf_update.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-jabberproxytype-kconf_update.sh
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-jabberproxytype-kconf_update.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-nameTracking.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-pluginloader2.sh
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-pluginloader2.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-pluginloader.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-pluginloader.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-account-0.10.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-account-tdeconf_update.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-account-tdeconf_update.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-jabberpriorityaddition-tdeconf_update.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-jabberpriorityaddition-tdeconf_update.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-jabberproxytype-tdeconf_update.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-jabberproxytype-tdeconf_update.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-nameTracking.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-pluginloader2.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-pluginloader2.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-pluginloader.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-pluginloader.upd
 debian/tmp/opt/trinity/share/apps/kopete_contactnotes/contactnotesui.rc
 debian/tmp/opt/trinity/share/apps/kopete_cryptography/cryptographychatui.rc
 debian/tmp/opt/trinity/share/apps/kopete_cryptography/cryptographyui.rc
@@ -453,19 +453,19 @@ debian/tmp/opt/trinity/share/services/chatwindow.desktop
 debian/tmp/opt/trinity/share/services/emailwindow.desktop
 debian/tmp/opt/trinity/share/services/irc.protocol /opt/trinity/share/apps/kopete/
 debian/tmp/opt/trinity/share/services/jabberdisco.protocol
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_addbookmarks_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_alias_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_autoreplace_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_cryptography_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_highlight_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_history_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_latex_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_msn_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_netmeeting_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_nowlistening_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_texteffect_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_translator_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_webpresence_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_addbookmarks_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_alias_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_autoreplace_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_cryptography_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_highlight_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_history_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_latex_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_msn_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_netmeeting_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_nowlistening_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_texteffect_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_translator_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_webpresence_config.desktop
 debian/tmp/opt/trinity/share/services/kopete_accountconfig.desktop
 debian/tmp/opt/trinity/share/services/kopete_addbookmarks.desktop
 debian/tmp/opt/trinity/share/services/kopete_aim.desktop
diff --git a/debian/lenny/tdenetwork/debian/tdenetwork-kfile-plugins-trinity.install b/debian/lenny/tdenetwork/debian/tdenetwork-kfile-plugins-trinity.install
deleted file mode 100644
index b32a36440..000000000
--- a/debian/lenny/tdenetwork/debian/tdenetwork-kfile-plugins-trinity.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/opt/trinity/lib/trinity/kfile_torrent.la
-debian/tmp/opt/trinity/lib/trinity/kfile_torrent.so
-debian/tmp/opt/trinity/share/services/kfile_torrent.desktop
diff --git a/debian/lenny/tdenetwork/debian/tdenetwork-tdefile-plugins-trinity.install b/debian/lenny/tdenetwork/debian/tdenetwork-tdefile-plugins-trinity.install
new file mode 100644
index 000000000..fef93a0b0
--- /dev/null
+++ b/debian/lenny/tdenetwork/debian/tdenetwork-tdefile-plugins-trinity.install
@@ -0,0 +1,3 @@
+debian/tmp/opt/trinity/lib/trinity/tdefile_torrent.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_torrent.so
+debian/tmp/opt/trinity/share/services/tdefile_torrent.desktop