merge

5 files changed, 15 insertions, 15 deletions

diff --git a/ubuntu/maverick/applications/rosegarden/debian/cdbs/versions.pl b/ubuntu/maverick/applications/rosegarden/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/applications/rosegarden/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/applications/rosegarden/debian/control b/ubuntu/maverick/applications/rosegarden/debian/control
index a63d10ebb..a102a8de2 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/control
+++ b/ubuntu/maverick/applications/rosegarden/debian/control
@@ -16,7 +16,7 @@ Breaks: rosegarden-kde3 (<< 4:14.0.0~), rosegarden-trinity (<< 4:14.0.0~)
 Recommends: jackd, lilypond, swh-plugins | ladspa-plugin
 Suggests: qjackctl
 Description: music editor and MIDI/audio sequencer [Trinity]
- Rosegarden is a KDE application which provides a mixed Audio/MIDI
+ Rosegarden is a TDE application which provides a mixed Audio/MIDI
  sequencer (for playback and recording), a multi-track editor, music
  editing using both piano-roll and score notation, MIDI file IO,
  lilypond and Csound files export, etc.
@@ -28,7 +28,7 @@ Replaces: rosegarden-data-kde3 (<< 4:14.0.0~), rosegarden-data-trinity (<< 4:14.
 Breaks: rosegarden-data-kde3 (<< 4:14.0.0~), rosegarden-data-trinity (<< 4:14.0.0~)
 Priority: optional
 Description: music editor and MIDI/audio sequencer data files [Trinity]
- Rosegarden is a KDE application which provides a mixed Audio/MIDI
+ Rosegarden is a TDE application which provides a mixed Audio/MIDI
  sequencer (for playback and recording), a multi-track editor, music
  editing using both piano-roll and score notation, MIDI file IO,
  lilypond and Csound files export, etc.
diff --git a/ubuntu/maverick/applications/rosegarden/debian/control.in b/ubuntu/maverick/applications/rosegarden/debian/control.in
index 2ffe952e0..16124947d 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/control.in
+++ b/ubuntu/maverick/applications/rosegarden/debian/control.in
@@ -16,7 +16,7 @@ Breaks: rosegarden-kde3 (<< 4:3.5.13)
 Recommends: jackd, lilypond, swh-plugins | ladspa-plugin
 Suggests: qjackctl
 Description: music editor and MIDI/audio sequencer [Trinity]
- Rosegarden is a KDE application which provides a mixed Audio/MIDI
+ Rosegarden is a TDE application which provides a mixed Audio/MIDI
  sequencer (for playback and recording), a multi-track editor, music
  editing using both piano-roll and score notation, MIDI file IO,
  lilypond and Csound files export, etc.
@@ -28,7 +28,7 @@ Replaces: rosegarden-data-kde3 (<< 4:3.5.13)
 Breaks: rosegarden-data-kde3 (<< 4:3.5.13)
 Priority: optional
 Description: music editor and MIDI/audio sequencer data files [Trinity]
- Rosegarden is a KDE application which provides a mixed Audio/MIDI
+ Rosegarden is a TDE application which provides a mixed Audio/MIDI
  sequencer (for playback and recording), a multi-track editor, music
  editing using both piano-roll and score notation, MIDI file IO,
  lilypond and Csound files export, etc.
diff --git a/ubuntu/maverick/applications/rosegarden/debian/copyright b/ubuntu/maverick/applications/rosegarden/debian/copyright
index df2a7e77d..d86a8816a 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/copyright
+++ b/ubuntu/maverick/applications/rosegarden/debian/copyright
@@ -38,7 +38,7 @@ License:
 ----------
 
 Rosegarden is covered by the GNU General Public License. Individual
-files from the kde build system are covered by the GNU Library General
+files from the TDE build system are covered by the GNU Library General
 Public License and by a MIT license shown below.
 
 On Debian GNU/Linux systems, the complete texts of the GNU General
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden.1 b/ubuntu/maverick/applications/rosegarden/debian/rosegarden.1
index 91916b271..fe750e0b2 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden.1
+++ b/ubuntu/maverick/applications/rosegarden/debian/rosegarden.1
@@ -7,15 +7,15 @@ musical notation editor.
 
 .SH SYNOPSIS
 
-rosegarden [Qt-options] [KDE-options] [options] [File]
+rosegarden [Qt-options] [TDE-options] [options] [File]
 
-rosegardensequencer [Qt-options] [KDE-options] [playback_1 playback_2 capture_1 capture_2]
+rosegardensequencer [Qt-options] [TDE-options] [playback_1 playback_2 capture_1 capture_2]
 
 .SH DESCRIPTION
 
 This manual page documents briefly the rosegarden and rosegardensequencer commands.
 
-rosegarden is a MIDI and audio sequencer, notation editor, and general-purpose music composition and editing application for Unix and Linux. It is a KDE application, which means to build it you need the KDE 3.x libraries. However, once installed it can be run within the KDE environment or any other desktop or window manager environment.
+rosegarden is a MIDI and audio sequencer, notation editor, and general-purpose music composition and editing application for Unix and Linux. It is a TDE application, which means to build it you need the TDE libraries. However, once installed it can be run within the TDE environment or any other desktop or window manager environment.
 
 rosegardensequencer is part of the rosegarden application, the part which knows about and audio MIDI devices, and about real time. rosegardensequencer is executed automatically when rosegarden starts, so you will probably never need to execute it directly. You may want to specify command line options, though, to change the JACK ports used for audio capture and playback. In order to do that, you can invoque rosegardensequencer directly before running rosegarden, or you can specify the sequencer command line arguments using the rosegarden configuration dialog, and restarting the application. This program follows the usual GNU command line syntax, with long options starting with two dashes ('-'). A summary of options is included below.
 
@@ -29,8 +29,8 @@ rosegardensequencer is part of the rosegarden application, the part which knows
 .BR \-\-help-all
      Show all options.
 
-.BR \-\-help-kde
-     Show KDE specific options.
+.BR \-\-help-tde
+     Show TDE specific options.
 
 .BR \-\-help-qt
      Show Qt specific options.
@@ -119,7 +119,7 @@ rosegardensequencer is part of the rosegarden application, the part which knows
      Forces the application to use a TrueColor visual on an 8-bit display.
 
 
-.SH KDE OPTIONS
+.SH TDE OPTIONS
 .BR \-\-caption caption
      Use 'caption' as name in the titlebar.