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

3 files changed, 19 insertions, 19 deletions

diff --git a/ubuntu/maverick/dependencies/arts/debian/cdbs/versions.pl b/ubuntu/maverick/dependencies/arts/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/dependencies/arts/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/dependencies/arts/debian/cdbs/versions.pl
@@ -13,7 +13,7 @@ my ($version2, $version2_next);
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
 ($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
 
-print "KDE-Version3=$version3\n";
-print "KDE-Version2=$version2\n";
-print "KDE-Next-Version3=$version3_next\n";
-print "KDE-Next-Version2=$version2_next\n";
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/maverick/dependencies/arts/debian/control b/ubuntu/maverick/dependencies/arts/debian/control
index 1f75a2337..ac606b173 100644
--- a/ubuntu/maverick/dependencies/arts/debian/control
+++ b/ubuntu/maverick/dependencies/arts/debian/control
@@ -51,7 +51,7 @@ Description: aRts sound system core components
  with aRts is recommended.
  .
  This package is part of TDE, and a component of the TDE aRts module.
- See the 'kde-trinity' and 'arts-trinity' packages for more information.
+ See the 'tde-trinity' and 'arts-trinity' packages for more information.
 
 Package: libarts1-trinity-dev
 Architecture: any
@@ -64,7 +64,7 @@ Description: development files for the aRts sound system core components
  use the aRts sound system.
  .
  This package is part of TDE, and a component of the TDE aRts module.
- See the 'kde-trinity' and 'arts-trinity' packages for more information.
+ See the 'tde-trinity' and 'arts-trinity' packages for more information.
 
 Package: libartsc0-trinity
 Architecture: any
@@ -77,7 +77,7 @@ Description: aRts sound system C support library
  This package contains the C bindings for the aRts sound daemon.
  .
  This package is part of TDE, and a component of the TDE aRts module.
- See the 'kde-trinity' and 'arts-trinity' packages for more information.
+ See the 'tde-trinity' and 'arts-trinity' packages for more information.
 
 Package: libartsc0-trinity-dev
 Architecture: any
@@ -90,7 +90,7 @@ Description: development files for the aRts sound system C support library
  use the aRts sound daemon's C bindings.
  .
  This package is part of TDE, and a component of the TDE aRts module.
- See the 'kde-trinity' and 'arts-trinity' packages for more information.
+ See the 'tde-trinity' and 'arts-trinity' packages for more information.
 
 Package: arts-trinity-dbg
 Section: libdevel
diff --git a/ubuntu/maverick/dependencies/arts/debian/control.in b/ubuntu/maverick/dependencies/arts/debian/control.in
index 893e3ac5b..655f09633 100644
--- a/ubuntu/maverick/dependencies/arts/debian/control.in
+++ b/ubuntu/maverick/dependencies/arts/debian/control.in
@@ -18,14 +18,14 @@ Package: arts
 Architecture: all
 Section: sound
 Depends: libartsc0 (>= ${source:Version}), libarts1c2a (>= ${source:Version})
-Description: sound system from the official KDE release
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+Description: sound system from the official TDE release
+ TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
  contemporary functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
  This metapackage includes the complete aRts sound system, without
- development packages. aRts is the core sound system for KDE.
+ development packages. aRts is the core sound system for TDE.
 
 Package: libarts1c2a
 Architecture: any
@@ -48,8 +48,8 @@ Description: aRts sound system core components
  improve performance and help maintain uninterrupted playback. Its use
  with aRts is recommended.
  .
- This package is part of KDE, and a component of the KDE aRts module.
- See the 'kde' and 'arts' packages for more information.
+ This package is part of TDE, and a component of the TDE aRts module.
+ See the 'tde' and 'arts' packages for more information.
 
 Package: libarts1-dev
 Architecture: any
@@ -61,8 +61,8 @@ Description: development files for the aRts sound system core components
  This package contains the header files needed to build applications that
  use the aRts sound system.
  .
- This package is part of KDE, and a component of the KDE aRts module.
- See the 'kde' and 'arts' packages for more information.
+ This package is part of TDE, and a component of the TDE aRts module.
+ See the 'tde' and 'arts' packages for more information.
 
 Package: libartsc0
 Architecture: any
@@ -73,8 +73,8 @@ Replaces: libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0)
 Description: aRts sound system C support library
  This package contains the C bindings for the aRts sound daemon.
  .
- This package is part of KDE, and a component of the KDE aRts module.
- See the 'kde' and 'arts' packages for more information.
+ This package is part of TDE, and a component of the TDE aRts module.
+ See the 'tde' and 'arts' packages for more information.
 
 Package: libartsc0-dev
 Architecture: any
@@ -86,8 +86,8 @@ Description: development files for the aRts sound system C support library
  This package contains the header files needed to build applications that
  use the aRts sound daemon's C bindings.
  .
- This package is part of KDE, and a component of the KDE aRts module.
- See the 'kde' and 'arts' packages for more information.
+ This package is part of TDE, and a component of the TDE aRts module.
+ See the 'tde' and 'arts' packages for more information.
 
 Package: arts-dbg
 Section: libdevel