[debian-edu-commits] debian-edu/ 14/15: Reflect changes in d/debian-edu-config.(postinst|lintian-overrides) and Makefile

[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 aac8efc6d8c79876c9435cd9bbcfb79601b4d3ad
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Feb 4 12:32:56 2018 +0100

    Reflect changes in d/debian-edu-config.(postinst|lintian-overrides) and Makefile
---
 Makefile                                   |  5 -----
 debian/debian-edu-config.lintian-overrides |  2 +-
 debian/debian-edu-config.postinst          | 14 --------------
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index da35f50..3f75e42 100644
--- a/Makefile
+++ b/Makefile
@@ -415,15 +415,10 @@ install: install-testsuite
 	set -e ; for f in \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings \
- share/ltsp/plugins/ltsp-build-client/Debian-custom/010-set-resolver \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/011-http-nopipeline \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/015-edu-apt-source \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/020-rootpath \
- share/ltsp/plugins/ltsp-build-client/Debian-custom/025-bootprompt-opts \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs \
- share/ltsp/plugins/ltsp-build-client/Debian-custom/045-remove-udev-net-rules \
- share/ltsp/plugins/ltsp-build-client/Debian-custom/050-nbdquery \
- share/ltsp/plugins/ltsp-build-client/Debian-custom/095-umount-error \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/098-etckeeper \
 	; do \
 		$(INSTALL_DATA) $$f $(DESTDIR)/usr/$$f ; \
diff --git a/debian/debian-edu-config.lintian-overrides b/debian/debian-edu-config.lintian-overrides
index c1e9677..eab60b6 100644
--- a/debian/debian-edu-config.lintian-overrides
+++ b/debian/debian-edu-config.lintian-overrides
@@ -3,7 +3,7 @@ debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/f
 debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/hostname
 debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/wpad-proxy-update
 debian-edu-config binary: command-with-path-in-maintainer-script postinst:51 /usr/bin/etckeeper
-debian-edu-config binary: command-with-path-in-maintainer-script postinst:296 /usr/bin/etckeeper
+debian-edu-config binary: command-with-path-in-maintainer-script postinst:282 /usr/bin/etckeeper
 debian-edu-config binary: non-standard-apache2-configuration-name debian-edu-config-doc.conf != debian-edu-config.conf
 debian-edu-config binary: debconf-is-not-a-registry usr/bin/ldap-debian-edu-install
 debian-edu-config binary: debconf-is-not-a-registry usr/share/debian-edu-config/d-i/finish-install
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index c20d305..5da243b 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -231,20 +231,6 @@ if dpkg --compare-versions "$2" le "1.931~" && [ -f /usr/bin/gtick.ltsp ] ; then
     rm /usr/bin/gtick.ltsp
 fi
 
-# Make sure KDE screen unlocking work on diskless workstations
-# (Skolelinux bug #1415).
-ltsparch="$(dpkg --print-architecture)"
-certfile="/opt/ltsp/$ltsparch/etc/ldap/ssl/ldap-server-pubkey.pem"
-if [ -f "$certfile" ] && [ 644 != "$(stat -c '%a' "$certfile")" ] ; then
-    chmod 644 $certfile
-fi
-
-# Make sure LTSP resolv.conf is readable by all (Skolelinux bug #1416)
-resolvconf="/opt/ltsp/$ltsparch/etc/resolv.conf"
-if [ -f "$resolvconf" ] && [ 644 != "$(stat -c '%a' "$resolvconf")" ] ; then
-    chmod 644 $resolvconf
-fi
-
 # Register all changes done by this postinst script
 if [ -x /usr/bin/etckeeper ] ; then
     etckeeper commit "end of debian-edu-config postinst" || true

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