Update Debian and Ubuntu packaging with the latest renaming in GIT

10 files changed, 52 insertions, 52 deletions

diff --git a/ubuntu/maverick/tdemultimedia/debian/changelog b/ubuntu/maverick/tdemultimedia/debian/changelog
index 70dc106df..f6c8c5527 100644
--- a/ubuntu/maverick/tdemultimedia/debian/changelog
+++ b/ubuntu/maverick/tdemultimedia/debian/changelog
@@ -404,7 +404,7 @@ tdemultimedia (4:3.5.1-0ubuntu1) dapper; urgency=low
 
 tdemultimedia (4:3.5.0-0ubuntu2) dapper; urgency=low
 
-  * Tighten version of Replaces on tdemultimedia-kfile-plugins
+  * Tighten version of Replaces on tdemultimedia-tdefile-plugins
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  6 Jan 2006 18:33:11 +0000
 
diff --git a/ubuntu/maverick/tdemultimedia/debian/control b/ubuntu/maverick/tdemultimedia/debian/control
index 42f607611..866ee43eb 100644
--- a/ubuntu/maverick/tdemultimedia/debian/control
+++ b/ubuntu/maverick/tdemultimedia/debian/control
@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdemultimedia-trinity (<< 4:14.0.0)
 Breaks: kdemultimedia-trinity (<< 4:14.0.0)
-Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-kfile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), tdemid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version})
+Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-tdefile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), tdemid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version})
 Suggests: tdemultimedia-trinity-doc-html (>= ${Source-Version})
 Description: multimedia apps from the official Trinity release 
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -131,13 +131,13 @@ Description: CD ripper and audio encoder frontend for Trinity
  This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
-Package: tdemultimedia-kfile-plugins-trinity
+Package: tdemultimedia-tdefile-plugins-trinity
 Section: tde
 Architecture: any
-Replaces: kdemultimedia-kfile-plugins-trinity (<< 4:14.0.0)
-Breaks: kdemultimedia-kfile-plugins-trinity (<< 4:14.0.0)
+Replaces: kdemultimedia-tdefile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdemultimedia-tdefile-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Description: au/avi/m3u/mp3/ogg/wav plugins for kfile
+Description: au/avi/m3u/mp3/ogg/wav plugins for tdefile
  au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
  .
  This package is part of Trinity, as a component of the KDE multimedia module.
diff --git a/ubuntu/maverick/tdemultimedia/debian/control.in b/ubuntu/maverick/tdemultimedia/debian/control.in
index 4bf762241..f79201647 100644
--- a/ubuntu/maverick/tdemultimedia/debian/control.in
+++ b/ubuntu/maverick/tdemultimedia/debian/control.in
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdemultimedia
 Section: tde
 Architecture: all
-Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), tdemultimedia-kappfinder-data (>= ${Source-Version}), tdemultimedia-kfile-plugins (>= ${Source-Version}), tdemultimedia-kio-plugins (>= ${Source-Version}), tdemid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version})
+Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), tdemultimedia-kappfinder-data (>= ${Source-Version}), tdemultimedia-tdefile-plugins (>= ${Source-Version}), tdemultimedia-kio-plugins (>= ${Source-Version}), tdemid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version})
 Suggests: tdemultimedia-doc-html (>= ${Source-Version})
 Description: multimedia apps from the official KDE release 
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -119,12 +119,12 @@ Description: CD ripper and audio encoder frontend for KDE
  This package is part of KDE, as a component of the KDE multimedia module.
  See the 'kde' and 'tdemultimedia' packages for more information.
 
-Package: tdemultimedia-kfile-plugins
+Package: tdemultimedia-tdefile-plugins
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: tdemultimedia-kio-plugins (<< 4:3.4.1-1)
-Description: au/avi/m3u/mp3/ogg/wav plugins for kfile
+Description: au/avi/m3u/mp3/ogg/wav plugins for tdefile
  au/avi/m3u/mp3/ogg/wav file metainformation plugins for KDE.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
diff --git a/ubuntu/maverick/tdemultimedia/debian/copyright b/ubuntu/maverick/tdemultimedia/debian/copyright
index f85e02329..42b700d89 100644
--- a/ubuntu/maverick/tdemultimedia/debian/copyright
+++ b/ubuntu/maverick/tdemultimedia/debian/copyright
@@ -14,7 +14,7 @@ in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and
 
 
 aktion, arts/builder, arts/runtime, arts/tools,
-kfile-plugins, tdemid, tdemidi, koncd, kscd
+tdefile-plugins, tdemid, tdemidi, koncd, kscd
 -----------------------------------------------
 GPL
 
diff --git a/ubuntu/maverick/tdemultimedia/debian/kaudiocreator-trinity.install b/ubuntu/maverick/tdemultimedia/debian/kaudiocreator-trinity.install
index 136265d9c..4569bbf20 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kaudiocreator-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/kaudiocreator-trinity.install
@@ -3,9 +3,9 @@ debian/tmp/opt/trinity/share/applications/tde/kaudiocreator.desktop
 debian/tmp/opt/trinity/share/apps/kaudiocreator/eventsrc
 debian/tmp/opt/trinity/share/apps/kaudiocreator/kaudiocreatorui.rc
 debian/tmp/opt/trinity/share/apps/kaudiocreator/pics/check.png
-debian/tmp/opt/trinity/share/apps/kconf_update/kaudiocreator-libkcddb.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kaudiocreator-meta.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/upgrade-kaudiocreator-metadata.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kaudiocreator-libkcddb.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kaudiocreator-meta.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/upgrade-kaudiocreator-metadata.sh
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/audiocd_extract.desktop
 debian/tmp/opt/trinity/share/config.kcfg/kaudiocreator.kcfg
 debian/tmp/opt/trinity/share/config.kcfg/kaudiocreator_encoders.kcfg
diff --git a/ubuntu/maverick/tdemultimedia/debian/libkcddb1-trinity.install b/ubuntu/maverick/tdemultimedia/debian/libkcddb1-trinity.install
index d9858c0dc..b1ffb9a1c 100644
--- a/ubuntu/maverick/tdemultimedia/debian/libkcddb1-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/libkcddb1-trinity.install
@@ -3,5 +3,5 @@ debian/tmp/opt/trinity/lib/trinity/kcm_cddb.so
 debian/tmp/opt/trinity/lib/libkcddb.so.1
 debian/tmp/opt/trinity/lib/libkcddb.so.1.0.0
 debian/tmp/opt/trinity/share/applications/tde/libkcddb.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/kcmcddb-emailsettings.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kcmcddb-emailsettings.upd
 debian/tmp/opt/trinity/share/config.kcfg/libkcddb.kcfg
diff --git a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.install b/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.install
index 554c5cf07..e5adf0383 100644
--- a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/noatun
-debian/tmp/opt/trinity/lib/kconf_update_bin/noatun20update
+debian/tmp/opt/trinity/lib/tdeconf_update_bin/noatun20update
 debian/tmp/opt/trinity/lib/trinity/noatun.la
 debian/tmp/opt/trinity/lib/trinity/noatun.so
 debian/tmp/opt/trinity/lib/trinity/noatun_dcopiface.la
@@ -72,7 +72,7 @@ debian/tmp/opt/trinity/lib/mcop/noatunarts.mcoptype
 debian/tmp/opt/trinity/lib/mcop/winskinvis.mcopclass
 debian/tmp/opt/trinity/lib/mcop/winskinvis.mcoptype
 debian/tmp/opt/trinity/share/applications/tde/noatun.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/noatun.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/noatun.upd
 debian/tmp/opt/trinity/share/apps/noatun/dcopiface.plugin
 debian/tmp/opt/trinity/share/apps/noatun/eq.preset/preset.dance
 debian/tmp/opt/trinity/share/apps/noatun/eq.preset/preset.jazz
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kfile-plugins-trinity.install b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kfile-plugins-trinity.install
deleted file mode 100644
index 422efd2a4..000000000
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kfile-plugins-trinity.install
+++ /dev/null
@@ -1,33 +0,0 @@
-debian/tmp/opt/trinity/lib/trinity/kfile_au.la
-debian/tmp/opt/trinity/lib/trinity/kfile_au.so
-debian/tmp/opt/trinity/lib/trinity/kfile_avi.la
-debian/tmp/opt/trinity/lib/trinity/kfile_avi.so
-debian/tmp/opt/trinity/lib/trinity/kfile_flac.la
-debian/tmp/opt/trinity/lib/trinity/kfile_flac.so
-debian/tmp/opt/trinity/lib/trinity/kfile_m3u.la
-debian/tmp/opt/trinity/lib/trinity/kfile_m3u.so
-debian/tmp/opt/trinity/lib/trinity/kfile_mp3.la
-debian/tmp/opt/trinity/lib/trinity/kfile_mp3.so
-debian/tmp/opt/trinity/lib/trinity/kfile_mpc.la
-debian/tmp/opt/trinity/lib/trinity/kfile_mpc.so
-debian/tmp/opt/trinity/lib/trinity/kfile_mpeg.la
-debian/tmp/opt/trinity/lib/trinity/kfile_mpeg.so
-debian/tmp/opt/trinity/lib/trinity/kfile_ogg.la
-debian/tmp/opt/trinity/lib/trinity/kfile_ogg.so
-debian/tmp/opt/trinity/lib/trinity/kfile_sid.la
-debian/tmp/opt/trinity/lib/trinity/kfile_sid.so
-debian/tmp/opt/trinity/lib/trinity/kfile_theora.la
-debian/tmp/opt/trinity/lib/trinity/kfile_theora.so
-debian/tmp/opt/trinity/lib/trinity/kfile_wav.la
-debian/tmp/opt/trinity/lib/trinity/kfile_wav.so
-debian/tmp/opt/trinity/share/services/kfile_au.desktop
-debian/tmp/opt/trinity/share/services/kfile_avi.desktop
-debian/tmp/opt/trinity/share/services/kfile_flac.desktop
-debian/tmp/opt/trinity/share/services/kfile_m3u.desktop
-debian/tmp/opt/trinity/share/services/kfile_mp3.desktop
-debian/tmp/opt/trinity/share/services/kfile_mpc.desktop
-debian/tmp/opt/trinity/share/services/kfile_mpeg.desktop
-debian/tmp/opt/trinity/share/services/kfile_ogg.desktop
-debian/tmp/opt/trinity/share/services/kfile_sid.desktop
-debian/tmp/opt/trinity/share/services/kfile_theora.desktop
-debian/tmp/opt/trinity/share/services/kfile_wav.desktop
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
index 82b4ef2b4..1cb78ea91 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
@@ -13,9 +13,9 @@ debian/tmp/opt/trinity/lib/trinity/libaudiocd_encoder_wav.so
 debian/tmp/opt/trinity/lib/libaudiocdplugins.so.1
 debian/tmp/opt/trinity/lib/libaudiocdplugins.so.1.0.0
 debian/tmp/opt/trinity/share/applications/tde/audiocd.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/audiocd.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/upgrade-metadata.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/audiocd.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/upgrade-metadata.sh
 debian/tmp/opt/trinity/share/config.kcfg/audiocd_lame_encoder.kcfg
 debian/tmp/opt/trinity/share/config.kcfg/audiocd_vorbis_encoder.kcfg
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/audiocd.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/audiocd.docbook
 debian/tmp/opt/trinity/share/services/audiocd.protocol
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-tdefile-plugins-trinity.install b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-tdefile-plugins-trinity.install
new file mode 100644
index 000000000..13381df12
--- /dev/null
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-tdefile-plugins-trinity.install
@@ -0,0 +1,33 @@
+debian/tmp/opt/trinity/lib/trinity/tdefile_au.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_au.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_avi.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_avi.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_flac.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_flac.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_m3u.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_m3u.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_mp3.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_mp3.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_mpc.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_mpc.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_mpeg.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_mpeg.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_ogg.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_ogg.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_sid.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_sid.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_theora.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_theora.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_wav.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_wav.so
+debian/tmp/opt/trinity/share/services/tdefile_au.desktop
+debian/tmp/opt/trinity/share/services/tdefile_avi.desktop
+debian/tmp/opt/trinity/share/services/tdefile_flac.desktop
+debian/tmp/opt/trinity/share/services/tdefile_m3u.desktop
+debian/tmp/opt/trinity/share/services/tdefile_mp3.desktop
+debian/tmp/opt/trinity/share/services/tdefile_mpc.desktop
+debian/tmp/opt/trinity/share/services/tdefile_mpeg.desktop
+debian/tmp/opt/trinity/share/services/tdefile_ogg.desktop
+debian/tmp/opt/trinity/share/services/tdefile_sid.desktop
+debian/tmp/opt/trinity/share/services/tdefile_theora.desktop
+debian/tmp/opt/trinity/share/services/tdefile_wav.desktop