[debian-edu-commits] debian-edu/ 01/03: Re-add erroneously removed ssh-askpass entries.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu.

commit 6372c27f9558352878ec5564fa06ccb37db874a1
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Mar 23 10:26:43 2017 +0100

    Re-add erroneously removed ssh-askpass entries.
    
    Adjusted files:
    tasks/common
    tasks/desktop-gnome
    tasks/desktop-kde
    tasks/desktop-lxde
    tasks/desktop-mate
    tasks/desktop-xfce
    tasks/networked-common
---
 tasks/common           | 1 +
 tasks/desktop-gnome    | 2 +-
 tasks/desktop-kde      | 2 +-
 tasks/desktop-lxde     | 6 ++++++
 tasks/desktop-mate     | 2 +-
 tasks/desktop-xfce     | 6 ++++++
 tasks/networked-common | 1 +
 7 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/tasks/common b/tasks/common
index e77d797..81c8cd4 100644
--- a/tasks/common
+++ b/tasks/common
@@ -20,6 +20,7 @@ Responsible: Petter Reinholdtsen
 NeedConfig:  no
 
 Depends:     openssh-client
+Avoid:       ssh-askpas
 Why:         Allow connections to remote hosts.
 Responsible: Petter Reinholdtsen
 NeedConfig:  no
diff --git a/tasks/desktop-gnome b/tasks/desktop-gnome
index b3d03e6..f0fda89 100644
--- a/tasks/desktop-gnome
+++ b/tasks/desktop-gnome
@@ -35,7 +35,7 @@ Why:         Prefered video / multimedia player for the Gnome environment.
 Responsible: Mike Gabriel
 NeedConfig:  no
 
-Recommends:  ssh-askpass-gnome
+Recommends:  ssh-askpass-gnome | ssh-askpass
 Why:         Gnome implementation of ssh-askpass for ssh login without a
              tty available.
 Responsible: Petter Reinholdtsen
diff --git a/tasks/desktop-kde b/tasks/desktop-kde
index e8d407d..1310d4a 100644
--- a/tasks/desktop-kde
+++ b/tasks/desktop-kde
@@ -72,7 +72,7 @@ Why:         Make sure OOo uses KDEs file dialog.
 Responsible: Petter Reinholdtsen
 Needconfig:  no
 
-Recommends:  ksshaskpass
+Recommends:  ksshaskpass | ssh-askpass
 Why:         KDE implementation of ssh-askpass for ssh login without a
              tty available.
 Responsible: Petter Reinholdtsen
diff --git a/tasks/desktop-lxde b/tasks/desktop-lxde
index d45ae2d..087e34d 100644
--- a/tasks/desktop-lxde
+++ b/tasks/desktop-lxde
@@ -36,3 +36,9 @@ Depends:     totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer
 Why:         Prefered video / multimedia player for the LXDE environment.
 Responsible: Mike Gabriel
 NeedConfig:  no
+
+Recommends:  ssh-askpass
+Why:         X11 implementation of ssh-askpass for ssh login without a
+             tty available.
+Responsible: Petter Reinholdtsen
+Needconfig:  no
diff --git a/tasks/desktop-mate b/tasks/desktop-mate
index 32f14a4..a7a50a6 100644
--- a/tasks/desktop-mate
+++ b/tasks/desktop-mate
@@ -35,7 +35,7 @@ Why:         Prefered video / multimedia player for the MATE environment.
 Responsible: Mike Gabriel
 NeedConfig:  no
 
-Recommends:  ssh-askpass-gnome
+Recommends:  ssh-askpass-gnome | ssh-askpass
 Why:         MATE implementation of ssh-askpass for ssh login without a
              tty available (using GNOME's ssh-askpass here).
 Responsible: Mike Gabriel
diff --git a/tasks/desktop-xfce b/tasks/desktop-xfce
index dc999b6..4aea418 100644
--- a/tasks/desktop-xfce
+++ b/tasks/desktop-xfce
@@ -27,3 +27,9 @@ Recommends:  blueman
 Why:         Bluetooth support in the Xfce desktop environment.
 Responsible: ?
 NeedConfig:  no
+
+Recommends:  ssh-askpass
+Why:         X11 implementation of ssh-askpass for ssh login without a
+             tty available.
+Responsible: Petter Reinholdtsen
+Needconfig:  no
diff --git a/tasks/networked-common b/tasks/networked-common
index 7e02216..8447aa3 100644
--- a/tasks/networked-common
+++ b/tasks/networked-common
@@ -92,6 +92,7 @@ NeedConfig:  Yes
 
 Depends:     openssh-server
 Suggests:    fail2ban
+Avoid:       ssh-askpas
 Why:         Allow remote login and administration.
 Responsible: Petter Reinholdtsen
 NeedConfig:  yes - enable X login etc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu.git