From 7da68f0f2f2a0e9babadcfe360aaa1635f868606 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 29 May 2013 19:06:12 -0500 Subject: Fix references to kdessh in Debian and Ubuntu packaging --- ubuntu/raring/metapackages/trinity-livecd/debian/control | 2 +- ubuntu/raring/tdeutils/debian/changelog | 8 ++++---- ubuntu/raring/tdeutils/debian/control | 8 ++++---- ubuntu/raring/tdeutils/debian/control.in | 4 ++-- ubuntu/raring/tdeutils/debian/copyright | 2 +- ubuntu/raring/tdeutils/debian/kdessh-trinity.install | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'ubuntu/raring') diff --git a/ubuntu/raring/metapackages/trinity-livecd/debian/control b/ubuntu/raring/metapackages/trinity-livecd/debian/control index 26821839e..a6e95b5b5 100644 --- a/ubuntu/raring/metapackages/trinity-livecd/debian/control +++ b/ubuntu/raring/metapackages/trinity-livecd/debian/control @@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5) Package: trinity-livecd Architecture: all -Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-tdefile-plugins-trinity, tdeadmin-tdefile-plugins-trinity, tdegames-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdenetwork-tdefile-plugins-trinity, tdepim-tdefile-plugins-trinity, tdesdk-tdefile-plugins-trinity, kdessh-trinity, tdesudo-trinity, kdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring +Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-tdefile-plugins-trinity, tdeadmin-tdefile-plugins-trinity, tdegames-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdenetwork-tdefile-plugins-trinity, tdepim-tdefile-plugins-trinity, tdesdk-tdefile-plugins-trinity, tdessh-trinity, tdesudo-trinity, kdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring Recommends: kpresenter-trinity, kspread-trinity, kword-trinity, tde-i18n-cs-trinity, tde-i18n-de-trinity, tde-i18n-es-trinity, tde-i18n-fr-trinity, tde-i18n-it-trinity, tde-i18n-ru-trinity, diff --git a/ubuntu/raring/tdeutils/debian/changelog b/ubuntu/raring/tdeutils/debian/changelog index 71992aefe..9a7b6c55b 100644 --- a/ubuntu/raring/tdeutils/debian/changelog +++ b/ubuntu/raring/tdeutils/debian/changelog @@ -630,7 +630,7 @@ tdeutils (4:3.4.2-1) unstable; urgency=low +++ Changes by Pierre Habouzit: - * Change kdessh depends: ssh becomes (open)ssh-client. (Closes: #315045) + * Change tdessh depends: ssh becomes (open)ssh-client. (Closes: #315045) +++ Changes by Christopher Martin: @@ -781,7 +781,7 @@ tdeutils (4:3.3.1-1) unstable; urgency=low * New upstream release. * KDE_3_3_BRANCH update. - * Added kdessh Depends on ssh. (Closes: #271875) + * Added tdessh Depends on ssh. (Closes: #271875) * Added Build-Depends libxtst-dev. (Closes: #276835) -- Christopher L Cheney Mon, 8 Nov 2004 14:30:00 -0600 @@ -1228,13 +1228,13 @@ tdeutils (4:2.0-20000925-0) unstable; urgency=low * More upstream fixes * Build-Depends fixes - * Fixing kdf-kdessh file mixup (Closes: #72413) + * Fixing kdf-tdessh file mixup (Closes: #72413) -- Ivan E. Moore II Mon, 25 Sep 2000 15:30:00 -0700 tdeutils (4:2.0-20000920-2) unstable; urgency=low - * Removing kdessh and setting proper depends for ark + * Removing tdessh and setting proper depends for ark -- Ivan E. Moore II Thu, 21 Sep 2000 17:30:00 -0700 diff --git a/ubuntu/raring/tdeutils/debian/control b/ubuntu/raring/tdeutils/debian/control index 9d29f17eb..d0556e97b 100644 --- a/ubuntu/raring/tdeutils/debian/control +++ b/ubuntu/raring/tdeutils/debian/control @@ -13,7 +13,7 @@ Section: tde Architecture: all Replaces: kdeutils-kde3 (<< 4:14.0.0), kdeutils-trinity (<< 4:14.0.0) Breaks: kdeutils-kde3 (<< 4:14.0.0), kdeutils-trinity (<< 4:14.0.0) -Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), kdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) +Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) Suggests: tdeutils-trinity-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -137,11 +137,11 @@ Description: infrared control for Trinity This package is part of Trinity, as a component of the KDE utilities module. See the 'kde-trinity' and 'tdeutils-trinity' packages for more information. -Package: kdessh-trinity +Package: tdessh-trinity Section: tde Architecture: any -Replaces: kdessh-kde3 (<< 4:14.0.0), kdessh-trinity (<< 4:14.0.0) -Breaks: kdessh-kde3 (<< 4:14.0.0), kdessh-trinity (<< 4:14.0.0) +Replaces: tdessh-kde3 (<< 4:14.0.0), tdessh-trinity (<< 4:14.0.0) +Breaks: tdessh-kde3 (<< 4:14.0.0), tdessh-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, openssh-client | ssh-client Description: ssh frontend for Trinity This package contains KDE's frontend for ssh. diff --git a/ubuntu/raring/tdeutils/debian/control.in b/ubuntu/raring/tdeutils/debian/control.in index f86496f4d..c922d5426 100644 --- a/ubuntu/raring/tdeutils/debian/control.in +++ b/ubuntu/raring/tdeutils/debian/control.in @@ -11,7 +11,7 @@ Standards-Version: 3.7.2 Package: tdeutils Section: tde Architecture: all -Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), tdewalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version}) +Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), tdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), tdewalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version}) Suggests: tdeutils-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -123,7 +123,7 @@ Description: infrared control for KDE This package is part of KDE, as a component of the KDE utilities module. See the 'kde' and 'tdeutils' packages for more information. -Package: kdessh +Package: tdessh Section: tde Architecture: any Depends: ${shlibs:Depends}, openssh-client | ssh-client diff --git a/ubuntu/raring/tdeutils/debian/copyright b/ubuntu/raring/tdeutils/debian/copyright index f1f81fe64..bae808211 100644 --- a/ubuntu/raring/tdeutils/debian/copyright +++ b/ubuntu/raring/tdeutils/debian/copyright @@ -10,7 +10,7 @@ License: Artistic -------- -kdepasswd, kdessh +kdepasswd, tdessh BSD --- diff --git a/ubuntu/raring/tdeutils/debian/kdessh-trinity.install b/ubuntu/raring/tdeutils/debian/kdessh-trinity.install index f5b56dd0d..cf26ccd1d 100644 --- a/ubuntu/raring/tdeutils/debian/kdessh-trinity.install +++ b/ubuntu/raring/tdeutils/debian/kdessh-trinity.install @@ -1 +1 @@ -debian/tmp/opt/trinity/bin/kdessh +debian/tmp/opt/trinity/bin/tdessh -- cgit v1.2.1