merge

6 files changed, 29 insertions, 29 deletions

diff --git a/ubuntu/maverick/applications/tdesvn/debian/cdbs/versions.pl b/ubuntu/maverick/applications/tdesvn/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/applications/tdesvn/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/tdesvn/debian/control b/ubuntu/maverick/applications/tdesvn/debian/control
index 3a9a81de1..546f06f55 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/control
+++ b/ubuntu/maverick/applications/tdesvn/debian/control
@@ -37,13 +37,13 @@ Breaks: kdesvn-kde3 (<< 4:14.0.0~), kdesvn-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version})
 Recommends: kompare-trinity, graphviz
 Suggests: khelpcenter-trinity, kdiff3-trinity
-Description: subversion client with tight KDE integration [Trinity]
- KDESvn is a graphical client for the subversion revision control
+Description: subversion client with tight TDE integration [Trinity]
+ TDESvn is a graphical client for the subversion revision control
  system (svn).
  .
  Besides offering common and advanced svn operations, it features
- a tight integration into KDE and can be embedded into other KDE 
- applications like konqueror via the KDE component technology KParts.
+ a tight integration into TDE and can be embedded into other TDE 
+ applications like konqueror via the TDE component technology KParts.
 
 Package: tdesvn-tdeio-plugins-trinity
 Section: devel
@@ -55,6 +55,6 @@ Conflicts: tdesdk-tdeio-plugins-trinity
 Description: subversion I/O slaves for Trinity
  This packages includes KIO slaves for svn, svn+file, svn+http, 
  svn+https, svn+ssh. This allows you to access subversion repositories 
- inside any KIO enabled KDE application.
+ inside any KIO enabled TDE application.
  .
  This package is part of tdesvn-trinity.
diff --git a/ubuntu/maverick/applications/tdesvn/debian/control.in b/ubuntu/maverick/applications/tdesvn/debian/control.in
index 9df9b569f..aa173a7ae 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/control.in
+++ b/ubuntu/maverick/applications/tdesvn/debian/control.in
@@ -38,13 +38,13 @@ Breaks: tdesvn-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version})
 Recommends: kompare-trinity, graphviz
 Suggests: khelpcenter-trinity, kdiff3-trinity
-Description: subversion client with tight KDE integration [Trinity]
- KDESvn is a graphical client for the subversion revision control
+Description: subversion client with tight TDE integration [Trinity]
+ TDESvn is a graphical client for the subversion revision control
  system (svn).
  .
  Besides offering common and advanced svn operations, it features
- a tight integration into KDE and can be embedded into other KDE 
- applications like konqueror via the KDE component technology KParts.
+ a tight integration into TDE and can be embedded into other TDE 
+ applications like konqueror via the TDE component technology KParts.
 
 Package: tdesvn-tdeio-plugins-trinity
 Section: devel
@@ -56,6 +56,6 @@ Conflicts: tdesdk-tdeio-plugins-trinity
 Description: subversion I/O slaves for Trinity
  This packages includes KIO slaves for svn, svn+file, svn+http, 
  svn+https, svn+ssh. This allows you to access subversion repositories 
- inside any KIO enabled KDE application.
+ inside any KIO enabled TDE application.
  .
  This package is part of tdesvn-trinity.
diff --git a/ubuntu/maverick/applications/tdesvn/debian/man/tdesvn.1 b/ubuntu/maverick/applications/tdesvn/debian/man/tdesvn.1
index bc8ceb053..7a4db503b 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/man/tdesvn.1
+++ b/ubuntu/maverick/applications/tdesvn/debian/man/tdesvn.1
@@ -1,18 +1,18 @@
 .\" This file was generated by kdemangen.pl
-.TH KDESVN 1 "Dez 2005" "K Desktop Environment" "A Subversion Client for KDE (standalone application)"
+.TH TDESVN 1 "Dez 2005" "Trinity Desktop Environment" "A Subversion Client for TDE (standalone application)"
 .SH NAME
 tdesvn
-\- A Subversion client for KDE (standalone application)
+\- A Subversion client for TDE (standalone application)
 .SH SYNOPSIS
-tdesvn [Qt\-options] [KDE\-options] [options] exec <command> [URL] 
+tdesvn [Qt\-options] [TDE\-options] [options] exec <command> [URL] 
 .SH DESCRIPTION
-A Subversion client for KDE (standalone application)
+A Subversion client for TDE (standalone application)
 .SH OPTIONS
 .SS
 .SS Arguments:
 .TP
 .B exec
-<command>            Execute subversion command ("exec help" for more information, opens KDE Help Center)
+<command>            Execute subversion command ("exec help" for more information, opens TDE Help Center)
 .TP
 .B URL
 Path to local working copy or a repository.
@@ -38,8 +38,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -56,7 +56,7 @@ Show license information
 .B  \-\-  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -158,7 +158,7 @@ tdesvn file:///path/to/local/working/copy
 tdesvn http://remote/svn/project/trunk
 
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/tdesvn/
 directly into konqueror or you can run 
 .BR "`khelpcenter help:/tdesvn/'"
diff --git a/ubuntu/maverick/applications/tdesvn/debian/man/tdesvnaskpass.1 b/ubuntu/maverick/applications/tdesvn/debian/man/tdesvnaskpass.1
index 053bb8cdd..e19bcaf04 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/man/tdesvnaskpass.1
+++ b/ubuntu/maverick/applications/tdesvn/debian/man/tdesvnaskpass.1
@@ -1,10 +1,10 @@
 .\" This file was generated by kdemangen.pl
-.TH KDESVNASKPASS 1 "Aug 2005" "K Desktop Environment" "ssh-askpass for tdesvn"
+.TH TDESVNASKPASS 1 "Aug 2005" "Trinity Desktop Environment" "ssh-askpass for tdesvn"
 .SH NAME
 tdesvnaskpass
 \- ssh-askpass for tdesvn
 .SH SYNOPSIS
-tdesvnaskpass [Qt\-options] [KDE\-options] [prompt] 
+tdesvnaskpass [Qt\-options] [TDE\-options] [prompt] 
 .SH DESCRIPTION
 ssh-askpass for tdesvn. 
 .SH OPTIONS
@@ -21,8 +21,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -39,7 +39,7 @@ Show license information
 .B  \-\-  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
diff --git a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.menu b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.menu
index c91c6ddce..5d045b145 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.menu
+++ b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.menu
@@ -1,4 +1,4 @@
-?package(tdesvn):\
+?package(tdesvn-trinity):\
   needs="X11"\
   section="Applications/Programming"\
   hints="TDE,Version control"\