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

52 files changed, 500 insertions, 500 deletions

diff --git a/debian/lenny/tdebase/debian/control b/debian/lenny/tdebase/debian/control
index 5b013b3fd..1b8682a14 100644
--- a/debian/lenny/tdebase/debian/control
+++ b/debian/lenny/tdebase/debian/control
@@ -14,7 +14,7 @@ Section: tde
 Architecture: all
 Replaces: kdebase-trinity (<< 4:14.0.0)
 Breaks: kdebase-trinity (<< 4:14.0.0)
-Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-tdeio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), xcalib
+Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-tdeio-plugins-trinity (>= ${Source-Version}), tdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), xcalib
 Recommends: tdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
 Suggests: tdebase-trinity-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -202,7 +202,7 @@ Description: core I/O slaves for KDE
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: kdepasswd-trinity
+Package: tdepasswd-trinity
 Section: utils
 Architecture: any
 Replaces: kdepasswd-trinity (<< 4:14.0.0)
@@ -256,7 +256,7 @@ Replaces: kdm-trinity (<< 4:14.0.0)
 Breaks: kdm-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
 Recommends: logrotate, xserver-xorg
-Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), kdepasswd-trinity (= ${Source-Version}), menu
+Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), tdepasswd-trinity (= ${Source-Version}), menu
 Provides: x-display-manager
 Description: X display manager for KDE
  tdm manages a collection of X servers, which may be on the local host or
@@ -268,7 +268,7 @@ Description: X display manager for KDE
  XDMCP display management.
  .
  A collection of icons to associate with individual users is included with
- KDE, but as part of the kdepasswd package.
+ KDE, but as part of the tdepasswd package.
  .
  The menu package will help to provide TDM with a list of window managers
  that can be launched, if the window manager does not register with TDM
diff --git a/debian/lenny/tdebase/debian/kdepasswd-trinity.manpages b/debian/lenny/tdebase/debian/kdepasswd-trinity.manpages
deleted file mode 100644
index 28a664117..000000000
--- a/debian/lenny/tdebase/debian/kdepasswd-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kdepasswd-trinity.1
diff --git a/debian/lenny/tdebase/debian/kdepasswd-trinity.menu b/debian/lenny/tdebase/debian/kdepasswd-trinity.menu
deleted file mode 100644
index 7273c2657..000000000
--- a/debian/lenny/tdebase/debian/kdepasswd-trinity.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(kdepasswd):\
-	needs="X11"\
-	section="Applications/System/Administration"\
-	hints="TDE"\
-	title="kdepasswd"\
-	command="/opt/trinity/bin/kdepasswd"
diff --git a/debian/squeeze/tdebase/debian/man/kdepasswd-trinity.1 b/debian/lenny/tdebase/debian/man/tdepasswd-trinity.1
index 44a4128cc..67dcedf44 100644
--- a/debian/squeeze/tdebase/debian/man/kdepasswd-trinity.1
+++ b/debian/lenny/tdebase/debian/man/tdepasswd-trinity.1
@@ -1,10 +1,10 @@
-.TH KDEPASSWD 1
+.TH TDEPASSWD 1
 
 .SH NAME
-kdepasswd \- graphical frontend to change the user's password
+tdepasswd \- graphical frontend to change the user's password
 
 .SH SYNOPSIS
-.B kdepasswd [ \fIQt-options\fR ] [ \fIKDE-options\fR ] \fIoptions\fR
+.B tdepasswd [ \fIQt-options\fR ] [ \fIKDE-options\fR ] \fIoptions\fR
 
 .SH DESCRIPTION
 Changes a UNIX password.
diff --git a/debian/lenny/tdebase/debian/kdepasswd-trinity.install b/debian/lenny/tdebase/debian/tdepasswd-trinity.install
index 06a22062c..43a7beeaa 100644
--- a/debian/lenny/tdebase/debian/kdepasswd-trinity.install
+++ b/debian/lenny/tdebase/debian/tdepasswd-trinity.install
@@ -1,8 +1,8 @@
-debian/tmp/opt/trinity/bin/kdepasswd
+debian/tmp/opt/trinity/bin/tdepasswd
 debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.la
 debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.so
 debian/tmp/opt/trinity/share/applications/tde/kcm_useraccount.desktop
-debian/tmp/opt/trinity/share/applications/tde/kdepasswd.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdepasswd.desktop
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/Apple.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/BeachBall.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/Blowfish.png
diff --git a/debian/lenny/tdebase/debian/tdepasswd-trinity.manpages b/debian/lenny/tdebase/debian/tdepasswd-trinity.manpages
new file mode 100644
index 000000000..1a6f4abad
--- /dev/null
+++ b/debian/lenny/tdebase/debian/tdepasswd-trinity.manpages
@@ -0,0 +1 @@
+debian/man/tdepasswd-trinity.1
diff --git a/debian/lenny/tdebase/debian/tdepasswd-trinity.menu b/debian/lenny/tdebase/debian/tdepasswd-trinity.menu
new file mode 100644
index 000000000..b448a0860
--- /dev/null
+++ b/debian/lenny/tdebase/debian/tdepasswd-trinity.menu
@@ -0,0 +1,6 @@
+?package(tdepasswd):\
+	needs="X11"\
+	section="Applications/System/Administration"\
+	hints="TDE"\
+	title="tdepasswd"\
+	command="/opt/trinity/bin/tdepasswd"
diff --git a/debian/lenny/tdeutils/debian/copyright b/debian/lenny/tdeutils/debian/copyright
index bae808211..dfe16e1c5 100644
--- a/debian/lenny/tdeutils/debian/copyright
+++ b/debian/lenny/tdeutils/debian/copyright
@@ -10,7 +10,7 @@ License:
 
 Artistic
 --------
-kdepasswd, tdessh
+tdepasswd, tdessh
 
 BSD
 ---
diff --git a/debian/squeeze/tdebase/debian/control b/debian/squeeze/tdebase/debian/control
index 832bc1c67..2b9ae43c9 100644
--- a/debian/squeeze/tdebase/debian/control
+++ b/debian/squeeze/tdebase/debian/control
@@ -14,7 +14,7 @@ Section: tde
 Architecture: all
 Replaces: kdebase-trinity (<< 4:14.0.0)
 Breaks: kdebase-trinity (<< 4:14.0.0)
-Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-tdeio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), xcalib
+Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-tdeio-plugins-trinity (>= ${Source-Version}), tdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), xcalib
 Recommends: tdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
 Suggests: tdebase-trinity-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -202,7 +202,7 @@ Description: core I/O slaves for KDE
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: kdepasswd-trinity
+Package: tdepasswd-trinity
 Section: utils
 Architecture: any
 Replaces: kdepasswd-trinity (<< 4:14.0.0)
@@ -256,7 +256,7 @@ Replaces: kdm-trinity (<< 4:14.0.0)
 Breaks: kdm-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
 Recommends: logrotate, xserver-xorg
-Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), kdepasswd-trinity (= ${Source-Version}), menu
+Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), tdepasswd-trinity (= ${Source-Version}), menu
 Provides: x-display-manager
 Description: X display manager for KDE
  tdm manages a collection of X servers, which may be on the local host or
@@ -268,7 +268,7 @@ Description: X display manager for KDE
  XDMCP display management.
  .
  A collection of icons to associate with individual users is included with
- KDE, but as part of the kdepasswd package.
+ KDE, but as part of the tdepasswd package.
  .
  The menu package will help to provide TDM with a list of window managers
  that can be launched, if the window manager does not register with TDM
diff --git a/debian/squeeze/tdebase/debian/kdepasswd-trinity.manpages b/debian/squeeze/tdebase/debian/kdepasswd-trinity.manpages
deleted file mode 100644
index 28a664117..000000000
--- a/debian/squeeze/tdebase/debian/kdepasswd-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kdepasswd-trinity.1
diff --git a/debian/squeeze/tdebase/debian/kdepasswd-trinity.menu b/debian/squeeze/tdebase/debian/kdepasswd-trinity.menu
deleted file mode 100644
index 7273c2657..000000000
--- a/debian/squeeze/tdebase/debian/kdepasswd-trinity.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(kdepasswd):\
-	needs="X11"\
-	section="Applications/System/Administration"\
-	hints="TDE"\
-	title="kdepasswd"\
-	command="/opt/trinity/bin/kdepasswd"
diff --git a/debian/wheezy/tdebase/debian/man/kdepasswd-trinity.1 b/debian/squeeze/tdebase/debian/man/tdepasswd-trinity.1
index 44a4128cc..67dcedf44 100644
--- a/debian/wheezy/tdebase/debian/man/kdepasswd-trinity.1
+++ b/debian/squeeze/tdebase/debian/man/tdepasswd-trinity.1
@@ -1,10 +1,10 @@
-.TH KDEPASSWD 1
+.TH TDEPASSWD 1
 
 .SH NAME
-kdepasswd \- graphical frontend to change the user's password
+tdepasswd \- graphical frontend to change the user's password
 
 .SH SYNOPSIS
-.B kdepasswd [ \fIQt-options\fR ] [ \fIKDE-options\fR ] \fIoptions\fR
+.B tdepasswd [ \fIQt-options\fR ] [ \fIKDE-options\fR ] \fIoptions\fR
 
 .SH DESCRIPTION
 Changes a UNIX password.
diff --git a/debian/squeeze/tdebase/debian/kdepasswd-trinity.install b/debian/squeeze/tdebase/debian/tdepasswd-trinity.install
index 06a22062c..43a7beeaa 100644
--- a/debian/squeeze/tdebase/debian/kdepasswd-trinity.install
+++ b/debian/squeeze/tdebase/debian/tdepasswd-trinity.install
@@ -1,8 +1,8 @@
-debian/tmp/opt/trinity/bin/kdepasswd
+debian/tmp/opt/trinity/bin/tdepasswd
 debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.la
 debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.so
 debian/tmp/opt/trinity/share/applications/tde/kcm_useraccount.desktop
-debian/tmp/opt/trinity/share/applications/tde/kdepasswd.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdepasswd.desktop
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/Apple.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/BeachBall.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/Blowfish.png
diff --git a/debian/squeeze/tdebase/debian/tdepasswd-trinity.manpages b/debian/squeeze/tdebase/debian/tdepasswd-trinity.manpages
new file mode 100644
index 000000000..1a6f4abad
--- /dev/null
+++ b/debian/squeeze/tdebase/debian/tdepasswd-trinity.manpages
@@ -0,0 +1 @@
+debian/man/tdepasswd-trinity.1
diff --git a/debian/squeeze/tdebase/debian/tdepasswd-trinity.menu b/debian/squeeze/tdebase/debian/tdepasswd-trinity.menu
new file mode 100644
index 000000000..b448a0860
--- /dev/null
+++ b/debian/squeeze/tdebase/debian/tdepasswd-trinity.menu
@@ -0,0 +1,6 @@
+?package(tdepasswd):\
+	needs="X11"\
+	section="Applications/System/Administration"\
+	hints="TDE"\
+	title="tdepasswd"\
+	command="/opt/trinity/bin/tdepasswd"
diff --git a/debian/squeeze/tdeutils/debian/copyright b/debian/squeeze/tdeutils/debian/copyright
index bae808211..dfe16e1c5 100644
--- a/debian/squeeze/tdeutils/debian/copyright
+++ b/debian/squeeze/tdeutils/debian/copyright
@@ -10,7 +10,7 @@ License:
 
 Artistic
 --------
-kdepasswd, tdessh
+tdepasswd, tdessh
 
 BSD
 ---
diff --git a/debian/wheezy/tdebase/debian/control b/debian/wheezy/tdebase/debian/control
index 832bc1c67..2b9ae43c9 100644
--- a/debian/wheezy/tdebase/debian/control
+++ b/debian/wheezy/tdebase/debian/control
@@ -14,7 +14,7 @@ Section: tde
 Architecture: all
 Replaces: kdebase-trinity (<< 4:14.0.0)
 Breaks: kdebase-trinity (<< 4:14.0.0)
-Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-tdeio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), xcalib
+Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-tdeio-plugins-trinity (>= ${Source-Version}), tdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), xcalib
 Recommends: tdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
 Suggests: tdebase-trinity-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -202,7 +202,7 @@ Description: core I/O slaves for KDE
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: kdepasswd-trinity
+Package: tdepasswd-trinity
 Section: utils
 Architecture: any
 Replaces: kdepasswd-trinity (<< 4:14.0.0)
@@ -256,7 +256,7 @@ Replaces: kdm-trinity (<< 4:14.0.0)
 Breaks: kdm-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
 Recommends: logrotate, xserver-xorg
-Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), kdepasswd-trinity (= ${Source-Version}), menu
+Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), tdepasswd-trinity (= ${Source-Version}), menu
 Provides: x-display-manager
 Description: X display manager for KDE
  tdm manages a collection of X servers, which may be on the local host or
@@ -268,7 +268,7 @@ Description: X display manager for KDE
  XDMCP display management.
  .
  A collection of icons to associate with individual users is included with
- KDE, but as part of the kdepasswd package.
+ KDE, but as part of the tdepasswd package.
  .
  The menu package will help to provide TDM with a list of window managers
  that can be launched, if the window manager does not register with TDM
diff --git a/debian/wheezy/tdebase/debian/kdepasswd-trinity.manpages b/debian/wheezy/tdebase/debian/kdepasswd-trinity.manpages
deleted file mode 100644
index 28a664117..000000000
--- a/debian/wheezy/tdebase/debian/kdepasswd-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kdepasswd-trinity.1
diff --git a/debian/wheezy/tdebase/debian/kdepasswd-trinity.menu b/debian/wheezy/tdebase/debian/kdepasswd-trinity.menu
deleted file mode 100644
index 7273c2657..000000000
--- a/debian/wheezy/tdebase/debian/kdepasswd-trinity.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(kdepasswd):\
-	needs="X11"\
-	section="Applications/System/Administration"\
-	hints="TDE"\
-	title="kdepasswd"\
-	command="/opt/trinity/bin/kdepasswd"
diff --git a/ubuntu/maverick/tdebase/debian/man/kdepasswd-trinity.1 b/debian/wheezy/tdebase/debian/man/tdepasswd-trinity.1
index 44a4128cc..67dcedf44 100644
--- a/ubuntu/maverick/tdebase/debian/man/kdepasswd-trinity.1
+++ b/debian/wheezy/tdebase/debian/man/tdepasswd-trinity.1
@@ -1,10 +1,10 @@
-.TH KDEPASSWD 1
+.TH TDEPASSWD 1
 
 .SH NAME
-kdepasswd \- graphical frontend to change the user's password
+tdepasswd \- graphical frontend to change the user's password
 
 .SH SYNOPSIS
-.B kdepasswd [ \fIQt-options\fR ] [ \fIKDE-options\fR ] \fIoptions\fR
+.B tdepasswd [ \fIQt-options\fR ] [ \fIKDE-options\fR ] \fIoptions\fR
 
 .SH DESCRIPTION
 Changes a UNIX password.
diff --git a/debian/wheezy/tdebase/debian/kdepasswd-trinity.install b/debian/wheezy/tdebase/debian/tdepasswd-trinity.install
index 06a22062c..43a7beeaa 100644
--- a/debian/wheezy/tdebase/debian/kdepasswd-trinity.install
+++ b/debian/wheezy/tdebase/debian/tdepasswd-trinity.install
@@ -1,8 +1,8 @@
-debian/tmp/opt/trinity/bin/kdepasswd
+debian/tmp/opt/trinity/bin/tdepasswd
 debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.la
 debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.so
 debian/tmp/opt/trinity/share/applications/tde/kcm_useraccount.desktop
-debian/tmp/opt/trinity/share/applications/tde/kdepasswd.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdepasswd.desktop
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/Apple.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/BeachBall.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/Blowfish.png
diff --git a/debian/wheezy/tdebase/debian/tdepasswd-trinity.manpages b/debian/wheezy/tdebase/debian/tdepasswd-trinity.manpages
new file mode 100644
index 000000000..1a6f4abad
--- /dev/null
+++ b/debian/wheezy/tdebase/debian/tdepasswd-trinity.manpages
@@ -0,0 +1 @@
+debian/man/tdepasswd-trinity.1
diff --git a/debian/wheezy/tdebase/debian/tdepasswd-trinity.menu b/debian/wheezy/tdebase/debian/tdepasswd-trinity.menu
new file mode 100644
index 000000000..b448a0860
--- /dev/null
+++ b/debian/wheezy/tdebase/debian/tdepasswd-trinity.menu
@@ -0,0 +1,6 @@
+?package(tdepasswd):\
+	needs="X11"\
+	section="Applications/System/Administration"\
+	hints="TDE"\
+	title="tdepasswd"\
+	command="/opt/trinity/bin/tdepasswd"
diff --git a/debian/wheezy/tdeutils/debian/copyright b/debian/wheezy/tdeutils/debian/copyright
index bae808211..dfe16e1c5 100644
--- a/debian/wheezy/tdeutils/debian/copyright
+++ b/debian/wheezy/tdeutils/debian/copyright
@@ -10,7 +10,7 @@ License:
 
 Artistic
 --------
-kdepasswd, tdessh
+tdepasswd, tdessh
 
 BSD
 ---
diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control
index c6b64a04c..8da86986f 100644
--- a/ubuntu/maverick/tdebase/debian/control
+++ b/ubuntu/maverick/tdebase/debian/control
@@ -14,7 +14,7 @@ Section: tde
 Architecture: all
 Replaces: kdebase-kde3 (<< 4:14.0.0), kdebase-trinity (<< 4:14.0.0)
 Breaks: kdebase-kde3 (<< 4:14.0.0), kdebase-trinity (<< 4:14.0.0)
-Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-tdeio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), xcalib
+Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-tdeio-plugins-trinity (>= ${Source-Version}), tdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), xcalib
 Recommends: tdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
 Suggests: tdebase-trinity-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -202,7 +202,7 @@ Description: core I/O slaves for KDE
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: kdepasswd-trinity
+Package: tdepasswd-trinity
 Section: utils
 Architecture: any
 Replaces: kdepasswd-kde3 (<< 4:14.0.0), kdepasswd-trinity (<< 4:14.0.0)
@@ -256,7 +256,7 @@ Replaces: kdm-kde3 (<< 4:14.0.0), kdm-trinity (<< 4:14.0.0)
 Breaks: kdm-kde3 (<< 4:14.0.0), kdm-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
 Recommends: logrotate, xserver-xorg
-Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), kdepasswd-trinity (= ${Source-Version}), menu
+Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), tdepasswd-trinity (= ${Source-Version}), menu
 Provides: x-display-manager
 Description: X display manager for KDE
  tdm manages a collection of X servers, which may be on the local host or
@@ -268,7 +268,7 @@ Description: X display manager for KDE
  XDMCP display management.
  .
  A collection of icons to associate with individual users is included with
- KDE, but as part of the kdepasswd package.
+ KDE, but as part of the tdepasswd package.
  .
  The menu package will help to provide TDM with a list of window managers
  that can be launched, if the window manager does not register with TDM
diff --git a/ubuntu/maverick/tdebase/debian/kdepasswd-trinity.manpages b/ubuntu/maverick/tdebase/debian/kdepasswd-trinity.manpages
deleted file mode 100644
index 28a664117..000000000
--- a/ubuntu/maverick/tdebase/debian/kdepasswd-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kdepasswd-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/kdepasswd-trinity.menu b/ubuntu/maverick/tdebase/debian/kdepasswd-trinity.menu
deleted file mode 100644
index 7273c2657..000000000
--- a/ubuntu/maverick/tdebase/debian/kdepasswd-trinity.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(kdepasswd):\
-	needs="X11"\
-	section="Applications/System/Administration"\
-	hints="TDE"\
-	title="kdepasswd"\
-	command="/opt/trinity/bin/kdepasswd"
diff --git a/debian/lenny/tdebase/debian/man/kdepasswd-trinity.1 b/ubuntu/maverick/tdebase/debian/man/tdepasswd-trinity.1
index 44a4128cc..67dcedf44 100644
--- a/debian/lenny/tdebase/debian/man/kdepasswd-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/tdepasswd-trinity.1
@@ -1,10 +1,10 @@
-.TH KDEPASSWD 1
+.TH TDEPASSWD 1
 
 .SH NAME
-kdepasswd \- graphical frontend to change the user's password
+tdepasswd \- graphical frontend to change the user's password
 
 .SH SYNOPSIS
-.B kdepasswd [ \fIQt-options\fR ] [ \fIKDE-options\fR ] \fIoptions\fR
+.B tdepasswd [ \fIQt-options\fR ] [ \fIKDE-options\fR ] \fIoptions\fR
 
 .SH DESCRIPTION
 Changes a UNIX password.
diff --git a/ubuntu/maverick/tdebase/debian/kdepasswd-trinity.install b/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.install
index 06a22062c..43a7beeaa 100644
--- a/ubuntu/maverick/tdebase/debian/kdepasswd-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.install
@@ -1,8 +1,8 @@
-debian/tmp/opt/trinity/bin/kdepasswd
+debian/tmp/opt/trinity/bin/tdepasswd
 debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.la
 debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.so
 debian/tmp/opt/trinity/share/applications/tde/kcm_useraccount.desktop
-debian/tmp/opt/trinity/share/applications/tde/kdepasswd.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdepasswd.desktop
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/Apple.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/BeachBall.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/Blowfish.png
diff --git a/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.manpages b/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.manpages
new file mode 100644
index 000000000..1a6f4abad
--- /dev/null
+++ b/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.manpages
@@ -0,0 +1 @@
+debian/man/tdepasswd-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.menu b/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.menu
new file mode 100644
index 000000000..b448a0860
--- /dev/null
+++ b/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.menu
@@ -0,0 +1,6 @@
+?package(tdepasswd):\
+	needs="X11"\
+	section="Applications/System/Administration"\
+	hints="TDE"\
+	title="tdepasswd"\
+	command="/opt/trinity/bin/tdepasswd"
diff --git a/ubuntu/maverick/tdeutils/debian/copyright b/ubuntu/maverick/tdeutils/debian/copyright
index bae808211..dfe16e1c5 100644
--- a/ubuntu/maverick/tdeutils/debian/copyright
+++ b/ubuntu/maverick/tdeutils/debian/copyright
@@ -10,7 +10,7 @@ License:
 
 Artistic
 --------
-kdepasswd, tdessh
+tdepasswd, tdessh
 
 BSD
 ---
diff --git a/ubuntu/precise/tdebase/debian/control b/ubuntu/precise/tdebase/debian/control
index c6b64a04c..8da86986f 100644
--- a/ubuntu/precise/tdebase/debian/control
+++ b/ubuntu/precise/tdebase/debian/control
@@ -14,7 +14,7 @@ Section: tde
 Architecture: all
 Replaces: kdebase-kde3 (<< 4:14.0.0), kdebase-trinity (<< 4:14.0.0)
 Breaks: kdebase-kde3 (<< 4:14.0.0), kdebase-trinity (<< 4:14.0.0)
-Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-tdeio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), xcalib
+Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-tdeio-plugins-trinity (>= ${Source-Version}), tdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), xcalib
 Recommends: tdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
 Suggests: tdebase-trinity-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -202,7 +202,7 @@ Description: core I/O slaves for KDE
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: kdepasswd-trinity
+Package: tdepasswd-trinity
 Section: utils
 Architecture: any
 Replaces: kdepasswd-kde3 (<< 4:14.0.0), kdepasswd-trinity (<< 4:14.0.0)
@@ -256,7 +256,7 @@ Replaces: kdm-kde3 (<< 4:14.0.0), kdm-trinity (<< 4:14.0.0)
 Breaks: kdm-kde3 (<< 4:14.0.0), kdm-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
 Recommends: logrotate, xserver-xorg
-Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), kdepasswd-trinity (= ${Source-Version}), menu
+Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), tdepasswd-trinity (= ${Source-Version}), menu
 Provides: x-display-manager
 Description: X display manager for KDE
  tdm manages a collection of X servers, which may be on the local host or
@@ -268,7 +268,7 @@ Description: X display manager for KDE
  XDMCP display management.
  .
  A collection of icons to associate with individual users is included with
- KDE, but as part of the kdepasswd package.
+ KDE, but as part of the tdepasswd package.
  .
  The menu package will help to provide TDM with a list of window managers
  that can be launched, if the window manager does not register with TDM
diff --git a/ubuntu/precise/tdebase/debian/kdepasswd-trinity.install b/ubuntu/precise/tdebase/debian/kdepasswd-trinity.install
deleted file mode 100644
index 06a22062c..000000000
--- a/ubuntu/precise/tdebase/debian/kdepasswd-trinity.install
+++ /dev/null
@@ -1,35 +0,0 @@
-debian/tmp/opt/trinity/bin/kdepasswd
-debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.la
-debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.so
-debian/tmp/opt/trinity/share/applications/tde/kcm_useraccount.desktop
-debian/tmp/opt/trinity/share/applications/tde/kdepasswd.desktop
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Apple.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/BeachBall.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Blowfish.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Bug.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Butterfly.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Car.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Cow.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Daemon.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Dog.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Elephant.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Flower.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Frog.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Ghost.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Guitar.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Heart.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Konqui.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Lion.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Monkey.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Penguin.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Pig.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Rabbit.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Ring.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Scream.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Shark.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Splash.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Star.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Teddybear.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Turtle.png
-debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount.kcfg
-debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount_pass.kcfg
diff --git a/ubuntu/precise/tdebase/debian/kdepasswd-trinity.manpages b/ubuntu/precise/tdebase/debian/kdepasswd-trinity.manpages
deleted file mode 100644
index 28a664117..000000000
--- a/ubuntu/precise/tdebase/debian/kdepasswd-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kdepasswd-trinity.1
diff --git a/ubuntu/precise/tdebase/debian/kdepasswd-trinity.menu b/ubuntu/precise/tdebase/debian/kdepasswd-trinity.menu
deleted file mode 100644
index 7273c2657..000000000
--- a/ubuntu/precise/tdebase/debian/kdepasswd-trinity.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(kdepasswd):\
-	needs="X11"\
-	section="Applications/System/Administration"\
-	hints="TDE"\
-	title="kdepasswd"\
-	command="/opt/trinity/bin/kdepasswd"
diff --git a/ubuntu/precise/tdebase/debian/man/kdepasswd-trinity.1 b/ubuntu/precise/tdebase/debian/man/kdepasswd-trinity.1
deleted file mode 100644
index 44a4128cc..000000000
--- a/ubuntu/precise/tdebase/debian/man/kdepasswd-trinity.1
+++ /dev/null
@@ -1,169 +0,0 @@
-.TH KDEPASSWD 1
-
-.SH NAME
-kdepasswd \- graphical frontend to change the user's password
-
-.SH SYNOPSIS
-.B kdepasswd [ \fIQt-options\fR ] [ \fIKDE-options\fR ] \fIoptions\fR
-
-.SH DESCRIPTION
-Changes a UNIX password.
-
-.SH OPTIONS
-.B Generic options:
-.TP
-.HP
-.B \-\-help
-Show help about options
-.TP
-.HP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.HP
-.B \-\-help\-kde
-Show KDE specific options
-.TP
-.HP
-.B \-\-help\-all
-Show all options
-.TP
-.HP
-.B \-\-author
-Show author information
-.TP
-.HP
-.B \-v\fR, \fB \-\-version
-Show version information
-.TP
-.HP
-.B \-\-license
-Show license information
-.TP
-.B Qt options:
-.TP
-.HP
-.B \-\-display <displayname>
-Use the X-server display 'displayname'.
-.TP
-.HP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'.
-.TP
-.HP
-.B \-\-cmap
-Causes the application to install a private 
-color map on an 8-bit display.
-.TP
-.HP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.HP
-.B \-\-nograb
-Tells Qt to never grab the mouse or the keyboard.
-.TP
-.HP
-.B \-\-dograb
-Running under a debugger can cause an implicit
--nograb, use -dograb to override.
-.TP
-.HP
-.B \-\-sync
-Switches to synchronous mode for debugging.
-.TP
-.HP
-.B \-\-fn, \-\-font <fontname>
-Defines the application font.
-.TP
-.HP
-.B \-\-bg, \-\-background <color> 
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.HP
-.B \-\-fg, \-\-foreground <color> 
-Sets the default foreground color.
-.TP
-.HP
-.B \-\-btn, \-\-button <color>
-Sets the default button color.
-.TP
-.HP
-.B \-\-name <name>
-Sets the application name.
-.TP
-.HP
-.B \-\-title <title>
-Sets the application title (caption).
-.TP
-.HP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.HP
-.B \-\-inputstyle <inputstyle>
-Sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root.
-.TP
-.HP
-.B \-\-im <XIM server>
-Set XIM server.
-.TP
-.HP
-.B \-\-noxim
-Disable XIM.
-.TP
-.HP
-.B \-\-reverse
-Mirrors the whole layout of widgets.
-.TP
-.B KDE options:
-.TP
-.HP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar.
-.TP
-.HP
-.B \-\-icon <icon>
-Use 'icon' as the application icon.
-.TP
-.HP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar.
-.TP
-.HP
-.B \-\-config <filename>
-Use alternative configuration file.
-.TP
-.HP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'.
-.TP
-.HP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.HP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.HP
-.B \-\-style <style>
-Sets the application GUI style.
-.TP
-.HP
-.B \-\-geometry <geometry>
-Sets the client geometry of the main widget.
-
-.SH "SEE ALSO"
-.BR passwd (1).
-
-.SH AUTHOR
-Andre Ramos <andre@alunos.di.fc.ul.pt>
diff --git a/ubuntu/precise/tdebase/debian/man/tdepasswd-trinity.1 b/ubuntu/precise/tdebase/debian/man/tdepasswd-trinity.1
new file mode 100644
index 000000000..67dcedf44
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/man/tdepasswd-trinity.1
@@ -0,0 +1,169 @@
+.TH TDEPASSWD 1
+
+.SH NAME
+tdepasswd \- graphical frontend to change the user's password
+
+.SH SYNOPSIS
+.B tdepasswd [ \fIQt-options\fR ] [ \fIKDE-options\fR ] \fIoptions\fR
+
+.SH DESCRIPTION
+Changes a UNIX password.
+
+.SH OPTIONS
+.B Generic options:
+.TP
+.HP
+.B \-\-help
+Show help about options
+.TP
+.HP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.HP
+.B \-\-help\-kde
+Show KDE specific options
+.TP
+.HP
+.B \-\-help\-all
+Show all options
+.TP
+.HP
+.B \-\-author
+Show author information
+.TP
+.HP
+.B \-v\fR, \fB \-\-version
+Show version information
+.TP
+.HP
+.B \-\-license
+Show license information
+.TP
+.B Qt options:
+.TP
+.HP
+.B \-\-display <displayname>
+Use the X-server display 'displayname'.
+.TP
+.HP
+.B \-\-session <sessionId>
+Restore the application for the given 'sessionId'.
+.TP
+.HP
+.B \-\-cmap
+Causes the application to install a private 
+color map on an 8-bit display.
+.TP
+.HP
+.B \-\-ncols <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.HP
+.B \-\-nograb
+Tells Qt to never grab the mouse or the keyboard.
+.TP
+.HP
+.B \-\-dograb
+Running under a debugger can cause an implicit
+-nograb, use -dograb to override.
+.TP
+.HP
+.B \-\-sync
+Switches to synchronous mode for debugging.
+.TP
+.HP
+.B \-\-fn, \-\-font <fontname>
+Defines the application font.
+.TP
+.HP
+.B \-\-bg, \-\-background <color> 
+sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.HP
+.B \-\-fg, \-\-foreground <color> 
+Sets the default foreground color.
+.TP
+.HP
+.B \-\-btn, \-\-button <color>
+Sets the default button color.
+.TP
+.HP
+.B \-\-name <name>
+Sets the application name.
+.TP
+.HP
+.B \-\-title <title>
+Sets the application title (caption).
+.TP
+.HP
+.B \-\-visual TrueColor
+Forces the application to use a TrueColor visual on
+an 8-bit display.
+.TP
+.HP
+.B \-\-inputstyle <inputstyle>
+Sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root.
+.TP
+.HP
+.B \-\-im <XIM server>
+Set XIM server.
+.TP
+.HP
+.B \-\-noxim
+Disable XIM.
+.TP
+.HP
+.B \-\-reverse
+Mirrors the whole layout of widgets.
+.TP
+.B KDE options:
+.TP
+.HP
+.B \-\-caption <caption>
+Use 'caption' as name in the titlebar.
+.TP
+.HP
+.B \-\-icon <icon>
+Use 'icon' as the application icon.
+.TP
+.HP
+.B \-\-miniicon <icon>
+Use 'icon' as the icon in the titlebar.
+.TP
+.HP
+.B \-\-config <filename>
+Use alternative configuration file.
+.TP
+.HP
+.B \-\-dcopserver <server>
+Use the DCOP Server specified by 'server'.
+.TP
+.HP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps.
+.TP
+.HP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.HP
+.B \-\-style <style>
+Sets the application GUI style.
+.TP
+.HP
+.B \-\-geometry <geometry>
+Sets the client geometry of the main widget.
+
+.SH "SEE ALSO"
+.BR passwd (1).
+
+.SH AUTHOR
+Andre Ramos <andre@alunos.di.fc.ul.pt>
diff --git a/ubuntu/precise/tdebase/debian/tdepasswd-trinity.install b/ubuntu/precise/tdebase/debian/tdepasswd-trinity.install
new file mode 100644
index 000000000..43a7beeaa
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/tdepasswd-trinity.install
@@ -0,0 +1,35 @@
+debian/tmp/opt/trinity/bin/tdepasswd
+debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.la
+debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.so
+debian/tmp/opt/trinity/share/applications/tde/kcm_useraccount.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdepasswd.desktop
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Apple.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/BeachBall.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Blowfish.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Bug.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Butterfly.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Car.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Cow.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Daemon.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Dog.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Elephant.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Flower.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Frog.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Ghost.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Guitar.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Heart.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Konqui.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Lion.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Monkey.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Penguin.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Pig.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Rabbit.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Ring.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Scream.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Shark.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Splash.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Star.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Teddybear.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Turtle.png
+debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount.kcfg
+debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount_pass.kcfg
diff --git a/ubuntu/precise/tdebase/debian/tdepasswd-trinity.manpages b/ubuntu/precise/tdebase/debian/tdepasswd-trinity.manpages
new file mode 100644
index 000000000..1a6f4abad
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/tdepasswd-trinity.manpages
@@ -0,0 +1 @@
+debian/man/tdepasswd-trinity.1
diff --git a/ubuntu/precise/tdebase/debian/tdepasswd-trinity.menu b/ubuntu/precise/tdebase/debian/tdepasswd-trinity.menu
new file mode 100644
index 000000000..b448a0860
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/tdepasswd-trinity.menu
@@ -0,0 +1,6 @@
+?package(tdepasswd):\
+	needs="X11"\
+	section="Applications/System/Administration"\
+	hints="TDE"\
+	title="tdepasswd"\
+	command="/opt/trinity/bin/tdepasswd"
diff --git a/ubuntu/precise/tdeutils/debian/copyright b/ubuntu/precise/tdeutils/debian/copyright
index bae808211..dfe16e1c5 100644
--- a/ubuntu/precise/tdeutils/debian/copyright
+++ b/ubuntu/precise/tdeutils/debian/copyright
@@ -10,7 +10,7 @@ License:
 
 Artistic
 --------
-kdepasswd, tdessh
+tdepasswd, tdessh
 
 BSD
 ---
diff --git a/ubuntu/raring/tdebase/debian/control b/ubuntu/raring/tdebase/debian/control
index c6b64a04c..8da86986f 100644
--- a/ubuntu/raring/tdebase/debian/control
+++ b/ubuntu/raring/tdebase/debian/control
@@ -14,7 +14,7 @@ Section: tde
 Architecture: all
 Replaces: kdebase-kde3 (<< 4:14.0.0), kdebase-trinity (<< 4:14.0.0)
 Breaks: kdebase-kde3 (<< 4:14.0.0), kdebase-trinity (<< 4:14.0.0)
-Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-tdeio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), xcalib
+Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-tdeio-plugins-trinity (>= ${Source-Version}), tdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), xcalib
 Recommends: tdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
 Suggests: tdebase-trinity-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -202,7 +202,7 @@ Description: core I/O slaves for KDE
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: kdepasswd-trinity
+Package: tdepasswd-trinity
 Section: utils
 Architecture: any
 Replaces: kdepasswd-kde3 (<< 4:14.0.0), kdepasswd-trinity (<< 4:14.0.0)
@@ -256,7 +256,7 @@ Replaces: kdm-kde3 (<< 4:14.0.0), kdm-trinity (<< 4:14.0.0)
 Breaks: kdm-kde3 (<< 4:14.0.0), kdm-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
 Recommends: logrotate, xserver-xorg
-Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), kdepasswd-trinity (= ${Source-Version}), menu
+Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), tdepasswd-trinity (= ${Source-Version}), menu
 Provides: x-display-manager
 Description: X display manager for KDE
  tdm manages a collection of X servers, which may be on the local host or
@@ -268,7 +268,7 @@ Description: X display manager for KDE
  XDMCP display management.
  .
  A collection of icons to associate with individual users is included with
- KDE, but as part of the kdepasswd package.
+ KDE, but as part of the tdepasswd package.
  .
  The menu package will help to provide TDM with a list of window managers
  that can be launched, if the window manager does not register with TDM
diff --git a/ubuntu/raring/tdebase/debian/kdepasswd-trinity.install b/ubuntu/raring/tdebase/debian/kdepasswd-trinity.install
deleted file mode 100644
index 06a22062c..000000000
--- a/ubuntu/raring/tdebase/debian/kdepasswd-trinity.install
+++ /dev/null
@@ -1,35 +0,0 @@
-debian/tmp/opt/trinity/bin/kdepasswd
-debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.la
-debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.so
-debian/tmp/opt/trinity/share/applications/tde/kcm_useraccount.desktop
-debian/tmp/opt/trinity/share/applications/tde/kdepasswd.desktop
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Apple.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/BeachBall.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Blowfish.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Bug.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Butterfly.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Car.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Cow.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Daemon.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Dog.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Elephant.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Flower.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Frog.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Ghost.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Guitar.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Heart.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Konqui.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Lion.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Monkey.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Penguin.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Pig.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Rabbit.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Ring.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Scream.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Shark.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Splash.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Star.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Teddybear.png
-debian/tmp/opt/trinity/share/apps/tdm/pics/users/Turtle.png
-debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount.kcfg
-debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount_pass.kcfg
diff --git a/ubuntu/raring/tdebase/debian/kdepasswd-trinity.manpages b/ubuntu/raring/tdebase/debian/kdepasswd-trinity.manpages
deleted file mode 100644
index 28a664117..000000000
--- a/ubuntu/raring/tdebase/debian/kdepasswd-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kdepasswd-trinity.1
diff --git a/ubuntu/raring/tdebase/debian/kdepasswd-trinity.menu b/ubuntu/raring/tdebase/debian/kdepasswd-trinity.menu
deleted file mode 100644
index 7273c2657..000000000
--- a/ubuntu/raring/tdebase/debian/kdepasswd-trinity.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(kdepasswd):\
-	needs="X11"\
-	section="Applications/System/Administration"\
-	hints="TDE"\
-	title="kdepasswd"\
-	command="/opt/trinity/bin/kdepasswd"
diff --git a/ubuntu/raring/tdebase/debian/man/kdepasswd-trinity.1 b/ubuntu/raring/tdebase/debian/man/kdepasswd-trinity.1
deleted file mode 100644
index 44a4128cc..000000000
--- a/ubuntu/raring/tdebase/debian/man/kdepasswd-trinity.1
+++ /dev/null
@@ -1,169 +0,0 @@
-.TH KDEPASSWD 1
-
-.SH NAME
-kdepasswd \- graphical frontend to change the user's password
-
-.SH SYNOPSIS
-.B kdepasswd [ \fIQt-options\fR ] [ \fIKDE-options\fR ] \fIoptions\fR
-
-.SH DESCRIPTION
-Changes a UNIX password.
-
-.SH OPTIONS
-.B Generic options:
-.TP
-.HP
-.B \-\-help
-Show help about options
-.TP
-.HP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.HP
-.B \-\-help\-kde
-Show KDE specific options
-.TP
-.HP
-.B \-\-help\-all
-Show all options
-.TP
-.HP
-.B \-\-author
-Show author information
-.TP
-.HP
-.B \-v\fR, \fB \-\-version
-Show version information
-.TP
-.HP
-.B \-\-license
-Show license information
-.TP
-.B Qt options:
-.TP
-.HP
-.B \-\-display <displayname>
-Use the X-server display 'displayname'.
-.TP
-.HP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'.
-.TP
-.HP
-.B \-\-cmap
-Causes the application to install a private 
-color map on an 8-bit display.
-.TP
-.HP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.HP
-.B \-\-nograb
-Tells Qt to never grab the mouse or the keyboard.
-.TP
-.HP
-.B \-\-dograb
-Running under a debugger can cause an implicit
--nograb, use -dograb to override.
-.TP
-.HP
-.B \-\-sync
-Switches to synchronous mode for debugging.
-.TP
-.HP
-.B \-\-fn, \-\-font <fontname>
-Defines the application font.
-.TP
-.HP
-.B \-\-bg, \-\-background <color> 
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.HP
-.B \-\-fg, \-\-foreground <color> 
-Sets the default foreground color.
-.TP
-.HP
-.B \-\-btn, \-\-button <color>
-Sets the default button color.
-.TP
-.HP
-.B \-\-name <name>
-Sets the application name.
-.TP
-.HP
-.B \-\-title <title>
-Sets the application title (caption).
-.TP
-.HP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.HP
-.B \-\-inputstyle <inputstyle>
-Sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root.
-.TP
-.HP
-.B \-\-im <XIM server>
-Set XIM server.
-.TP
-.HP
-.B \-\-noxim
-Disable XIM.
-.TP
-.HP
-.B \-\-reverse
-Mirrors the whole layout of widgets.
-.TP
-.B KDE options:
-.TP
-.HP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar.
-.TP
-.HP
-.B \-\-icon <icon>
-Use 'icon' as the application icon.
-.TP
-.HP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar.
-.TP
-.HP
-.B \-\-config <filename>
-Use alternative configuration file.
-.TP
-.HP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'.
-.TP
-.HP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.HP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.HP
-.B \-\-style <style>
-Sets the application GUI style.
-.TP
-.HP
-.B \-\-geometry <geometry>
-Sets the client geometry of the main widget.
-
-.SH "SEE ALSO"
-.BR passwd (1).
-
-.SH AUTHOR
-Andre Ramos <andre@alunos.di.fc.ul.pt>
diff --git a/ubuntu/raring/tdebase/debian/man/tdepasswd-trinity.1 b/ubuntu/raring/tdebase/debian/man/tdepasswd-trinity.1
new file mode 100644
index 000000000..67dcedf44
--- /dev/null
+++ b/ubuntu/raring/tdebase/debian/man/tdepasswd-trinity.1
@@ -0,0 +1,169 @@
+.TH TDEPASSWD 1
+
+.SH NAME
+tdepasswd \- graphical frontend to change the user's password
+
+.SH SYNOPSIS
+.B tdepasswd [ \fIQt-options\fR ] [ \fIKDE-options\fR ] \fIoptions\fR
+
+.SH DESCRIPTION
+Changes a UNIX password.
+
+.SH OPTIONS
+.B Generic options:
+.TP
+.HP
+.B \-\-help
+Show help about options
+.TP
+.HP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.HP
+.B \-\-help\-kde
+Show KDE specific options
+.TP
+.HP
+.B \-\-help\-all
+Show all options
+.TP
+.HP
+.B \-\-author
+Show author information
+.TP
+.HP
+.B \-v\fR, \fB \-\-version
+Show version information
+.TP
+.HP
+.B \-\-license
+Show license information
+.TP
+.B Qt options:
+.TP
+.HP
+.B \-\-display <displayname>
+Use the X-server display 'displayname'.
+.TP
+.HP
+.B \-\-session <sessionId>
+Restore the application for the given 'sessionId'.
+.TP
+.HP
+.B \-\-cmap
+Causes the application to install a private 
+color map on an 8-bit display.
+.TP
+.HP
+.B \-\-ncols <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.HP
+.B \-\-nograb
+Tells Qt to never grab the mouse or the keyboard.
+.TP
+.HP
+.B \-\-dograb
+Running under a debugger can cause an implicit
+-nograb, use -dograb to override.
+.TP
+.HP
+.B \-\-sync
+Switches to synchronous mode for debugging.
+.TP
+.HP
+.B \-\-fn, \-\-font <fontname>
+Defines the application font.
+.TP
+.HP
+.B \-\-bg, \-\-background <color> 
+sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.HP
+.B \-\-fg, \-\-foreground <color> 
+Sets the default foreground color.
+.TP
+.HP
+.B \-\-btn, \-\-button <color>
+Sets the default button color.
+.TP
+.HP
+.B \-\-name <name>
+Sets the application name.
+.TP
+.HP
+.B \-\-title <title>
+Sets the application title (caption).
+.TP
+.HP
+.B \-\-visual TrueColor
+Forces the application to use a TrueColor visual on
+an 8-bit display.
+.TP
+.HP
+.B \-\-inputstyle <inputstyle>
+Sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root.
+.TP
+.HP
+.B \-\-im <XIM server>
+Set XIM server.
+.TP
+.HP
+.B \-\-noxim
+Disable XIM.
+.TP
+.HP
+.B \-\-reverse
+Mirrors the whole layout of widgets.
+.TP
+.B KDE options:
+.TP
+.HP
+.B \-\-caption <caption>
+Use 'caption' as name in the titlebar.
+.TP
+.HP
+.B \-\-icon <icon>
+Use 'icon' as the application icon.
+.TP
+.HP
+.B \-\-miniicon <icon>
+Use 'icon' as the icon in the titlebar.
+.TP
+.HP
+.B \-\-config <filename>
+Use alternative configuration file.
+.TP
+.HP
+.B \-\-dcopserver <server>
+Use the DCOP Server specified by 'server'.
+.TP
+.HP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps.
+.TP
+.HP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.HP
+.B \-\-style <style>
+Sets the application GUI style.
+.TP
+.HP
+.B \-\-geometry <geometry>
+Sets the client geometry of the main widget.
+
+.SH "SEE ALSO"
+.BR passwd (1).
+
+.SH AUTHOR
+Andre Ramos <andre@alunos.di.fc.ul.pt>
diff --git a/ubuntu/raring/tdebase/debian/tdepasswd-trinity.install b/ubuntu/raring/tdebase/debian/tdepasswd-trinity.install
new file mode 100644
index 000000000..43a7beeaa
--- /dev/null
+++ b/ubuntu/raring/tdebase/debian/tdepasswd-trinity.install
@@ -0,0 +1,35 @@
+debian/tmp/opt/trinity/bin/tdepasswd
+debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.la
+debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.so
+debian/tmp/opt/trinity/share/applications/tde/kcm_useraccount.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdepasswd.desktop
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Apple.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/BeachBall.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Blowfish.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Bug.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Butterfly.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Car.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Cow.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Daemon.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Dog.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Elephant.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Flower.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Frog.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Ghost.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Guitar.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Heart.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Konqui.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Lion.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Monkey.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Penguin.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Pig.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Rabbit.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Ring.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Scream.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Shark.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Splash.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Star.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Teddybear.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/Turtle.png
+debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount.kcfg
+debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount_pass.kcfg
diff --git a/ubuntu/raring/tdebase/debian/tdepasswd-trinity.manpages b/ubuntu/raring/tdebase/debian/tdepasswd-trinity.manpages
new file mode 100644
index 000000000..1a6f4abad
--- /dev/null
+++ b/ubuntu/raring/tdebase/debian/tdepasswd-trinity.manpages
@@ -0,0 +1 @@
+debian/man/tdepasswd-trinity.1
diff --git a/ubuntu/raring/tdebase/debian/tdepasswd-trinity.menu b/ubuntu/raring/tdebase/debian/tdepasswd-trinity.menu
new file mode 100644
index 000000000..b448a0860
--- /dev/null
+++ b/ubuntu/raring/tdebase/debian/tdepasswd-trinity.menu
@@ -0,0 +1,6 @@
+?package(tdepasswd):\
+	needs="X11"\
+	section="Applications/System/Administration"\
+	hints="TDE"\
+	title="tdepasswd"\
+	command="/opt/trinity/bin/tdepasswd"
diff --git a/ubuntu/raring/tdeutils/debian/copyright b/ubuntu/raring/tdeutils/debian/copyright
index bae808211..dfe16e1c5 100644
--- a/ubuntu/raring/tdeutils/debian/copyright
+++ b/ubuntu/raring/tdeutils/debian/copyright
@@ -10,7 +10,7 @@ License:
 
 Artistic
 --------
-kdepasswd, tdessh
+tdepasswd, tdessh
 
 BSD
 ---