[debian-edu-commits] debian-edu/ 13/14: Adjust d/debian-edu-config.(maintscript|manpages|postrm|lintian-overrides).

[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 5ebabe69d98da3fe9fb2adf0593539ca126b99a9
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Jan 7 00:03:17 2018 +0100

    Adjust d/debian-edu-config.(maintscript|manpages|postrm|lintian-overrides).
---
 debian/debian-edu-config.lintian-overrides |  2 +-
 debian/debian-edu-config.maintscript       |  3 +++
 debian/debian-edu-config.manpages          |  1 -
 debian/debian-edu-config.postrm            | 11 +++++++++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/debian-edu-config.lintian-overrides b/debian/debian-edu-config.lintian-overrides
index 43ee22a..82af5d3 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:269 /usr/bin/etckeeper
+debian-edu-config binary: command-with-path-in-maintainer-script postinst:272 /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.maintscript b/debian/debian-edu-config.maintscript
index 76e4753..35565e9 100644
--- a/debian/debian-edu-config.maintscript
+++ b/debian/debian-edu-config.maintscript
@@ -13,3 +13,6 @@ rm_conffile /etc/apt/apt.conf.d/99-edu-prefer-iceweasel 1.818+deb8u1
 rm_conffile /etc/init.d/iceweasel-ldapconf 1.818+deb8u1
 rm_conffile /etc/cfengine/debian-edu/cf.iceweasel 1.818+deb8u1
 rm_conffile /usr/share/debian-edu-config/iceweacel-networked-prefs.js 1.818+deb8u1
+rm_conffile /etc/cfengine/debian-edu/cf.* 1.943
+rm_conffile /etc/cfengine/inputs/*.conf 1.943
+rm_conffile /etc/cfengine/*.conf 1.943
diff --git a/debian/debian-edu-config.manpages b/debian/debian-edu-config.manpages
index 650082f..27feaec 100644
--- a/debian/debian-edu-config.manpages
+++ b/debian/debian-edu-config.manpages
@@ -1,4 +1,3 @@
 share/man/man8/debian-edu-restart-services.8
 share/man/man8/debian-edu-test-install.8
-share/man/man8/snakeoil-on-ice.8
 share/man/man1/update-ini-file.1
diff --git a/debian/debian-edu-config.postrm b/debian/debian-edu-config.postrm
index 8eef3ad..3e0da2b 100644
--- a/debian/debian-edu-config.postrm
+++ b/debian/debian-edu-config.postrm
@@ -28,6 +28,17 @@ case "$1" in
 	    rm -f /var/lib/dovecot/auth_success
 	fi
 
+        # Cfengine3 setup files copied at installation time
+	if [ -e /var/lib/cfengine3/inputs/debian-edu ] ; then
+	    rm -rf /var/lib/cfengine3/inputs/debian-edu
+	    rm -rf /var/lib/cfengine3/inputs/
+	fi
+
+        # Don't leave Cfengine3 log files behind
+	if [ -e /var/log/cfengine3/*.log ] ; then
+	    rm /var/log/cfengine3/*.log
+	fi
+
 	# remove /var/lib/dovecot directory (this does not
 	# interfere with dovecot-core, if installed)
 	if [ -e /var/lib/dovecot ] ; then

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