[debian-edu-commits] debian-edu/ 01/01: Remove workarounds from Debian-custom/001-ltsp-settings as #839154 and #840667 have been fixed in ltsp-server 5.5.9-1.

[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-config.

commit cfd42a8314e36ba53a72d736123958129bd34e36
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Dec 8 15:38:23 2016 +0100

    Remove workarounds from Debian-custom/001-ltsp-settings as #839154 and #840667 have been fixed in ltsp-server 5.5.9-1.
---
 debian/changelog                                             |  2 ++
 .../ltsp-build-client/Debian-custom/001-ltsp-settings        | 12 ------------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a804798..ec5a845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ debian-edu-config (1.920) UNRELEASED; urgency=medium
 
   * sbin/update-hostname-from-ip: Adjust to fit new output of ifconfig.
   * cf/cf.homes: Adjust akonadi configuration file location. Thanks Petter.
+  * Remove workarounds from Debian-custom/001-ltsp-settings as #839154 and
+    #840667 have been fixed in ltsp-server 5.5.9-1.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 05 Dec 2016 13:26:34 +0100
 
diff --git a/share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings b/share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings
index c2e3b12..58625e3 100644
--- a/share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings
+++ b/share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings
@@ -18,15 +18,3 @@ case $MODE in
     ) >> $ROOT/etc/apt/apt.conf.d/90ltsp-build-client
   ;;
 esac
-
-# FIXME workaround for package initscripts.
-# should be removed once #839154 is fixed.
-if [ -e /usr/share/ltsp/plugins/ltsp-build-client/Debian/025-var-rw-subdirs ] ; then
-    rm /usr/share/ltsp/plugins/ltsp-build-client/Debian/025-var-rw-subdirs
-fi
-
-# FIXME workaround for wrong /tmp permissions.
-# should be removed once #840667 is fixed.
-if [ -e /usr/share/ltsp/plugins/ltsp-build-client/Debian/005-tmpdir ] ; then
-    rm /usr/share/ltsp/plugins/ltsp-build-client/Debian/005-tmpdir
-fi

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