Reverted commit ab813fbff9f78a610233cd79906e9f0c68f43d2b:
"Update to renamed tdevelop components on Debian and Ubuntu"

diff --git a/debian/lenny/tdevelop/debian/tdevelop-trinity-doc.install b/debian/lenny/tdevelop/debian/tdevelop-trinity-doc.install
index 08ce28c..2e687a8 100644
--- a/debian/lenny/tdevelop/debian/tdevelop-trinity-doc.install
+++ b/debian/lenny/tdevelop/debian/tdevelop-trinity-doc.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdevelop
 #debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdevelop-apidocs/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/appwizard.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/kscribblefiles.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/appwizard.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/kscribblefiles.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/common
diff --git a/debian/lenny/tdevelop/debian/tdevelop-trinity.install b/debian/lenny/tdevelop/debian/tdevelop-trinity.install
index bc67ae4..4f53c07 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/squeeze/tdevelop/debian/tdevelop-trinity-doc.install b/debian/squeeze/tdevelop/debian/tdevelop-trinity-doc.install
index 08ce28c..2e687a8 100644
--- a/debian/squeeze/tdevelop/debian/tdevelop-trinity-doc.install
+++ b/debian/squeeze/tdevelop/debian/tdevelop-trinity-doc.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdevelop
 #debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdevelop-apidocs/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/appwizard.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/kscribblefiles.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/appwizard.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/kscribblefiles.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/common
diff --git a/debian/squeeze/tdevelop/debian/tdevelop-trinity.install b/debian/squeeze/tdevelop/debian/tdevelop-trinity.install
index bc67ae4..4f53c07 100644
--- a/debian/squeeze/tdevelop/debian/tdevelop-trinity.install
+++ b/debian/squeeze/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/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-doc.install b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-doc.install
index 08ce28c..2e687a8 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-doc.install
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-doc.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdevelop
 #debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdevelop-apidocs/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/appwizard.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/kscribblefiles.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tde_app_devel/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/appwizard.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/kscribblefiles.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/common
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install
index bc67ae4..4f53c07 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install
+++ b/ubuntu/maverick/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

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

diff --git a/debian/lenny/applications/abakus/debian/abakus-trinity.menu b/debian/lenny/applications/abakus/debian/abakus-trinity.menu
index bd59ecd..8c20bfd 100644
--- a/debian/lenny/applications/abakus/debian/abakus-trinity.menu
+++ b/debian/lenny/applications/abakus/debian/abakus-trinity.menu
@@ -1,4 +1,4 @@
-?package(abakus):needs="X11"\
+?package(abakus-trinity):needs="X11"\
  section="Apps/Math"\
  title="AbaKus"\
  command="/opt/trinity/bin/abakus"\
diff --git a/debian/lenny/applications/abakus/debian/abakus.1 b/debian/lenny/applications/abakus/debian/abakus.1
index 74afe70..1411bee 100644
--- a/debian/lenny/applications/abakus/debian/abakus.1
+++ b/debian/lenny/applications/abakus/debian/abakus.1
@@ -1,10 +1,10 @@
 .\" This file was generated by kdemangen.pl
-.TH ABAKUS 1 "Oct 2005" "K Desktop Environment" "A simple keyboard-driven calculator"
+.TH ABAKUS 1 "Oct 2005" "Trinity Desktop Environment" "A simple keyboard-driven calculator"
 .SH NAME
 abakus
 \- A simple keyboard-driven calculator
 .SH SYNOPSIS
-abakus [Qt\-options] [KDE\-options] 
+abakus [Qt\-options] [TDE\-options] 
 .SH DESCRIPTION
 A simple keyboard-driven calculator
 .SH OPTIONS
@@ -16,8 +16,8 @@
 .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
@@ -34,7 +34,7 @@
 .B  \-\-  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -130,7 +130,7 @@
 .SS 
 
 .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:/abakus/
 directly into konqueror or you can run 
 .BR "`khelpcenter help:/abakus/'"
diff --git a/debian/lenny/applications/abakus/debian/cdbs/versions.pl b/debian/lenny/applications/abakus/debian/cdbs/versions.pl
index 75c9add..1b110f7 100644
--- a/debian/lenny/applications/abakus/debian/cdbs/versions.pl
+++ b/debian/lenny/applications/abakus/debian/cdbs/versions.pl
@@ -13,7 +13,7 @@
 ($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/applications/adept/debian/cdbs/versions.pl b/debian/lenny/applications/adept/debian/cdbs/versions.pl
index 75c9add..1b110f7 100644
--- a/debian/lenny/applications/adept/debian/cdbs/versions.pl
+++ b/debian/lenny/applications/adept/debian/cdbs/versions.pl
@@ -13,7 +13,7 @@
 ($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/applications/adept/debian/control b/debian/lenny/applications/adept/debian/control
index eef66db..1a6293d 100644
--- a/debian/lenny/applications/adept/debian/control
+++ b/debian/lenny/applications/adept/debian/control
@@ -45,7 +45,7 @@
   * Edit the list of used repositories (sources.list)
   * Configure packages through the debconf system
  .
- Please also install libtqt-perl if you want the KDE Debconf frontend
+ Please also install libtqt-perl if you want the TDE Debconf frontend
  to function.
 
 Package: adept-installer-trinity
@@ -58,10 +58,10 @@
 Description: simple user interface for application management (for Trinity)
  Adept Installer presents a list of applications available through the
  Advanced Package Tool (APT). An application is considered a package
- that contains a .desktop file for use with KDE, GNOME or other
+ that contains a .desktop file for use with TDE, KDE, GNOME or other
  desktop environment.
  .
- Please also install libtqt-perl if you want the KDE Debconf frontend
+ Please also install libtqt-perl if you want the TDE Debconf frontend
  to function.
 
 Package: adept-updater-trinity
@@ -75,7 +75,7 @@
  Adept Updater provides a simple wizard-style user interface to system
  upgrades. It uses same algorithms as apt-get dist-upgrade.
  .
- Please also install libtqt-perl if you want the KDE Debconf frontend
+ Please also install libtqt-perl if you want the TDE Debconf frontend
  to function.
 
 Package: adept-notifier-trinity
diff --git a/debian/lenny/applications/adept/debian/control.in b/debian/lenny/applications/adept/debian/control.in
index aff9404..5df662e 100644
--- a/debian/lenny/applications/adept/debian/control.in
+++ b/debian/lenny/applications/adept/debian/control.in
@@ -39,7 +39,7 @@
   * Edit the list of used repositories (sources.list)
   * Configure packages through the debconf system
 ** Diff limit reached (max: 250 lines) **