Update Debian and Ubuntu packaging with the latest renaming in GIT

7 files changed, 72 insertions, 72 deletions

diff --git a/ubuntu/precise/kdegraphics.automake/debian/changelog b/ubuntu/precise/kdegraphics.automake/debian/changelog
index 38be59fe0..970ec4d7f 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/changelog
+++ b/ubuntu/precise/kdegraphics.automake/debian/changelog
@@ -593,7 +593,7 @@ kdegraphics (4:3.5.0-1) alioth; urgency=low
 
   * Add the new kfaxview package.
 
-  * Add build-depends on libpoppler-qt-dev to build the kfile_pdf info plugin.
+  * Add build-depends on libpoppler-qt-dev to build the tdefile_pdf info plugin.
 
   * Remove obsolete replaces against package versions not
     present in Sarge.
@@ -716,7 +716,7 @@ kdegraphics (4:3.4.1-0ubuntu1) breezy; urgency=low
 
   * Update version number due to KDE 3.4.1 release
   * Move remove xpdf-utils depend on kpdf, add as 
-    suggests on kdegraphics-kfile-plugins
+    suggests on kdegraphics-tdefile-plugins
   * Add all packages back to meta package
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue, 31 May 2005 16:33:00 +0000
@@ -1143,7 +1143,7 @@ kdegraphics (4:2.2.2-6) unstable; urgency=low
     Alternately, the "I'm-under-peer-pressure-to-give-this-a-name" release,
     or the "no-notice-NMUs-suck-donkey-balls" release (hi lamont!).
   * Acknowledge lamont's NMU. (closes: #125871, #125956)
-  * kamera/kioslave/kamera.cpp:
+  * kamera/tdeioslave/kamera.cpp:
     - Apply patch to fix dodgy Canon camera drivers. (closes: #125873).
   * debian/rules:
     - Build with a different builddir to srcdir, thanks to Eray Ozkural.
diff --git a/ubuntu/precise/kdegraphics.automake/debian/control b/ubuntu/precise/kdegraphics.automake/debian/control
index 9b2fe98a7..f1c7e1a79 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/control
+++ b/ubuntu/precise/kdegraphics.automake/debian/control
@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdegraphics-trinity (<< 4:14.0.0)
 Breaks: kdegraphics-trinity (<< 4:14.0.0)
-Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), kdegraphics-kfile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
+Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), kdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
 Suggests: kdegraphics-trinity-doc-html (>= ${source:Version})
 Description: graphics apps from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -84,11 +84,11 @@ Description: development files for the KDE graphics module
  This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
-Package: kdegraphics-kfile-plugins-trinity
+Package: kdegraphics-tdefile-plugins-trinity
 Section: tde
 Architecture: any
-Replaces: kdegraphics-kfile-plugins-trinity (<< 4:14.0.0)
-Breaks: kdegraphics-kfile-plugins-trinity (<< 4:14.0.0)
+Replaces: kdegraphics-tdefile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdegraphics-tdefile-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Description: KDE metainfo plugins for graphic files
  This packages provides meta information for graphic files (file sizes,
diff --git a/ubuntu/precise/kdegraphics.automake/debian/control.in b/ubuntu/precise/kdegraphics.automake/debian/control.in
index af6d981bb..e28272337 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/control.in
+++ b/ubuntu/precise/kdegraphics.automake/debian/control.in
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: kdegraphics
 Section: tde
 Architecture: all
-Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), kdegraphics-kfile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), kiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
+Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), kdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), kiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
 Suggests: kdegraphics-doc-html (>= ${source:Version})
 Description: graphics apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -74,7 +74,7 @@ Description: development files for the KDE graphics module
  This package is part of KDE, as a component of the KDE graphics module.
  See the 'kde' and 'kdegraphics' packages for more information.
 
-Package: kdegraphics-kfile-plugins
+Package: kdegraphics-tdefile-plugins
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install b/ubuntu/precise/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install
deleted file mode 100644
index d7a77267e..000000000
--- a/ubuntu/precise/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install
+++ /dev/null
@@ -1,57 +0,0 @@
-debian/tmp/opt/trinity/lib/trinity/gsthumbnail.la
-debian/tmp/opt/trinity/lib/trinity/gsthumbnail.so
-debian/tmp/opt/trinity/lib/trinity/kfile_bmp.la
-debian/tmp/opt/trinity/lib/trinity/kfile_bmp.so
-debian/tmp/opt/trinity/lib/trinity/kfile_dds.la
-debian/tmp/opt/trinity/lib/trinity/kfile_dds.so
-debian/tmp/opt/trinity/lib/trinity/kfile_dvi.la
-debian/tmp/opt/trinity/lib/trinity/kfile_dvi.so
-debian/tmp/opt/trinity/lib/trinity/kfile_exr.la
-debian/tmp/opt/trinity/lib/trinity/kfile_exr.so
-debian/tmp/opt/trinity/lib/trinity/kfile_gif.la
-debian/tmp/opt/trinity/lib/trinity/kfile_gif.so
-debian/tmp/opt/trinity/lib/trinity/kfile_ico.la
-debian/tmp/opt/trinity/lib/trinity/kfile_ico.so
-debian/tmp/opt/trinity/lib/trinity/kfile_jpeg.la
-debian/tmp/opt/trinity/lib/trinity/kfile_jpeg.so
-debian/tmp/opt/trinity/lib/trinity/kfile_pcx.la
-debian/tmp/opt/trinity/lib/trinity/kfile_pcx.so
-debian/tmp/opt/trinity/lib/trinity/kfile_pdf.la
-debian/tmp/opt/trinity/lib/trinity/kfile_pdf.so
-debian/tmp/opt/trinity/lib/trinity/kfile_png.la
-debian/tmp/opt/trinity/lib/trinity/kfile_png.so
-debian/tmp/opt/trinity/lib/trinity/kfile_pnm.la
-debian/tmp/opt/trinity/lib/trinity/kfile_pnm.so
-debian/tmp/opt/trinity/lib/trinity/kfile_ps.la
-debian/tmp/opt/trinity/lib/trinity/kfile_ps.so
-debian/tmp/opt/trinity/lib/trinity/kfile_raw.la
-debian/tmp/opt/trinity/lib/trinity/kfile_raw.so
-debian/tmp/opt/trinity/lib/trinity/kfile_rgb.la
-debian/tmp/opt/trinity/lib/trinity/kfile_rgb.so
-debian/tmp/opt/trinity/lib/trinity/kfile_tga.la
-debian/tmp/opt/trinity/lib/trinity/kfile_tga.so
-debian/tmp/opt/trinity/lib/trinity/kfile_tiff.la
-debian/tmp/opt/trinity/lib/trinity/kfile_tiff.so
-debian/tmp/opt/trinity/lib/trinity/kfile_xbm.la
-debian/tmp/opt/trinity/lib/trinity/kfile_xbm.so
-debian/tmp/opt/trinity/lib/trinity/kfile_xpm.la
-debian/tmp/opt/trinity/lib/trinity/kfile_xpm.so
-debian/tmp/opt/trinity/share/services/gsthumbnail.desktop
-debian/tmp/opt/trinity/share/services/kfile_bmp.desktop
-debian/tmp/opt/trinity/share/services/kfile_dds.desktop
-debian/tmp/opt/trinity/share/services/kfile_dvi.desktop
-debian/tmp/opt/trinity/share/services/kfile_exr.desktop
-debian/tmp/opt/trinity/share/services/kfile_gif.desktop
-debian/tmp/opt/trinity/share/services/kfile_ico.desktop
-debian/tmp/opt/trinity/share/services/kfile_jpeg.desktop
-debian/tmp/opt/trinity/share/services/kfile_pcx.desktop
-debian/tmp/opt/trinity/share/services/kfile_pdf.desktop
-debian/tmp/opt/trinity/share/services/kfile_png.desktop
-debian/tmp/opt/trinity/share/services/kfile_pnm.desktop
-debian/tmp/opt/trinity/share/services/kfile_ps.desktop
-debian/tmp/opt/trinity/share/services/kfile_raw.desktop
-debian/tmp/opt/trinity/share/services/kfile_rgb.desktop
-debian/tmp/opt/trinity/share/services/kfile_tga.desktop
-debian/tmp/opt/trinity/share/services/kfile_tiff.desktop
-debian/tmp/opt/trinity/share/services/kfile_xbm.desktop
-debian/tmp/opt/trinity/share/services/kfile_xpm.desktop
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kdegraphics-tdefile-plugins-trinity.install b/ubuntu/precise/kdegraphics.automake/debian/kdegraphics-tdefile-plugins-trinity.install
new file mode 100644
index 000000000..02ffc23c6
--- /dev/null
+++ b/ubuntu/precise/kdegraphics.automake/debian/kdegraphics-tdefile-plugins-trinity.install
@@ -0,0 +1,57 @@
+debian/tmp/opt/trinity/lib/trinity/gsthumbnail.la
+debian/tmp/opt/trinity/lib/trinity/gsthumbnail.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_bmp.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_bmp.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_dds.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_dds.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_dvi.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_dvi.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_exr.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_exr.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_gif.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_gif.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_ico.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_ico.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_jpeg.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_jpeg.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_pcx.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_pcx.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_pdf.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_pdf.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_png.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_png.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_pnm.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_pnm.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_ps.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_ps.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_raw.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_raw.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_rgb.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_rgb.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_tga.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_tga.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_tiff.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_tiff.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_xbm.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_xbm.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_xpm.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_xpm.so
+debian/tmp/opt/trinity/share/services/gsthumbnail.desktop
+debian/tmp/opt/trinity/share/services/tdefile_bmp.desktop
+debian/tmp/opt/trinity/share/services/tdefile_dds.desktop
+debian/tmp/opt/trinity/share/services/tdefile_dvi.desktop
+debian/tmp/opt/trinity/share/services/tdefile_exr.desktop
+debian/tmp/opt/trinity/share/services/tdefile_gif.desktop
+debian/tmp/opt/trinity/share/services/tdefile_ico.desktop
+debian/tmp/opt/trinity/share/services/tdefile_jpeg.desktop
+debian/tmp/opt/trinity/share/services/tdefile_pcx.desktop
+debian/tmp/opt/trinity/share/services/tdefile_pdf.desktop
+debian/tmp/opt/trinity/share/services/tdefile_png.desktop
+debian/tmp/opt/trinity/share/services/tdefile_pnm.desktop
+debian/tmp/opt/trinity/share/services/tdefile_ps.desktop
+debian/tmp/opt/trinity/share/services/tdefile_raw.desktop
+debian/tmp/opt/trinity/share/services/tdefile_rgb.desktop
+debian/tmp/opt/trinity/share/services/tdefile_tga.desktop
+debian/tmp/opt/trinity/share/services/tdefile_tiff.desktop
+debian/tmp/opt/trinity/share/services/tdefile_xbm.desktop
+debian/tmp/opt/trinity/share/services/tdefile_xpm.desktop
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kghostview-trinity.install b/ubuntu/precise/kdegraphics.automake/debian/kghostview-trinity.install
index 59cf101cf..d19c5d2c9 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/kghostview-trinity.install
+++ b/ubuntu/precise/kdegraphics.automake/debian/kghostview-trinity.install
@@ -4,8 +4,8 @@ debian/tmp/opt/trinity/lib/trinity/libkghostviewpart.so
 debian/tmp/opt/trinity/lib/libkghostviewlib.so.0
 debian/tmp/opt/trinity/lib/libkghostviewlib.so.0.0.0
 debian/tmp/opt/trinity/share/applications/tde/kghostview.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/kghostview.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/update-to-xt-names.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kghostview.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/update-to-xt-names.pl
 debian/tmp/opt/trinity/share/apps/kghostview/kghostviewui.rc
 debian/tmp/opt/trinity/share/apps/kghostview/kgv_part.rc
 debian/tmp/opt/trinity/share/apps/kghostview/pdf_sec.ps
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kview-trinity.install b/ubuntu/precise/kdegraphics.automake/debian/kview-trinity.install
index dac3ba875..6a8052e6d 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/kview-trinity.install
+++ b/ubuntu/precise/kdegraphics.automake/debian/kview-trinity.install
@@ -52,10 +52,10 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kview.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kview.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kview.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kview.png
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kviewcanvasconfig.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kviewgeneralconfig.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kviewpluginsconfig.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kviewviewerpluginsconfig.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewcanvasconfig.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewgeneralconfig.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewpluginsconfig.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewviewerpluginsconfig.desktop
 debian/tmp/opt/trinity/share/services/kviewcanvas.desktop
 debian/tmp/opt/trinity/share/services/kviewviewer.desktop
 debian/tmp/opt/trinity/share/services/photobook.desktop