Update Debian and Ubuntu packaging with the latest renaming in GIT

8 files changed, 42 insertions, 42 deletions

diff --git a/debian/wheezy/tdeaddons/debian/changelog b/debian/wheezy/tdeaddons/debian/changelog
index 8094804b6..95f287317 100644
--- a/debian/wheezy/tdeaddons/debian/changelog
+++ b/debian/wheezy/tdeaddons/debian/changelog
@@ -592,7 +592,7 @@ tdeaddons (4:3.3.2-1) unstable; urgency=low
 tdeaddons (4:3.3.1-1) unstable; urgency=medium
 
   * New upstream bugfix release.
-  * Patched .lnk kfile plugin and /usr/bin/lnkforward so that they can
+  * Patched .lnk tdefile plugin and /usr/bin/lnkforward so that they can
     distinguish between drive and path information.  Previously, lnkforward
     would lose path information altogether (and thus fail to work).
   * Removed the rellinks plugin, which is terribly broken at this stage
@@ -668,7 +668,7 @@ tdeaddons (4:3.2.0-1) unstable; urgency=low
   * New binary packages kaddressbook-plugins, kontact-plugins, ksig and
     vimpart.
   * Note that the rename dialog plugins have been merged into the
-    tdeaddons-kfile-plugins package.
+    tdeaddons-tdefile-plugins package.
 
  -- Ben Burton <bab@debian.org>  Sat, 31 Jan 2004 12:08:48 +1100
 
diff --git a/debian/wheezy/tdeaddons/debian/control b/debian/wheezy/tdeaddons/debian/control
index 52e496189..fc3e0e96b 100644
--- a/debian/wheezy/tdeaddons/debian/control
+++ b/debian/wheezy/tdeaddons/debian/control
@@ -12,7 +12,7 @@ Architecture: all
 Section: tde
 Replaces: kdeaddons-trinity (<< 4:14.0.0)
 Breaks: kdeaddons-trinity (<< 4:14.0.0)
-Depends: atlantikdesigner-trinity (>= ${Source-Version}), kaddressbook-plugins-trinity (>= ${Source-Version}), kate-plugins-trinity (>= ${Source-Version}), tdeaddons-kfile-plugins-trinity (>= ${Source-Version}), kicker-applets-trinity (>= ${Source-Version}), konq-plugins-trinity (>= ${Source-Version}), ksig-trinity (>= ${Source-Version}), noatun-plugins-trinity (>= ${Source-Version})
+Depends: atlantikdesigner-trinity (>= ${Source-Version}), kaddressbook-plugins-trinity (>= ${Source-Version}), kate-plugins-trinity (>= ${Source-Version}), tdeaddons-tdefile-plugins-trinity (>= ${Source-Version}), kicker-applets-trinity (>= ${Source-Version}), konq-plugins-trinity (>= ${Source-Version}), ksig-trinity (>= ${Source-Version}), noatun-plugins-trinity (>= ${Source-Version})
 Suggests: tdeaddons-trinity-doc-html
 Description: add-on plugins and applets provided with Trinity
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -102,11 +102,11 @@ Description: plugins for Kate, the KDE Advanced Text Editor
  This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
-Package: tdeaddons-kfile-plugins-trinity
+Package: tdeaddons-tdefile-plugins-trinity
 Architecture: any
 Section: tde
-Replaces: kdeaddons-kfile-plugins-trinity (<< 4:14.0.0)
-Breaks: kdeaddons-kfile-plugins-trinity (<< 4:14.0.0)
+Replaces: kdeaddons-tdefile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdeaddons-tdefile-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Provides: renamedlg-plugins-trinity
 Description: Trinity file dialog plugins for text files and folders
diff --git a/debian/wheezy/tdeaddons/debian/control.in b/debian/wheezy/tdeaddons/debian/control.in
index 86eedbb08..9b7f2b6f7 100644
--- a/debian/wheezy/tdeaddons/debian/control.in
+++ b/debian/wheezy/tdeaddons/debian/control.in
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdeaddons
 Architecture: all
 Section: tde
-Depends: atlantikdesigner (>= ${Source-Version}), kaddressbook-plugins (>= ${Source-Version}), kate-plugins (>= ${Source-Version}), tdeaddons-kfile-plugins (>= ${Source-Version}), kicker-applets (>= ${Source-Version}), knewsticker-scripts (>= ${Source-Version}), konq-plugins (>= ${Source-Version}), ksig (>= ${Source-Version}), noatun-plugins (>= ${Source-Version})
+Depends: atlantikdesigner (>= ${Source-Version}), kaddressbook-plugins (>= ${Source-Version}), kate-plugins (>= ${Source-Version}), tdeaddons-tdefile-plugins (>= ${Source-Version}), kicker-applets (>= ${Source-Version}), knewsticker-scripts (>= ${Source-Version}), konq-plugins (>= ${Source-Version}), ksig (>= ${Source-Version}), noatun-plugins (>= ${Source-Version})
 Suggests: tdeaddons-doc-html
 Description: add-on plugins and applets provided with KDE
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -92,7 +92,7 @@ Description: plugins for Kate, the KDE Advanced Text Editor
  This package is part of KDE, as a component of the KDE addons module.
  See the 'kde' and 'tdeaddons' packages for more information.
 
-Package: tdeaddons-kfile-plugins
+Package: tdeaddons-tdefile-plugins
 Architecture: any
 Section: tde
 Depends: ${shlibs:Depends}
diff --git a/debian/wheezy/tdeaddons/debian/man/lnkforward-trinity.1 b/debian/wheezy/tdeaddons/debian/man/lnkforward-trinity.1
index ea3010dd8..c3ebeb34d 100644
--- a/debian/wheezy/tdeaddons/debian/man/lnkforward-trinity.1
+++ b/debian/wheezy/tdeaddons/debian/man/lnkforward-trinity.1
@@ -34,7 +34,7 @@ file on the local filesystem, it must be given in the form
 Drive mappings must be supplied (via \-\-map) for any Windows drive
 referred to in the .lnk file.  See the OPTIONS section below for details.
 .PP
-This utility is used by the .lnk kfile plugin, and is
+This utility is used by the .lnk tdefile plugin, and is
 part of the official KDE add-ons module.
 .SH OPTIONS
 Below are the lnkforward-specific options.
diff --git a/debian/wheezy/tdeaddons/debian/rules b/debian/wheezy/tdeaddons/debian/rules
index e2158a506..8e8bb53a9 100755
--- a/debian/wheezy/tdeaddons/debian/rules
+++ b/debian/wheezy/tdeaddons/debian/rules
@@ -31,9 +31,9 @@ binary-install/konq-plugins-trinity::
 #		debian/konq-plugins-trinity/opt/trinity/share/man/man1/orient.py.1; \
 #	rm -rf debian/konq-plugins-trinity/opt/trinity/share/man/py;
 
-binary-install/tdeaddons-kfile-plugins-trinity::
+binary-install/tdeaddons-tdefile-plugins-trinity::
 	install -p -D -m644 renamedlgplugins/README \
-		debian/tdeaddons-kfile-plugins-trinity/opt/trinity/share/doc/tdeaddons-kfile-plugins/README.renamedlgplugins
+		debian/tdeaddons-tdefile-plugins-trinity/opt/trinity/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins
 
 binary-install/knewsticker-scripts-trinity::
 	chmod 755 debian/knewsticker-scripts-trinity/opt/trinity/share/apps/knewsticker/scripts/*.pl
diff --git a/debian/wheezy/tdeaddons/debian/tdeaddons-kfile-plugins-trinity.install b/debian/wheezy/tdeaddons/debian/tdeaddons-kfile-plugins-trinity.install
deleted file mode 100644
index 0350b2f3e..000000000
--- a/debian/wheezy/tdeaddons/debian/tdeaddons-kfile-plugins-trinity.install
+++ /dev/null
@@ -1,31 +0,0 @@
-debian/tmp/opt/trinity/bin/lnkforward
-debian/tmp/opt/trinity/lib/trinity/kfile_cert.la
-debian/tmp/opt/trinity/lib/trinity/kfile_cert.so
-debian/tmp/opt/trinity/lib/trinity/kfile_desktop.la
-debian/tmp/opt/trinity/lib/trinity/kfile_desktop.so
-debian/tmp/opt/trinity/lib/trinity/kfile_folder.la
-debian/tmp/opt/trinity/lib/trinity/kfile_folder.so
-debian/tmp/opt/trinity/lib/trinity/kfile_html.la
-debian/tmp/opt/trinity/lib/trinity/kfile_html.so
-debian/tmp/opt/trinity/lib/trinity/kfile_lnk.la
-debian/tmp/opt/trinity/lib/trinity/kfile_lnk.so
-debian/tmp/opt/trinity/lib/trinity/kfile_mhtml.la
-debian/tmp/opt/trinity/lib/trinity/kfile_mhtml.so
-debian/tmp/opt/trinity/lib/trinity/kfile_txt.la
-debian/tmp/opt/trinity/lib/trinity/kfile_txt.so
-debian/tmp/opt/trinity/lib/trinity/librenaudioplugin.la
-debian/tmp/opt/trinity/lib/trinity/librenaudioplugin.so
-debian/tmp/opt/trinity/lib/trinity/librenimageplugin.la
-debian/tmp/opt/trinity/lib/trinity/librenimageplugin.so
-debian/tmp/opt/trinity/share/applnk/.hidden/lnkforward.desktop
-debian/tmp/opt/trinity/share/mimelnk/application/x-win-lnk.desktop
-debian/tmp/opt/trinity/share/services/kfile_cert.desktop
-debian/tmp/opt/trinity/share/services/kfile_desktop.desktop
-debian/tmp/opt/trinity/share/services/kfile_folder.desktop
-debian/tmp/opt/trinity/share/services/kfile_html.desktop
-debian/tmp/opt/trinity/share/services/kfile_lnk.desktop
-debian/tmp/opt/trinity/share/services/kfile_mhtml.desktop
-debian/tmp/opt/trinity/share/services/kfile_txt.desktop
-debian/tmp/opt/trinity/share/services/renaudiodlg.desktop
-debian/tmp/opt/trinity/share/services/renimagedlg.desktop
-kfile-plugins/lnk/README /opt/trinity/share/doc/tdeaddons-kfile-plugins/lnk
diff --git a/debian/wheezy/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install b/debian/wheezy/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install
new file mode 100644
index 000000000..70f735948
--- /dev/null
+++ b/debian/wheezy/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install
@@ -0,0 +1,31 @@
+debian/tmp/opt/trinity/bin/lnkforward
+debian/tmp/opt/trinity/lib/trinity/tdefile_cert.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_cert.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_desktop.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_desktop.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_folder.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_folder.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_html.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_html.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_lnk.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_lnk.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_mhtml.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_mhtml.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_txt.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_txt.so
+debian/tmp/opt/trinity/lib/trinity/librenaudioplugin.la
+debian/tmp/opt/trinity/lib/trinity/librenaudioplugin.so
+debian/tmp/opt/trinity/lib/trinity/librenimageplugin.la
+debian/tmp/opt/trinity/lib/trinity/librenimageplugin.so
+debian/tmp/opt/trinity/share/applnk/.hidden/lnkforward.desktop
+debian/tmp/opt/trinity/share/mimelnk/application/x-win-lnk.desktop
+debian/tmp/opt/trinity/share/services/tdefile_cert.desktop
+debian/tmp/opt/trinity/share/services/tdefile_desktop.desktop
+debian/tmp/opt/trinity/share/services/tdefile_folder.desktop
+debian/tmp/opt/trinity/share/services/tdefile_html.desktop
+debian/tmp/opt/trinity/share/services/tdefile_lnk.desktop
+debian/tmp/opt/trinity/share/services/tdefile_mhtml.desktop
+debian/tmp/opt/trinity/share/services/tdefile_txt.desktop
+debian/tmp/opt/trinity/share/services/renaudiodlg.desktop
+debian/tmp/opt/trinity/share/services/renimagedlg.desktop
+tdefile-plugins/lnk/README /opt/trinity/share/doc/tdeaddons-tdefile-plugins/lnk
diff --git a/debian/wheezy/tdeaddons/debian/tdeaddons-kfile-plugins-trinity.manpages b/debian/wheezy/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages
index eda9949fb..eda9949fb 100644
--- a/debian/wheezy/tdeaddons/debian/tdeaddons-kfile-plugins-trinity.manpages
+++ b/debian/wheezy/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages