Update Debian and Ubuntu packaging with the latest renaming in GIT

9 files changed, 36 insertions, 36 deletions

diff --git a/ubuntu/precise/tdesdk/debian/cervisia-trinity.install b/ubuntu/precise/tdesdk/debian/cervisia-trinity.install
index 6cee13ad2..653a67d6b 100644
--- a/ubuntu/precise/tdesdk/debian/cervisia-trinity.install
+++ b/ubuntu/precise/tdesdk/debian/cervisia-trinity.install
@@ -9,11 +9,11 @@ debian/tmp/opt/trinity/share/applications/tde/cervisia.desktop
 debian/tmp/opt/trinity/share/apps/cervisia/cervisiashellui.rc
 debian/tmp/opt/trinity/share/apps/cervisia/eventsrc
 debian/tmp/opt/trinity/share/apps/cervisiapart/cervisiaui.rc
-debian/tmp/opt/trinity/share/apps/kconf_update/cervisia.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/cervisia-change_repos_list.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/cervisia-normalize_cvsroot.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/move_repositories.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/change_colors.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/cervisia.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/cervisia-change_repos_list.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/cervisia-normalize_cvsroot.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/move_repositories.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/change_colors.pl
 debian/tmp/opt/trinity/share/config.kcfg/cervisiapart.kcfg
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/cervisia/*.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/cervisia/common
diff --git a/ubuntu/precise/tdesdk/debian/cervisia-trinity.lintian b/ubuntu/precise/tdesdk/debian/cervisia-trinity.lintian
index 4e79c02c5..a7760d061 100644
--- a/ubuntu/precise/tdesdk/debian/cervisia-trinity.lintian
+++ b/ubuntu/precise/tdesdk/debian/cervisia-trinity.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 tdeinit black magic.
 cervisia: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
diff --git a/ubuntu/precise/tdesdk/debian/control b/ubuntu/precise/tdesdk/debian/control
index 935dbf0bf..57976b778 100644
--- a/ubuntu/precise/tdesdk/debian/control
+++ b/ubuntu/precise/tdesdk/debian/control
@@ -16,7 +16,7 @@ Architecture: all
 Section: tde
 Replaces: kdesdk-trinity (<< 4:14.0.0)
 Breaks: kdesdk-trinity (<< 4:14.0.0)
-Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), tdeunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
+Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-tdefile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), tdeunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
 Suggests: tdecachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html
 Description: software development kit from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -186,13 +186,13 @@ Description: format converters for KCachegrind profiling visualisation tool
  This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
-Package: tdesdk-kfile-plugins-trinity
+Package: tdesdk-tdefile-plugins-trinity
 Architecture: any
 Section: tde
-Replaces: kdesdk-kfile-plugins-trinity (<< 4:14.0.0)
-Breaks: kdesdk-kfile-plugins-trinity (<< 4:14.0.0)
+Replaces: kdesdk-tdefile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdesdk-tdefile-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Conflicts: tdesdk-kfile-plugins
+Conflicts: tdesdk-tdefile-plugins
 Description: Trinity 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/precise/tdesdk/debian/control.in b/ubuntu/precise/tdesdk/debian/control.in
index d791b8ee8..da3e8d50a 100644
--- a/ubuntu/precise/tdesdk/debian/control.in
+++ b/ubuntu/precise/tdesdk/debian/control.in
@@ -13,7 +13,7 @@ Standards-Version: 3.7.2
 Package: tdesdk
 Architecture: all
 Section: tde
-Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-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}), tdesdk-tdefile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-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, tdesdk-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 'tdesdk' packages for more information.
 
-Package: tdesdk-kfile-plugins
+Package: tdesdk-tdefile-plugins
 Architecture: any
 Section: tde
 Depends: ${shlibs:Depends}
diff --git a/ubuntu/precise/tdesdk/debian/kbabel-trinity.install b/ubuntu/precise/tdesdk/debian/kbabel-trinity.install
index bfe62dc3a..72d23b29d 100644
--- a/ubuntu/precise/tdesdk/debian/kbabel-trinity.install
+++ b/ubuntu/precise/tdesdk/debian/kbabel-trinity.install
@@ -5,8 +5,8 @@ debian/tmp/opt/trinity/lib/libkbabelcommon.so.3
 debian/tmp/opt/trinity/lib/libkbabelcommon.so.3.2.0
 debian/tmp/opt/trinity/lib/libkbabeldictplugin.so.1
 debian/tmp/opt/trinity/lib/libkbabeldictplugin.so.1.2.0
-debian/tmp/opt/trinity/lib/trinity/kfile_po.la
-debian/tmp/opt/trinity/lib/trinity/kfile_po.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_po.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_po.so
 debian/tmp/opt/trinity/lib/trinity/pothumbnail.la
 debian/tmp/opt/trinity/lib/trinity/pothumbnail.so
 debian/tmp/opt/trinity/lib/trinity/kbabel_accelstool.la
@@ -61,9 +61,9 @@ debian/tmp/opt/trinity/share/apps/kbabel/kbabelui.rc
 debian/tmp/opt/trinity/share/apps/kbabel/regexplist.xml
 debian/tmp/opt/trinity/share/apps/kbabel/pics
 debian/tmp/opt/trinity/share/apps/kbabel/icons
-debian/tmp/opt/trinity/share/apps/kconf_update/kbabel-difftoproject.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kbabel-project.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kbabel-projectrename.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kbabel-difftoproject.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kbabel-project.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kbabel-projectrename.upd
 debian/tmp/opt/trinity/share/config.kcfg/kbabel.kcfg
 debian/tmp/opt/trinity/share/config.kcfg/kbprojectsettings.kcfg
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.bz2
@@ -88,7 +88,7 @@ debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/catalogmanager.png
 #debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbabel.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbabeldict.png
 debian/tmp/opt/trinity/share/services/dbsearchengine.desktop
-debian/tmp/opt/trinity/share/services/kfile_po.desktop
+debian/tmp/opt/trinity/share/services/tdefile_po.desktop
 debian/tmp/opt/trinity/share/services/pothumbnail.desktop
 debian/tmp/opt/trinity/share/services/kbabel_accelstool.desktop
 debian/tmp/opt/trinity/share/services/kbabel_argstool.desktop
diff --git a/ubuntu/precise/tdesdk/debian/rules b/ubuntu/precise/tdesdk/debian/rules
index 2e37f4326..15a2da318 100755
--- a/ubuntu/precise/tdesdk/debian/rules
+++ b/ubuntu/precise/tdesdk/debian/rules
@@ -70,10 +70,10 @@ binary-install/tdesdk-scripts-trinity::
 binary-install/tdesdk-misc-trinity::
 	install -p -D -m644 kdeaccounts-plugin/README \
 		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kdeaccounts-plugin
-	install -p -D -m644 kioslave/svn/AUTHORS \
-		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/AUTHORS.kioslave-svn
-	install -p -D -m644 kioslave/svn/README \
-		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kioslave-svn
+	install -p -D -m644 tdeioslave/svn/AUTHORS \
+		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/AUTHORS.tdeioslave-svn
+	install -p -D -m644 tdeioslave/svn/README \
+		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.tdeioslave-svn
 	install -p -D -m644 kprofilemethod/README \
 		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kprofilemethod
 	install -p -D -m644 scheck/README \
diff --git a/ubuntu/precise/tdesdk/debian/tdesdk-kfile-plugins-trinity.install b/ubuntu/precise/tdesdk/debian/tdesdk-kfile-plugins-trinity.install
deleted file mode 100644
index 1ffa48c57..000000000
--- a/ubuntu/precise/tdesdk/debian/tdesdk-kfile-plugins-trinity.install
+++ /dev/null
@@ -1,10 +0,0 @@
-debian/tmp/opt/trinity/lib/trinity/kfile_cpp.so
-debian/tmp/opt/trinity/lib/trinity/kfile_cpp.la
-debian/tmp/opt/trinity/lib/trinity/kfile_diff.so
-debian/tmp/opt/trinity/lib/trinity/kfile_diff.la
-debian/tmp/opt/trinity/lib/trinity/kfile_ts.so
-debian/tmp/opt/trinity/lib/trinity/kfile_ts.la
-debian/tmp/opt/trinity/share/services/kfile_cpp.desktop
-debian/tmp/opt/trinity/share/services/kfile_diff.desktop
-debian/tmp/opt/trinity/share/services/kfile_h.desktop
-debian/tmp/opt/trinity/share/services/kfile_ts.desktop
diff --git a/ubuntu/precise/tdesdk/debian/tdesdk-kio-plugins-trinity.docs b/ubuntu/precise/tdesdk/debian/tdesdk-kio-plugins-trinity.docs
index bd4b4c270..ce721bb5e 100644
--- a/ubuntu/precise/tdesdk/debian/tdesdk-kio-plugins-trinity.docs
+++ b/ubuntu/precise/tdesdk/debian/tdesdk-kio-plugins-trinity.docs
@@ -1 +1 @@
-kioslave/svn/README
+tdeioslave/svn/README
diff --git a/ubuntu/precise/tdesdk/debian/tdesdk-tdefile-plugins-trinity.install b/ubuntu/precise/tdesdk/debian/tdesdk-tdefile-plugins-trinity.install
new file mode 100644
index 000000000..3a1f0630d
--- /dev/null
+++ b/ubuntu/precise/tdesdk/debian/tdesdk-tdefile-plugins-trinity.install
@@ -0,0 +1,10 @@
+debian/tmp/opt/trinity/lib/trinity/tdefile_cpp.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_cpp.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_diff.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_diff.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_ts.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_ts.la
+debian/tmp/opt/trinity/share/services/tdefile_cpp.desktop
+debian/tmp/opt/trinity/share/services/tdefile_diff.desktop
+debian/tmp/opt/trinity/share/services/tdefile_h.desktop
+debian/tmp/opt/trinity/share/services/tdefile_ts.desktop