summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise
diff options
context:
space:
mode:
authorFran├žois Andriot <albator78@libertysurf.fr>2013-07-22 14:39:00 +0200
committerFran├žois Andriot <albator78@libertysurf.fr>2013-07-22 14:39:00 +0200
commit74621724ffaa3c693ea3dc84493a9010326ee11a (patch)
tree5e7fbbc93652da544dff9402b63606221c7f026e /ubuntu/precise
parenteaa27cfab10809dface087064bb55281502c8336 (diff)
parentcc02da17a4934e0768590ca9b3493cfab9b38d4a (diff)
downloadtde-packaging-74621724ffaa3c693ea3dc84493a9010326ee11a.tar.gz
tde-packaging-74621724ffaa3c693ea3dc84493a9010326ee11a.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/precise')
-rw-r--r--ubuntu/precise/tdebase/debian/control8
-rw-r--r--ubuntu/precise/tdebase/debian/kdepasswd-trinity.manpages1
-rw-r--r--ubuntu/precise/tdebase/debian/kdepasswd-trinity.menu6
-rw-r--r--ubuntu/precise/tdebase/debian/man/tdepasswd-trinity.1 (renamed from ubuntu/precise/tdebase/debian/man/kdepasswd-trinity.1)6
-rw-r--r--ubuntu/precise/tdebase/debian/tdepasswd-trinity.install (renamed from ubuntu/precise/tdebase/debian/kdepasswd-trinity.install)4
-rw-r--r--ubuntu/precise/tdebase/debian/tdepasswd-trinity.manpages1
-rw-r--r--ubuntu/precise/tdebase/debian/tdepasswd-trinity.menu6
-rw-r--r--ubuntu/precise/tdeutils/debian/copyright2
8 files changed, 17 insertions, 17 deletions
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.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/tdepasswd-trinity.1
index 44a4128cc..67dcedf44 100644
--- a/ubuntu/precise/tdebase/debian/man/kdepasswd-trinity.1
+++ b/ubuntu/precise/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/precise/tdebase/debian/kdepasswd-trinity.install b/ubuntu/precise/tdebase/debian/tdepasswd-trinity.install
index 06a22062c..43a7beeaa 100644
--- a/ubuntu/precise/tdebase/debian/kdepasswd-trinity.install
+++ b/ubuntu/precise/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/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
---