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

16 files changed, 93 insertions, 93 deletions

diff --git a/ubuntu/maverick/tdevelop/debian/README.Debian b/ubuntu/maverick/tdevelop/debian/README.Debian
index cc1813032..5979808ec 100644
--- a/ubuntu/maverick/tdevelop/debian/README.Debian
+++ b/ubuntu/maverick/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/ubuntu/maverick/tdevelop/debian/cdbs/versions.pl b/ubuntu/maverick/tdevelop/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/tdevelop/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/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/ubuntu/maverick/tdevelop/debian/control b/ubuntu/maverick/tdevelop/debian/control
index 982af4d7c..9eee97afc 100644
--- a/ubuntu/maverick/tdevelop/debian/control
+++ b/ubuntu/maverick/tdevelop/debian/control
@@ -14,13 +14,13 @@ Breaks: kdevelop-kde3 (<< 4:14.0.0~), 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-kde3-doc (<< 4:14.0.0~), kdevelop-trinity-doc (<< 4:14.0.0~)
 Breaks: kdevelop-kde3-doc (<< 4:14.0.0~), 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-kde3 (<< 4:14.0.0~), kdevelop-data-trinity (<< 4:14.0.0~)
 Breaks: kdevelop-data-kde3 (<< 4:14.0.0~), 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-kde3-dev (<< 4:14.0.0~), kdevelop-trinity-dev (<< 4:14.0.0~)
 Breaks: kdevelop-kde3-dev (<< 4:14.0.0~), 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/ubuntu/maverick/tdevelop/debian/man/kdeopt.part b/ubuntu/maverick/tdevelop/debian/man/kdeopt.part
index e8fd346a6..661b4591d 100644
--- a/ubuntu/maverick/tdevelop/debian/man/kdeopt.part
+++ b/ubuntu/maverick/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/ubuntu/maverick/tdevelop/debian/man/kdevdesigner.man b/ubuntu/maverick/tdevelop/debian/man/kdevdesigner.man
deleted file mode 100644
index e200ff117..000000000
--- a/ubuntu/maverick/tdevelop/debian/man/kdevdesigner.man
+++ /dev/null
@@ -1,14 +0,0 @@
-.TH KDEVDESIGNER 1
-.SH NAME
-kdevdesigner \- KDE GUI Designer
-.SH SYNOPSIS
-.B kdevdesigner
-.I [Qt-options] [KDE-options] [URL]
-.SH DESCRIPTION
-.B KDevDesigner
-is a customised version of Qt Designer for KDE.
-.SH PROGRAM OPTIONS
-.TP
-.B URL
-Document to open.
-.so kdeopt.part
diff --git a/ubuntu/maverick/tdevelop/debian/man/kdevprj2tdevelop.man b/ubuntu/maverick/tdevelop/debian/man/kdevprj2tdevelop.man
deleted file mode 100644
index c1f90ec97..000000000
--- a/ubuntu/maverick/tdevelop/debian/man/kdevprj2tdevelop.man
+++ /dev/null
@@ -1,14 +0,0 @@
-.TH KDEVPRJ2KDEVELOP 1
-.SH NAME
-kdevprj2tdevelop \- KDevelop 2.x project converter
-.SH SYNOPSIS
-.B kdevprj2tdevelop
-.I file
-.SH DESCRIPTION
-.B kdevprj2tdevelop
-is a tool for converting KDevelop 2.x projects (*.kdevprj) to the
-format used by KDevelop 3.x (*.tdevelop).
-.SH PROGRAM OPTIONS
-.TP
-.B file
-KDevelop 2.x project to convert.
diff --git a/ubuntu/maverick/tdevelop/debian/man/kdevprofileeditor.man b/ubuntu/maverick/tdevelop/debian/man/kdevprofileeditor.man
deleted file mode 100644
index 40e8692e7..000000000
--- a/ubuntu/maverick/tdevelop/debian/man/kdevprofileeditor.man
+++ /dev/null
@@ -1,10 +0,0 @@
-.TH KDEVPROFILEEDITOR 1
-.SH NAME
-kdevprofileeditor \- KDevelop profile editor
-.SH SYNOPSIS
-.B kdevprofileeditor
-.I [Qt-options] [KDE-options]
-.SH DESCRIPTION
-.B KDevProfileEditor
-is a tool for editing KDevelop profiles.
-.so kdeopt.part
diff --git a/ubuntu/maverick/tdevelop/debian/man/kdevassistant.man b/ubuntu/maverick/tdevelop/debian/man/tdevassistant.man
index 7eadfe937..69b7ea003 100644
--- a/ubuntu/maverick/tdevelop/debian/man/kdevassistant.man
+++ b/ubuntu/maverick/tdevelop/debian/man/tdevassistant.man
@@ -1,24 +1,24 @@
-.TH KDEVASSISTANT 1
+.TH TDEVASSISTANT 1
 .SH NAME
-kdevassistant \- KDevelop documentation viewer
+tdevassistant \- TDevelop documentation viewer
 .SH SYNOPSIS
-.B kdevdesigner
-.I [Qt-options] [KDE-options] [options]
+.B tdevdesigner
+.I [Qt-options] [TDE-options] [options]
 .SH DESCRIPTION
-.B KDevAssistant
+.B TDevAssistant
 is an API documentation browser with contents tree, index and full text
 search. It provides a simple and uniform access to a variety of
 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/ubuntu/maverick/tdevelop/debian/man/tdevdesigner.man b/ubuntu/maverick/tdevelop/debian/man/tdevdesigner.man
new file mode 100644
index 000000000..dde364d75
--- /dev/null
+++ b/ubuntu/maverick/tdevelop/debian/man/tdevdesigner.man
@@ -0,0 +1,14 @@
+.TH TDEVDESIGNER 1
+.SH NAME
+tdevdesigner \- TDE GUI Designer
+.SH SYNOPSIS
+.B tdevdesigner
+.I [Qt-options] [TDE-options] [URL]
+.SH DESCRIPTION
+.B TDevDesigner
+is a customised version of Qt Designer for TDE.
+.SH PROGRAM OPTIONS
+.TP
+.B URL
+Document to open.
+.so kdeopt.part
diff --git a/ubuntu/maverick/tdevelop/debian/man/tdevelop-htdig.man b/ubuntu/maverick/tdevelop/debian/man/tdevelop-htdig.man
index f05491dd8..61ddc8ad7 100644
--- a/ubuntu/maverick/tdevelop/debian/man/tdevelop-htdig.man
+++ b/ubuntu/maverick/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/ubuntu/maverick/tdevelop/debian/man/tdevelop.man b/ubuntu/maverick/tdevelop/debian/man/tdevelop.man
index 8da6fd6b3..43e342e6e 100644
--- a/ubuntu/maverick/tdevelop/debian/man/tdevelop.man
+++ b/ubuntu/maverick/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/ubuntu/maverick/tdevelop/debian/man/tdevprj2tdevelop.man b/ubuntu/maverick/tdevelop/debian/man/tdevprj2tdevelop.man
new file mode 100644
index 000000000..bfbe3ecc1
--- /dev/null
+++ b/ubuntu/maverick/tdevelop/debian/man/tdevprj2tdevelop.man
@@ -0,0 +1,14 @@
+.TH TDEVPRJ2KDEVELOP 1
+.SH NAME
+tdevprj2tdevelop \- KDevelop 2.x project converter
+.SH SYNOPSIS
+.B tdevprj2tdevelop
+.I file
+.SH DESCRIPTION
+.B tdevprj2tdevelop
+is a tool for converting KDevelop 2.x projects (*.tdevprj) to the
+format used by TDevelop 3.x (*.tdevelop).
+.SH PROGRAM OPTIONS
+.TP
+.B file
+KDevelop 2.x project to convert.
diff --git a/ubuntu/maverick/tdevelop/debian/man/tdevprofileeditor.man b/ubuntu/maverick/tdevelop/debian/man/tdevprofileeditor.man
new file mode 100644
index 000000000..61cf5fdec
--- /dev/null
+++ b/ubuntu/maverick/tdevelop/debian/man/tdevprofileeditor.man
@@ -0,0 +1,10 @@
+.TH TDEVPROFILEEDITOR 1
+.SH NAME
+tdevprofileeditor \- TDevelop profile editor
+.SH SYNOPSIS
+.B tdevprofileeditor
+.I [Qt-options] [TDE-options]
+.SH DESCRIPTION
+.B TDevProfileEditor
+is a tool for editing TDevelop profiles.
+.so kdeopt.part
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.lintian b/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.lintian
index 91e79108d..bbc195bd6 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.lintian
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.lintian
@@ -1,11 +1,11 @@
 # These files are provided to create new applications.
-tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING
-tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING.LIB
-tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.QPL
-tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.BSD
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/tdevappwizard/template-common/COPYING
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/tdevappwizard/template-common/COPYING.LIB
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/tdevappwizard/template-common/LICENSE.QPL
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/tdevappwizard/template-common/LICENSE.BSD
 # This file is a template, not a script.
-tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevfilecreate/file-templates/pl
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/tdevfilecreate/file-templates/pl
 # This file is used internally by tdeio_pydoc.la and invoked explicitly with python.
-tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/tdeio_pydoc/kde_pydoc.py
-# This file is used internally by libkdevcvsservice.la and invoked explicitly with sh.
-tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevcvsservice/buildcvs.sh
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/tdeio_pydoc/tde_pydoc.py
+# This file is used internally by libtdevcvsservice.la and invoked explicitly with sh.
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/tdevcvsservice/buildcvs.sh
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages
index 1e10ab62e..070da31e7 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages
@@ -1,6 +1,6 @@
 debian/man/out/tdevelop.1
-debian/man/out/kdevdesigner.1
-debian/man/out/kdevassistant.1
-debian/man/out/kdevprj2tdevelop.1
-debian/man/out/kdevprofileeditor.1
+debian/man/out/tdevdesigner.1
+debian/man/out/tdevassistant.1
+debian/man/out/tdevprj2tdevelop.1
+debian/man/out/tdevprofileeditor.1
 debian/man/out/tdevelop-htdig.1
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.menu b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.menu
index dbf27f386..fc4e48b0c 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.menu
+++ b/ubuntu/maverick/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"