merge

12 files changed, 53 insertions, 53 deletions

diff --git a/debian/lenny/tdevelop/debian/README.Debian b/debian/lenny/tdevelop/debian/README.Debian
index cc1813032..5979808ec 100644
--- a/debian/lenny/tdevelop/debian/README.Debian
+++ b/debian/lenny/tdevelop/debian/README.Debian
@@ -1,21 +1,21 @@
-KDevelop for Debian
+TDevelop for Debian
 -------------------
 
 1. Persistent Class Store (code completion)
 -------------------------------------------
 
-The format of the Persistent Class Store (PCS) used by KDevelop for code
-completion changed in KDevelop 3.4.0. If you run into the following message
+The format of the Persistent Class Store (PCS) used by TDevelop for code
+completion changed in TDevelop 3.4.0. If you run into the following message
 
   Persistent class store will be disabled: you have a wrong version of pcs
   installed. Remove old pcs files?
 
 say "Yes" and the PCS files will be regenerated.
 
-2. Viewing manpages and documentation in KDevelop
+2. Viewing manpages and documentation in TDevelop
 -------------------------------------------------
 
-If you want to be able to view manpages and documentation within KDevelop,
-you need to install the 'tdebase-kio' plugins package.
+If you want to be able to view manpages and documentation within TDevelop,
+you need to install the 'tdebase-tdeio' plugins package.
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Sat, 02 Jun 2007 12:53:31 +0200
diff --git a/debian/lenny/tdevelop/debian/cdbs/versions.pl b/debian/lenny/tdevelop/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/debian/lenny/tdevelop/debian/cdbs/versions.pl
+++ b/debian/lenny/tdevelop/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/debian/lenny/tdevelop/debian/control b/debian/lenny/tdevelop/debian/control
index e0bbf8bb2..1b4d75580 100644
--- a/debian/lenny/tdevelop/debian/control
+++ b/debian/lenny/tdevelop/debian/control
@@ -14,13 +14,13 @@ Breaks: kdevelop-trinity (<< 4:14.0.0~)
 Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
 Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
 Description: An IDE for Unix/X11
- KDevelop is an easy to use Integrated Development Environment
+ TDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 
  project management, an advanced editor, a class browser
  and an integrated debugger.
  .
  The application wizard can generate fully functional projects
- for terminal programs and GUI programs using Qt, KDE or GNOME.
+ for terminal programs and GUI programs using TQt, Qt, TDE, KDE or GNOME.
  .
   Homepage: http://www.tdevelop.org/
 
@@ -30,15 +30,15 @@ Architecture: all
 Replaces: kdevelop-trinity-doc (<< 4:14.0.0~)
 Breaks: kdevelop-trinity-doc (<< 4:14.0.0~)
 Description: An IDE for Unix/X11 - documentation
- KDevelop is an easy to use Integrated Development Environment
+ TDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 
  project management, an advanced editor, a class browser
  and an integrated debugger.
  .
  The application wizard can generate fully functional projects
- for terminal programs and GUI programs using Qt, KDE or GNOME.
+ for terminal programs and GUI programs using TQt, Qt, TDE, KDE or GNOME.
  .
- This package contains documentation for KDevelop.
+ This package contains documentation for TDevelop.
  .
   Homepage: http://www.tdevelop.org/
 
@@ -47,15 +47,15 @@ Architecture: all
 Replaces: kdevelop-data-trinity (<< 4:14.0.0~)
 Breaks: kdevelop-data-trinity (<< 4:14.0.0~)
 Description: An IDE for Unix/X11 - data
- KDevelop is an easy to use Integrated Development Environment
+ TDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 
  project management, an advanced editor, a class browser
  and an integrated debugger.
  .
  The application wizard can generate fully functional projects
- for terminal programs and GUI programs using Qt, KDE or GNOME.
+ for terminal programs and GUI programs using TQt, Qt, TDE, KDE or GNOME.
  .
- This package contains arch independent data for KDevelop.
+ This package contains arch independent data for TDevelop.
  .
   Homepage: http://www.tdevelop.org/
 
@@ -65,15 +65,15 @@ Depends: tdevelop-trinity (= ${binary:Version}), tdelibs14-trinity-dev
 Replaces: kdevelop-trinity-dev (<< 4:14.0.0~)
 Breaks: kdevelop-trinity-dev (<< 4:14.0.0~)
 Description: An IDE for Unix/X11 - development files
- KDevelop is an easy to use Integrated Development Environment
+ TDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 
  project management, an advanced editor, a class browser
  and an integrated debugger.
  .
  The application wizard can generate fully functional projects
- for terminal programs and GUI programs using Qt, KDE or GNOME.
+ for terminal programs and GUI programs using TQt, Qt, TDE, KDE or GNOME.
  .
- This package contains development files for KDevelop.
+ This package contains development files for TDevelop.
  .
   Homepage: http://www.tdevelop.org/
 
diff --git a/debian/lenny/tdevelop/debian/man/kdeopt.part b/debian/lenny/tdevelop/debian/man/kdeopt.part
index e8fd346a6..661b4591d 100644
--- a/debian/lenny/tdevelop/debian/man/kdeopt.part
+++ b/debian/lenny/tdevelop/debian/man/kdeopt.part
@@ -8,8 +8,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.
@@ -83,7 +83,7 @@ Set XIM server.
 .TP
 .B \-\-noxim
 Disable XIM.
-.SH KDE OPTIONS
+.SH TDE OPTIONS
 .TP
 .B \-\-caption \fI<caption>\fB
 Use `caption' as name in the titlebar.
diff --git a/debian/lenny/tdevelop/debian/man/kdevassistant.man b/debian/lenny/tdevelop/debian/man/kdevassistant.man
index 7eadfe937..05cfbd56e 100644
--- a/debian/lenny/tdevelop/debian/man/kdevassistant.man
+++ b/debian/lenny/tdevelop/debian/man/kdevassistant.man
@@ -1,9 +1,9 @@
 .TH KDEVASSISTANT 1
 .SH NAME
-kdevassistant \- KDevelop documentation viewer
+kdevassistant \- TDevelop documentation viewer
 .SH SYNOPSIS
 .B kdevdesigner
-.I [Qt-options] [KDE-options] [options]
+.I [Qt-options] [TDE-options] [options]
 .SH DESCRIPTION
 .B KDevAssistant
 is an API documentation browser with contents tree, index and full text
@@ -12,13 +12,13 @@ documentation formats:
 
 * Qt DCF format (Qt library API and tools documentation);
 
-* Doxygen .tag format (KDE libraries documentation and other generated
+* Doxygen .tag format (TDE libraries documentation and other generated
 by doxygen with tags);
 
 * DevHelp format (GTK, GNOME API documentation and other generated for
 devhelp);
 
-* KDevelopTOC format (for online html documentation);
+* TDevelopTOC format (for online html documentation);
 
 * CHM format;
 
diff --git a/debian/lenny/tdevelop/debian/man/kdevdesigner.man b/debian/lenny/tdevelop/debian/man/kdevdesigner.man
index e200ff117..43197dbbc 100644
--- a/debian/lenny/tdevelop/debian/man/kdevdesigner.man
+++ b/debian/lenny/tdevelop/debian/man/kdevdesigner.man
@@ -1,12 +1,12 @@
 .TH KDEVDESIGNER 1
 .SH NAME
-kdevdesigner \- KDE GUI Designer
+kdevdesigner \- TDE GUI Designer
 .SH SYNOPSIS
 .B kdevdesigner
-.I [Qt-options] [KDE-options] [URL]
+.I [Qt-options] [TDE-options] [URL]
 .SH DESCRIPTION
 .B KDevDesigner
-is a customised version of Qt Designer for KDE.
+is a customised version of TQt Designer for TDE.
 .SH PROGRAM OPTIONS
 .TP
 .B URL
diff --git a/debian/lenny/tdevelop/debian/man/kdevprj2tdevelop.man b/debian/lenny/tdevelop/debian/man/kdevprj2tdevelop.man
index c1f90ec97..14ff40a64 100644
--- a/debian/lenny/tdevelop/debian/man/kdevprj2tdevelop.man
+++ b/debian/lenny/tdevelop/debian/man/kdevprj2tdevelop.man
@@ -7,7 +7,7 @@ kdevprj2tdevelop \- KDevelop 2.x project converter
 .SH DESCRIPTION
 .B kdevprj2tdevelop
 is a tool for converting KDevelop 2.x projects (*.kdevprj) to the
-format used by KDevelop 3.x (*.tdevelop).
+format used by TDevelop 3.x (*.tdevelop).
 .SH PROGRAM OPTIONS
 .TP
 .B file
diff --git a/debian/lenny/tdevelop/debian/man/kdevprofileeditor.man b/debian/lenny/tdevelop/debian/man/kdevprofileeditor.man
index 40e8692e7..d33adfb50 100644
--- a/debian/lenny/tdevelop/debian/man/kdevprofileeditor.man
+++ b/debian/lenny/tdevelop/debian/man/kdevprofileeditor.man
@@ -1,10 +1,10 @@
 .TH KDEVPROFILEEDITOR 1
 .SH NAME
-kdevprofileeditor \- KDevelop profile editor
+kdevprofileeditor \- TDevelop profile editor
 .SH SYNOPSIS
 .B kdevprofileeditor
-.I [Qt-options] [KDE-options]
+.I [Qt-options] [TDE-options]
 .SH DESCRIPTION
 .B KDevProfileEditor
-is a tool for editing KDevelop profiles.
+is a tool for editing TDevelop profiles.
 .so kdeopt.part
diff --git a/debian/lenny/tdevelop/debian/man/tdevelop-htdig.man b/debian/lenny/tdevelop/debian/man/tdevelop-htdig.man
index f05491dd8..61ddc8ad7 100644
--- a/debian/lenny/tdevelop/debian/man/tdevelop-htdig.man
+++ b/debian/lenny/tdevelop/debian/man/tdevelop-htdig.man
@@ -1,13 +1,13 @@
-.TH KDEVELOP-HTDIG 1
+.TH TDEVELOP-HTDIG 1
 .SH NAME
-tdevelop-htdig \- KDevelop index generator for documentation files
+tdevelop-htdig \- TDevelop index generator for documentation files
 .SH SYNOPSIS
 .B tdevelop-htdig
-.I [Qt-options] [KDE-options] [options]
+.I [Qt-options] [TDE-options] [options]
 .SH DESCRIPTION
 .B tdevelop-htdig
 is an index generator for documentation files which is used by the 
-KDevelop integrated development environment.
+TDevelop integrated development environment.
 .SH PROGRAM OPTIONS
 .TP
 .B -c
diff --git a/debian/lenny/tdevelop/debian/man/tdevelop.man b/debian/lenny/tdevelop/debian/man/tdevelop.man
index 8da6fd6b3..43e342e6e 100644
--- a/debian/lenny/tdevelop/debian/man/tdevelop.man
+++ b/debian/lenny/tdevelop/debian/man/tdevelop.man
@@ -1,12 +1,12 @@
-.TH KDEVELOP 1
+.TH TDEVELOP 1
 .SH NAME
-tdevelop \- Integrated Development Environment for KDE
+tdevelop \- Integrated Development Environment for TDE
 .SH SYNOPSIS
 .B tdevelop
-.I [Qt-options] [KDE-options] [options] file(s)
+.I [Qt-options] [TDE-options] [options] file(s)
 .SH DESCRIPTION
-.B KDevelop
-is an integrated development environment for KDE.
+.B TDevelop
+is an integrated development environment for TDE.
 .SH PROGRAM OPTIONS
 .TP
 .B --profile \fI<profile>\fB
diff --git a/debian/lenny/tdevelop/debian/tdevelop-trinity.install b/debian/lenny/tdevelop/debian/tdevelop-trinity.install
index bc67ae475..4f53c0795 100644
--- a/debian/lenny/tdevelop/debian/tdevelop-trinity.install
+++ b/debian/lenny/tdevelop/debian/tdevelop-trinity.install
@@ -1,12 +1,12 @@
-debian/tmp/etc/trinity/tdevassistantrc
+debian/tmp/etc/trinity/kdevassistantrc
 debian/tmp/etc/trinity/tdeveloprc
 debian/tmp/opt/trinity/bin/tdevelop-htdig
-debian/tmp/opt/trinity/bin/tdevdesigner
-debian/tmp/opt/trinity/bin/tdevprofileeditor
-debian/tmp/opt/trinity/bin/tdevassistant
-debian/tmp/opt/trinity/bin/tdevprj2tdevelop
+debian/tmp/opt/trinity/bin/kdevdesigner
+debian/tmp/opt/trinity/bin/kdevprofileeditor
+debian/tmp/opt/trinity/bin/kdevassistant
+debian/tmp/opt/trinity/bin/kdevprj2tdevelop
 debian/tmp/opt/trinity/bin/tdevelop
-debian/tmp/opt/trinity/lib/tdeconf_update_bin/tdev-gen-settings-tdeconf_update
+debian/tmp/opt/trinity/lib/tdeconf_update_bin/kdev-gen-settings-tdeconf_update
 debian/tmp/opt/trinity/share/services
 debian/tmp/opt/trinity/share/servicetypes
 debian/tmp/opt/trinity/lib/trinity
diff --git a/debian/lenny/tdevelop/debian/tdevelop-trinity.menu b/debian/lenny/tdevelop/debian/tdevelop-trinity.menu
index dbf27f386..fc4e48b0c 100644
--- a/debian/lenny/tdevelop/debian/tdevelop-trinity.menu
+++ b/debian/lenny/tdevelop/debian/tdevelop-trinity.menu
@@ -1,8 +1,8 @@
-?package(tdevelop):\
+?package(tdevelop-trinity):\
         needs="X11"\
         section="Applications/Programming"\
         hints="TDE,Development"\
-        title="KDevelop"\
-        longtitle="KDevelop (Development Environment)"\
+        title="TDevelop"\
+        longtitle="TDevelop (Development Environment)"\
         icon="/opt/trinity/share/pixmaps/tdevelop.xpm"\
         command="/opt/trinity/bin/tdevelop"