[debian-edu-commits] debian-edu/ 01/01: Cleanup postinst, preinst and prerm scripts which pre-jessie code.

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

commit 691bdca54e8d290b4d67ca31f6ce3746bca03667
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Jul 17 17:03:32 2016 +0200

    Cleanup postinst, preinst and prerm scripts which pre-jessie code.
---
 debian/changelog                  |  3 ++
 debian/debian-edu-config.postinst | 68 ---------------------------------------
 debian/debian-edu-config.preinst  |  9 ------
 debian/debian-edu-config.prerm    |  4 ---
 4 files changed, 3 insertions(+), 81 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 668e5c3..9b027f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,9 @@ debian-edu-config (1.906) UNRELEASED; urgency=medium
   * Add code to cleanup iceweasel and firefox-esr related conffiles in
     postinst and preinst scripts.
 
+  [ Holger Levsen ]
+  * Cleanup postinst, preinst and prerm scripts which pre-jessie code.
+
  -- Mike Gabriel <sunweaver at debian.org>  Thu, 07 Jul 2016 12:01:08 +0200
 
 debian-edu-config (1.905) unstable; urgency=medium
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index b4bc494..9ac4ca2 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -81,19 +81,6 @@ mv_conffile() {
 }
 
 
-# Disable/remove divert created by update-iceweasel-homepage in
-# Squeeze.
-disable_iceweasel_homepage_divert() {
-    file=/usr/share/iceweasel/browserconfig.properties
-    etcfile=/etc/iceweasel/browserconfig.properties
-    if [ "$etcfile" = "$(readlink $file)" ] ; then
-	rm $file
-	dpkg-divert --package debian-edu-config \
-	    --rename --quiet --remove $file
-	rm $etcfile
-    fi
-}
-
 # Execute early, to get the state before changes activated by this
 # package is done.
 if [ -x /usr/bin/etckeeper ] ; then
@@ -136,15 +123,6 @@ if [ "$RET" = "false" ] ; then
 	fi
 fi
 
-# Remove now obsolete diverted config file as bug #656309 is fixed
-if [ configure = "$1" ] && \
-    dpkg --compare-versions "$2" le "1.726" && \
-    [ -h /usr/share/pam-configs/edu-krb5 ]; then
-    dpkg-divert --package debian-edu-config --remove /usr/share/pam-configs/krb5
-    rm /usr/share/pam-configs/edu-krb5
-    pam-auth-update --package --remove edu-krb5
-fi
-
 pam-auth-update --package
 
 # Some init-scripts fail if to many fd is open ??
@@ -184,52 +162,6 @@ fi
 
 case "$1" in
 configure)
-    if dpkg --compare-versions "$2" le "1.446~svn71241"; then
-        rm_conffile debian-edu-config /etc/X11/Xsession.d/15debian-edu-ltsp
-    fi
-
-    if dpkg --compare-versions "$2" le "1.446~svn73270"; then
-        update-rc.d -f update-hostname remove
-        rm_conffile debian-edu-config /etc/init.d/update-hostname
-    fi
-
-    if dpkg --compare-versions "$2" le "1.446~svn73463"; then
-        update-rc.d -f open-backdoor remove
-        rm_conffile debian-edu-config /etc/init.d/open-backdoor
-    fi
-
-    if dpkg --compare-versions "$2" le "1.447"; then
-        rm_conffile debian-edu-config /etc/cfengine/debian-edu/cf.network-manager
-    fi
-
-    if dpkg --compare-versions "$2" le "1.448~svn75140"; then
-        rm_conffile debian-edu-config /etc/ldap/dhcp.ldif
-        rm_conffile debian-edu-config /etc/ldap/dhcp_hosts.ldif
-        rm_conffile debian-edu-config /etc/ldap/dns_skole.ldif
-        rm_conffile debian-edu-config /etc/ldap/dns_arpa.ldif
-        rm_conffile debian-edu-config /etc/ldap/dns_ranges.ldif
-    fi
-
-    if dpkg --compare-versions "$2" le "1.708~svn81297"; then
-        rm_conffile debian-edu-config /etc/cfengine/debian-edu/cf.mplayer
-    fi
-
-    if dpkg --compare-versions "$2" le "1.714~svn82243"; then
-        rm_conffile debian-edu-config /etc/cfengine/debian-edu/cf.lwat
-    fi
-
-    if dpkg --compare-versions "$2" le "1.710~svn81721"; then
-        disable_iceweasel_homepage_divert
-    fi
-
-    if dpkg --compare-versions "$2" le "1.715"; then
-	swapfiles=/var/opt/ltsp/swapfiles
-	if [ -d $swapfiles ] && getent passwd nbd > /dev/null ; then
-	    chmod 700 $swapfiles
-	    chown nbd:nbd $swapfiles
-	fi
-    fi
-
     if dpkg --compare-versions "$2" le "1.811"; then
 	rm_conffile debian-edu-config /etc/cfengine/debian-edu/cf.pdns
 	rm_conffile debian-edu-config /etc/insserv.conf.d/debian-edu-config
diff --git a/debian/debian-edu-config.preinst b/debian/debian-edu-config.preinst
index 2e34148..5eb5efc 100644
--- a/debian/debian-edu-config.preinst
+++ b/debian/debian-edu-config.preinst
@@ -39,15 +39,6 @@ case "$1" in
 install)
     ;;
 upgrade)
-    if dpkg --compare-versions "$2" le "1.446~svn73270"; then
-	update-rc.d -f update-hostname remove
-	rm_conffile debian-edu-config /etc/init.d/update-hostname
-    fi
-
-    if dpkg --compare-versions "$2" le "1.446~svn73463"; then
-	update-rc.d -f open-backdoor remove
-	rm_conffile debian-edu-config /etc/init.d/open-backdoor
-    fi
 
     if dpkg --compare-versions "$2" le "1.818+deb8u1" && [ -e /etc/firefox-esr ] ; then
 	if [ -e /etc/X11/Xsession.d/06debian-edu-iceweasel-ltsp ] ; then
diff --git a/debian/debian-edu-config.prerm b/debian/debian-edu-config.prerm
index 8782714..09313ba 100644
--- a/debian/debian-edu-config.prerm
+++ b/debian/debian-edu-config.prerm
@@ -18,10 +18,6 @@ case "$1" in
 	    && [ -x /usr/sbin/debian-edu-ltsp-audiodivert ] ; then
 	    debian-edu-ltsp-audiodivert remove
 	fi
-	if [ remove = "$1" ] && [ -e /usr/share/pam-configs/edu-krb5 ]; then
-            dpkg-divert --package debian-edu-config --remove /usr/share/pam-configs/krb5
-	    rm /usr/share/pam-configs/edu-krb5
-	fi
 	if [ remove = "$1" ] && [ -e /usr/share/pam-configs/edu-nopwdchange ]; then
 	    rm /usr/share/pam-configs/edu-nopwdchange
 	fi

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