[debian-edu-commits] debian-edu/ 01/01: Revert "Add ltsp-docs to tasks/thin-client-server. (Closes: #781039)"

[Holger Levsen]

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

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

commit e54927d24396885389b7747ca9b68a4dcbe4fbbe
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Apr 14 13:02:58 2015 +0000

    Revert "Add ltsp-docs to tasks/thin-client-server. (Closes: #781039)"
    
    This reverts commit 728941efd9edafa781260dfaf40a897789ef0c1c.
---
 debian-edu-tasks.desc    | 1 +
 debian/changelog         | 1 -
 debian/control           | 1 +
 tasks/thin-client-server | 2 +-
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian-edu-tasks.desc b/debian-edu-tasks.desc
index 3dec2d6..fa7d6cf 100644
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -2142,6 +2142,7 @@ Packages: list
  tftp-hpa
  ltsp-server-standalone
  ltspfs
+ ltsp-docs
  rdiff-backup
  nbd-server
  education-workstation
diff --git a/debian/changelog b/debian/changelog
index 177fa10..7779b43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,6 @@ debian-edu (1.812) UNRELEASED; urgency=high
     without sugar. (Closes: #782504) 
   * Add cups-browsed to task-common, to support automatic printer discovery.
     (Closes: #779645)
-  * Add ltsp-docs to tasks/thin-client-server. (Closes: #781039)
 
  -- Holger Levsen <holger at debian.org>  Tue, 10 Mar 2015 16:25:17 +0100
 
diff --git a/debian/control b/debian/control
index 1edcb2a..5f3b1b8 100644
--- a/debian/control
+++ b/debian/control
@@ -1180,6 +1180,7 @@ Recommends: atftpd | tftpd-hpa,
  gstreamer0.10-pulseaudio,
  iptables,
  isc-dhcp-server-ldap,
+ ltsp-docs,
  ltsp-server-standalone,
  ltspfs,
  nagios-nrpe-server,
diff --git a/tasks/thin-client-server b/tasks/thin-client-server
index 51c28be..9434c9d 100644
--- a/tasks/thin-client-server
+++ b/tasks/thin-client-server
@@ -30,7 +30,7 @@ Why:         We use ltsp boot images
 Responsible: Ragnar WislÞff
 Needconfig:  ?
 
-Depends:     ltsp-server-standalone, ltspfs, ltsp-docs
+Depends:     ltsp-server-standalone, ltspfs
 Why:         Debian package based LTSP server for diskless and thin clients.
 Responsible: Petter Reinholdtsen
 NeedConfig:  yes

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