Update Debian and Ubuntu packaging with the latest renaming in GIT

9 files changed, 34 insertions, 34 deletions

diff --git a/ubuntu/lucid_automake/kdesdk/debian/cervisia-kde3.install b/ubuntu/lucid_automake/kdesdk/debian/cervisia-kde3.install
index a38b2a498..e2280e31b 100644
--- a/ubuntu/lucid_automake/kdesdk/debian/cervisia-kde3.install
+++ b/ubuntu/lucid_automake/kdesdk/debian/cervisia-kde3.install
@@ -9,11 +9,11 @@ debian/tmp/opt/kde3/share/applications/kde/cervisia.desktop
 debian/tmp/opt/kde3/share/apps/cervisia/cervisiashellui.rc
 debian/tmp/opt/kde3/share/apps/cervisia/eventsrc
 debian/tmp/opt/kde3/share/apps/cervisiapart/cervisiaui.rc
-debian/tmp/opt/kde3/share/apps/kconf_update/cervisia.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/cervisia-change_repos_list.pl
-debian/tmp/opt/kde3/share/apps/kconf_update/cervisia-normalize_cvsroot.pl
-debian/tmp/opt/kde3/share/apps/kconf_update/move_repositories.pl
-debian/tmp/opt/kde3/share/apps/kconf_update/change_colors.pl
+debian/tmp/opt/kde3/share/apps/tdeconf_update/cervisia.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/cervisia-change_repos_list.pl
+debian/tmp/opt/kde3/share/apps/tdeconf_update/cervisia-normalize_cvsroot.pl
+debian/tmp/opt/kde3/share/apps/tdeconf_update/move_repositories.pl
+debian/tmp/opt/kde3/share/apps/tdeconf_update/change_colors.pl
 debian/tmp/opt/kde3/share/config.kcfg/cervisiapart.kcfg
 debian/tmp/opt/kde3/share/doc/kde/HTML/en/cervisia/*.bz2
 debian/tmp/opt/kde3/share/doc/kde/HTML/en/cervisia/common
diff --git a/ubuntu/lucid_automake/kdesdk/debian/cervisia-kde3.lintian b/ubuntu/lucid_automake/kdesdk/debian/cervisia-kde3.lintian
index 7212dadb5..05aa4147f 100644
--- a/ubuntu/lucid_automake/kdesdk/debian/cervisia-kde3.lintian
+++ b/ubuntu/lucid_automake/kdesdk/debian/cervisia-kde3.lintian
@@ -1,6 +1,6 @@
-# kconf_update scripts don't need to be executable.
-cervisia: script-not-executable ./usr/share/apps/kconf_update/change_colors.pl
-cervisia: script-not-executable ./usr/share/apps/kconf_update/move_repositories.pl
+# tdeconf_update scripts don't need to be executable.
+cervisia: script-not-executable ./usr/share/apps/tdeconf_update/change_colors.pl
+cervisia: script-not-executable ./usr/share/apps/tdeconf_update/move_repositories.pl
 
 # This is from kdeinit black magic.
 cervisia: no-shlibs-control-file opt/kde3/lib/libkdeinit_cervisia.so
diff --git a/ubuntu/lucid_automake/kdesdk/debian/control b/ubuntu/lucid_automake/kdesdk/debian/control
index 3efde280c..d995ddc05 100644
--- a/ubuntu/lucid_automake/kdesdk/debian/control
+++ b/ubuntu/lucid_automake/kdesdk/debian/control
@@ -14,7 +14,7 @@ Standards-Version: 3.8.3
 Package: kdesdk-kde3
 Architecture: all
 Section: kde
-Depends: cervisia-kde3 (>= ${Source-Version}), kapptemplate-kde3 (>= ${Source-Version}), kbabel-kde3 (>= ${Source-Version}), kbugbuster-kde3 (>= ${Source-Version}), tdecachegrind-kde3 (>= ${Source-Version}), kdesdk-kfile-plugins-kde3 (>= ${Source-Version}), kdesdk-kio-plugins-kde3 (>= ${Source-Version}) | kdesvn-kio-plugins-kde3, kdesdk-misc-kde3 (>= ${Source-Version}), kdesdk-scripts-kde3, kmtrace-kde3 (>= ${Source-Version}), kompare-kde3 (>= ${Source-Version}), kspy-kde3 (>= ${Source-Version}), kuiviewer-kde3 (>= ${Source-Version}), tdeunittest-kde3 (>= ${Source-Version}), poxml-kde3 (>= ${Source-Version}), umbrello-kde3 (>= ${Source-Version})
+Depends: cervisia-kde3 (>= ${Source-Version}), kapptemplate-kde3 (>= ${Source-Version}), kbabel-kde3 (>= ${Source-Version}), kbugbuster-kde3 (>= ${Source-Version}), tdecachegrind-kde3 (>= ${Source-Version}), kdesdk-tdefile-plugins-kde3 (>= ${Source-Version}), kdesdk-kio-plugins-kde3 (>= ${Source-Version}) | kdesvn-kio-plugins-kde3, kdesdk-misc-kde3 (>= ${Source-Version}), kdesdk-scripts-kde3, kmtrace-kde3 (>= ${Source-Version}), kompare-kde3 (>= ${Source-Version}), kspy-kde3 (>= ${Source-Version}), kuiviewer-kde3 (>= ${Source-Version}), tdeunittest-kde3 (>= ${Source-Version}), poxml-kde3 (>= ${Source-Version}), umbrello-kde3 (>= ${Source-Version})
 Suggests: tdecachegrind-converters-kde3, kbabel-kde3-dev, kdesdk-kde3-doc-html
 Description: software development kit from the official KDE3 release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -170,11 +170,11 @@ Description: format converters for KCachegrind profiling visualisation tool
  This package is part of KDE3, and a component of the KDE SDK module.
  See the 'kde-kde3' and 'kdesdk-kde3' packages for more information.
 
-Package: kdesdk-kfile-plugins-kde3
+Package: kdesdk-tdefile-plugins-kde3
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
-Conflicts: kdesdk-kfile-plugins
+Conflicts: kdesdk-tdefile-plugins
 Description: KDE3 file dialog plugins for software development files
  This is a collection of plugins for the KDE file dialog.  These plugins
  extend the file dialog to offer advanced meta-information for source files,
diff --git a/ubuntu/lucid_automake/kdesdk/debian/control.in b/ubuntu/lucid_automake/kdesdk/debian/control.in
index 3b80525fe..a4ec38539 100644
--- a/ubuntu/lucid_automake/kdesdk/debian/control.in
+++ b/ubuntu/lucid_automake/kdesdk/debian/control.in
@@ -13,7 +13,7 @@ Standards-Version: 3.7.2
 Package: kdesdk
 Architecture: all
 Section: kde
-Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), kdesdk-kfile-plugins (>= ${Source-Version}), kdesdk-kio-plugins (>= ${Source-Version}) | kdesvn-kio-plugins, kdesdk-misc (>= ${Source-Version}), kdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), tdeunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version})
+Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), kdesdk-tdefile-plugins (>= ${Source-Version}), kdesdk-kio-plugins (>= ${Source-Version}) | kdesvn-kio-plugins, kdesdk-misc (>= ${Source-Version}), kdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), tdeunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version})
 Suggests: tdecachegrind-converters, kbabel-dev, kdesdk-doc-html
 Description: software development kit from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -162,7 +162,7 @@ Description: format converters for KCachegrind profiling visualisation tool
  This package is part of KDE, and a component of the KDE SDK module.
  See the 'kde' and 'kdesdk' packages for more information.
 
-Package: kdesdk-kfile-plugins
+Package: kdesdk-tdefile-plugins
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
diff --git a/ubuntu/lucid_automake/kdesdk/debian/kbabel-kde3.install b/ubuntu/lucid_automake/kdesdk/debian/kbabel-kde3.install
index b87665593..6eb391dd2 100644
--- a/ubuntu/lucid_automake/kdesdk/debian/kbabel-kde3.install
+++ b/ubuntu/lucid_automake/kdesdk/debian/kbabel-kde3.install
@@ -5,8 +5,8 @@ debian/tmp/opt/kde3/lib/libkbabelcommon.so.3
 debian/tmp/opt/kde3/lib/libkbabelcommon.so.3.2.0
 debian/tmp/opt/kde3/lib/libkbabeldictplugin.so.1
 debian/tmp/opt/kde3/lib/libkbabeldictplugin.so.1.2.0
-debian/tmp/opt/kde3/lib/kde3/kfile_po.la
-debian/tmp/opt/kde3/lib/kde3/kfile_po.so
+debian/tmp/opt/kde3/lib/kde3/tdefile_po.la
+debian/tmp/opt/kde3/lib/kde3/tdefile_po.so
 debian/tmp/opt/kde3/lib/kde3/pothumbnail.la
 debian/tmp/opt/kde3/lib/kde3/pothumbnail.so
 debian/tmp/opt/kde3/lib/kde3/kbabel_accelstool.la
@@ -61,9 +61,9 @@ debian/tmp/opt/kde3/share/apps/kbabel/kbabelui.rc
 debian/tmp/opt/kde3/share/apps/kbabel/regexplist.xml
 debian/tmp/opt/kde3/share/apps/kbabel/pics
 debian/tmp/opt/kde3/share/apps/kbabel/icons
-debian/tmp/opt/kde3/share/apps/kconf_update/kbabel-difftoproject.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/kbabel-project.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/kbabel-projectrename.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kbabel-difftoproject.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kbabel-project.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kbabel-projectrename.upd
 debian/tmp/opt/kde3/share/config.kcfg/kbabel.kcfg
 debian/tmp/opt/kde3/share/config.kcfg/kbprojectsettings.kcfg
 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kbabel/*.bz2
@@ -88,7 +88,7 @@ debian/tmp/opt/kde3/share/icons/locolor/32x32/apps/catalogmanager.png
 debian/tmp/opt/kde3/share/icons/locolor/32x32/apps/kbabel.png
 debian/tmp/opt/kde3/share/icons/locolor/32x32/apps/kbabeldict.png
 debian/tmp/opt/kde3/share/services/dbsearchengine.desktop
-debian/tmp/opt/kde3/share/services/kfile_po.desktop
+debian/tmp/opt/kde3/share/services/tdefile_po.desktop
 debian/tmp/opt/kde3/share/services/pothumbnail.desktop
 debian/tmp/opt/kde3/share/services/kbabel_accelstool.desktop
 debian/tmp/opt/kde3/share/services/kbabel_argstool.desktop
diff --git a/ubuntu/lucid_automake/kdesdk/debian/kdesdk-kfile-plugins-kde3.install b/ubuntu/lucid_automake/kdesdk/debian/kdesdk-kfile-plugins-kde3.install
deleted file mode 100644
index 1ccf764cd..000000000
--- a/ubuntu/lucid_automake/kdesdk/debian/kdesdk-kfile-plugins-kde3.install
+++ /dev/null
@@ -1,10 +0,0 @@
-debian/tmp/opt/kde3/lib/kde3/kfile_cpp.so
-debian/tmp/opt/kde3/lib/kde3/kfile_cpp.la
-debian/tmp/opt/kde3/lib/kde3/kfile_diff.so
-debian/tmp/opt/kde3/lib/kde3/kfile_diff.la
-debian/tmp/opt/kde3/lib/kde3/kfile_ts.so
-debian/tmp/opt/kde3/lib/kde3/kfile_ts.la
-debian/tmp/opt/kde3/share/services/kfile_cpp.desktop
-debian/tmp/opt/kde3/share/services/kfile_diff.desktop
-debian/tmp/opt/kde3/share/services/kfile_h.desktop
-debian/tmp/opt/kde3/share/services/kfile_ts.desktop
diff --git a/ubuntu/lucid_automake/kdesdk/debian/kdesdk-kio-plugins-kde3.docs b/ubuntu/lucid_automake/kdesdk/debian/kdesdk-kio-plugins-kde3.docs
index bd4b4c270..ce721bb5e 100644
--- a/ubuntu/lucid_automake/kdesdk/debian/kdesdk-kio-plugins-kde3.docs
+++ b/ubuntu/lucid_automake/kdesdk/debian/kdesdk-kio-plugins-kde3.docs
@@ -1 +1 @@
-kioslave/svn/README
+tdeioslave/svn/README
diff --git a/ubuntu/lucid_automake/kdesdk/debian/kdesdk-tdefile-plugins-kde3.install b/ubuntu/lucid_automake/kdesdk/debian/kdesdk-tdefile-plugins-kde3.install
new file mode 100644
index 000000000..5f8fe9038
--- /dev/null
+++ b/ubuntu/lucid_automake/kdesdk/debian/kdesdk-tdefile-plugins-kde3.install
@@ -0,0 +1,10 @@
+debian/tmp/opt/kde3/lib/kde3/tdefile_cpp.so
+debian/tmp/opt/kde3/lib/kde3/tdefile_cpp.la
+debian/tmp/opt/kde3/lib/kde3/tdefile_diff.so
+debian/tmp/opt/kde3/lib/kde3/tdefile_diff.la
+debian/tmp/opt/kde3/lib/kde3/tdefile_ts.so
+debian/tmp/opt/kde3/lib/kde3/tdefile_ts.la
+debian/tmp/opt/kde3/share/services/tdefile_cpp.desktop
+debian/tmp/opt/kde3/share/services/tdefile_diff.desktop
+debian/tmp/opt/kde3/share/services/tdefile_h.desktop
+debian/tmp/opt/kde3/share/services/tdefile_ts.desktop
diff --git a/ubuntu/lucid_automake/kdesdk/debian/rules b/ubuntu/lucid_automake/kdesdk/debian/rules
index 64c2cd3e0..3c055b1e1 100755
--- a/ubuntu/lucid_automake/kdesdk/debian/rules
+++ b/ubuntu/lucid_automake/kdesdk/debian/rules
@@ -59,10 +59,10 @@ binary-install/kdesdk-scripts-kde3::
 binary-install/kdesdk-misc-kde3::
 	install -p -D -m644 kdeaccounts-plugin/README \
 		debian/kdesdk-misc-kde3/opt/kde3/share/doc/kdesdk-misc/README.kdeaccounts-plugin
-	install -p -D -m644 kioslave/svn/AUTHORS \
-		debian/kdesdk-misc-kde3/opt/kde3/share/doc/kdesdk-misc/AUTHORS.kioslave-svn
-	install -p -D -m644 kioslave/svn/README \
-		debian/kdesdk-misc-kde3/opt/kde3/share/doc/kdesdk-misc/README.kioslave-svn
+	install -p -D -m644 tdeioslave/svn/AUTHORS \
+		debian/kdesdk-misc-kde3/opt/kde3/share/doc/kdesdk-misc/AUTHORS.tdeioslave-svn
+	install -p -D -m644 tdeioslave/svn/README \
+		debian/kdesdk-misc-kde3/opt/kde3/share/doc/kdesdk-misc/README.tdeioslave-svn
 	install -p -D -m644 kprofilemethod/README \
 		debian/kdesdk-misc-kde3/opt/kde3/share/doc/kdesdk-misc/README.kprofilemethod
 	install -p -D -m644 scheck/README \