Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

4 files changed, 13 insertions, 13 deletions

diff --git a/ubuntu/maverick/applications/krusader/debian/changelog b/ubuntu/maverick/applications/krusader/debian/changelog
index 609286530..a4c38c63d 100644
--- a/ubuntu/maverick/applications/krusader/debian/changelog
+++ b/ubuntu/maverick/applications/krusader/debian/changelog
@@ -32,7 +32,7 @@ krusader (1.90.0-1) unstable; urgency=low
   * Update my e-mail address.
   * Remove Angel Ramos from Uploaders field.
   * Bump Standard-Version to 3.7.3.
-  * Add kdebase-bin versioned dependency.
+  * Add tdebase-bin versioned dependency.
 
  -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Sun, 23 Mar 2008 15:10:45 +0100
 
@@ -119,7 +119,7 @@ krusader (1.60.0-3) unstable; urgency=low
   * Fixed gcc-4.0 compiling problem (Closes: #326789).
   * Fixed autoconf m68k and mipsel problem (Closes: #310669).
   * de.po corrected (Closes: #313785).
-  * Added kdebase-kio-plugins as suggest header (Closes: #322764).
+  * Added tdebase-kio-plugins as suggest header (Closes: #322764).
   * The problem with ps/pdf files is a kghostview problem, not
     krusader (Closes: #325130)
   * No segfault on closing the viewer with krusader 1.60 (Closes: #325170).
@@ -176,7 +176,7 @@ krusader (1.30-1.2) unstable; urgency=low
 krusader (1.30-1.1) unstable; urgency=low
 
   * NMU during BSP
-  * remove x-ace.desktop, which is also in kdelibs-data. Closes: #238052
+  * remove x-ace.desktop, which is also in tdelibs-data. Closes: #238052
  
  -- Andreas Barth <aba@not.so.argh.org>  Sun, 18 Apr 2004 11:39:32 +0200
 
@@ -283,7 +283,7 @@ krusader (0.75-2) unstable; urgency=low
 krusader (0.75-1.2) unstable; urgency=low
  
   * NMU
-  * Build against new qt/kdelibs
+  * Build against new qt/tdelibs
   * update build-depends
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 27 Feb 2001 13:35:16 -0700
diff --git a/ubuntu/maverick/applications/krusader/debian/control b/ubuntu/maverick/applications/krusader/debian/control
index 4e9f7e5f3..cf8f42e14 100644
--- a/ubuntu/maverick/applications/krusader/debian/control
+++ b/ubuntu/maverick/applications/krusader/debian/control
@@ -14,8 +14,8 @@ Replaces: krusader-kde3 (<< 4:3.5.13)
 Breaks: krusader-kde3 (<< 4:3.5.13)
 Suggests: md5deep | cfv, kedit-trinity, khexedit-trinity, konsole-trinity, kmail-trinity,
  krename-trinity, kdiff3-trinity | kompare-trinity | xxdiff, ark-trinity, arj, bzip2, cpio, lha,
- unrar | unrar-free | rar, rpm, unace, unzip, zip, p7zip, kdebase-trinity-bin,
- kdebase-kio-plugins-trinity
+ unrar | unrar-free | rar, rpm, unace, unzip, zip, p7zip, tdebase-trinity-bin,
+ tdebase-kio-plugins-trinity
 Description: twin-panel (commander-style) file manager for KDE (and other desktops)
  Krusader is a simple, easy, powerful, twin-panel (commander-style) file
  manager for KDE and other desktops, similar to Midnight Commander (C) or Total
diff --git a/ubuntu/maverick/applications/krusader/debian/copyright b/ubuntu/maverick/applications/krusader/debian/copyright
index 127bd8f63..4f0e31c89 100644
--- a/ubuntu/maverick/applications/krusader/debian/copyright
+++ b/ubuntu/maverick/applications/krusader/debian/copyright
@@ -14,27 +14,27 @@ Upstream Authors:
    Jonas Bähr <jonas.baehr@web.de>
    Matej Urbancic <matej@amis.net>
 
-iso is based on tar from kdebase:
+iso is based on tar from tdebase:
    (C) David Faure <faure@kde.org>
 
-kiso is based on ktar from kdelibs:
+kiso is based on ktar from tdelibs:
    (C) Torben Weis <weis@kde.org>
    (C) David Faure <faure@kde.org>
 
-krremoteencodingmenu is based on KRemoteEncodingPlugin from kdebase:
+krremoteencodingmenu is based on KRemoteEncodingPlugin from tdebase:
    (C) Dawit Alemayehu <adawit@kde.org>
 
 paneltabbar is based on code from k3b:
    (C) Sebastian Trueg <trueg@k3b.org>
 
-kimagefilepreview is based on code from kdelibs:
+kimagefilepreview is based on code from tdelibs:
    (C) 2001 Martin R. Jones <mjones@kde.org>
    (C) 2001 Carsten Pfeiffer <pfeiffer@kde.org>
 
-kdiskfreesp is based on code from kdelibs:
+kdiskfreesp is based on code from tdelibs:
    (C) 1999 Michael Kropfberger <michael.kropfberger@gmx.net>
 
-krprogress code is bases on code from kdelibs:
+krprogress code is bases on code from tdelibs:
    (C) 2000 Matej Koss <koss@miesto.sk>
 
 Copyright for libisofs, licensed under the GPL:
diff --git a/ubuntu/maverick/applications/krusader/debian/krusader.lintian-overrides b/ubuntu/maverick/applications/krusader/debian/krusader.lintian-overrides
index ab5986658..74c03c669 100644
--- a/ubuntu/maverick/applications/krusader/debian/krusader.lintian-overrides
+++ b/ubuntu/maverick/applications/krusader/debian/krusader.lintian-overrides
@@ -1,2 +1,2 @@
-# package depends on kdebase-bin, which provides kdesu
+# package depends on tdebase-bin, which provides kdesu
 krusader-trinity: menu-command-not-in-package /usr/share/menu/krusader:17 kdesu