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

8 files changed, 17 insertions, 17 deletions

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/squeeze/tdebase/debian/man/kdepasswd-trinity.1 b/debian/squeeze/tdebase/debian/man/tdepasswd-trinity.1
index 44a4128cc..67dcedf44 100644
--- a/debian/squeeze/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
 ---