[debian-edu-commits] debian-edu/ 01/01: Drop lenny age code from debian-edu-config.(preinst|postinst).

Holger Levsen holger at moszumanska.debian.org
Tue Oct 21 13:28:48 UTC 2014


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 f54496e9e0cd66121a5073ddd6310aa9ace53fe7
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Oct 21 15:27:52 2014 +0200

    Drop lenny age code from debian-edu-config.(preinst|postinst).
    
    Drop code from debian-edu-config.(preinst|postinst) handling upgrades from
    lenny area packages and earlier. Kept the squeeze stuff for people skipping
    a release. (Which is still unsupported but we can still be helpful.)
---
 debian/changelog                  |   4 +
 debian/debian-edu-config.postinst |  61 -------------
 debian/debian-edu-config.preinst  | 174 --------------------------------------
 3 files changed, 4 insertions(+), 235 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 87cfb9b..3430700 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ debian-edu-config (1.812) UNRELEASED; urgency=low
   * Drop debian/TODO.Squeeze, the content was obsolete anyway.
   * Drop cf/cf.pdns, we switched backed to bind9.
   * Drop class lenny in cf/cfengine.conf and cf/cf.kdm.
+  * Drop code from debian-edu-config.(preinst|postinst) handling upgrades
+    from lenny area packages and earlier. Kept the squeeze stuff for people
+    skipping a release. (Which is still unsupported but we can still be
+    helpful.)
 
  -- Petter Reinholdtsen <pere at debian.org>  Mon, 20 Oct 2014 20:54:21 +0200
 
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index 2025e2d..22495c1 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -184,67 +184,6 @@ fi
 
 case "$1" in
 configure)
-    if dpkg --compare-versions "$2" le "1.431~svn60646"; then
-	for initscript in boot_xconf update-hostname ; do
-		update-rc.d -f $initscript remove
-	done
-        # Remove obsolete conffile
-        rm_conffile debian-edu-config /etc/init.d/boot_xconf
-    fi
-
-    if dpkg --compare-versions "$2" le "1.442~svn65185"; then
-        # Remove obsolete conffile
-        update-rc.d -f resize_lvm remove
-        rm_conffile debian-edu-config /etc/init.d/resize_lvm
-    fi
-
-    if dpkg --compare-versions "$2" le "1.442~svn65396"; then
-        mv_conffile /etc/debian-edu/www/index.html.no \
-	    /etc/debian-edu/www/index.html.nb
-    fi
-
-    if dpkg --compare-versions "$2" le "1.443~svn65825"; then
-        rm_conffile debian-edu-config /etc/krb5-winbind-debian-edu.conf
-    fi
-
-    if dpkg --compare-versions "$2" le "1.443~svn66212"; then
-        rm_conffile debian-edu-config /etc/X11/Xsession.d/10debian-edu-set-umask
-        rm_conffile debian-edu-config /etc/profile.d/debian-edu.sh
-    fi
-
-    if dpkg --compare-versions "$2" le "1.443~svn66304"; then
-        rm_conffile debian-edu-config /etc/insserv/overrides/nslcd
-    fi
-
-    if dpkg --compare-versions "$2" le "1.443~svn67193"; then
-	rm_conffile debian-edu-config /etc/dhclient-exit-hooks
-	rm_conffile debian-edu-config /etc/insserv/overrides/dhcp3-server
-	for file in dhclient-debian-edu.conf dhcpd-debian-edu.conf; do
-	    rm_conffile debian-edu-config /etc/dhcp3/$file
-	done
-	rm_conffile debian-edu-config /etc/dhcp3/dhclient-exit-hooks.d/wpad-proxy-update
-	## remove broken links now:
-	for link in `find -L /etc/dhcp3/ -type l -name "*debian-edu*"`; do
-	    rm $link
-	done
-	for dir in /etc/dhcp3/dhclient-exit-hooks.d /etc/dhcp3 ; do
-	    if [ -d $dir ] ; then
-		rmdir --ignore-fail-on-non-empty $dir
-	    fi
-	done
-    fi
-    if dpkg --compare-versions "$2" le "1.443~svn67294"; then
-        rm_conffile debian-edu-config /etc/pam.d/common-account-ldap-debian-edu
-        rm_conffile debian-edu-config /etc/pam.d/common-account-winbind-debian-edu
-        rm_conffile debian-edu-config /etc/pam.d/common-auth-debian-edu
-        rm_conffile debian-edu-config /etc/pam.d/common-auth-ldap-debian-edu
-        rm_conffile debian-edu-config /etc/pam.d/common-auth-winbind-debian-edu
-        rm_conffile debian-edu-config /etc/pam.d/common-password-ldap-debian-edu
-        rm_conffile debian-edu-config /etc/pam.d/common-password-winbind-debian-edu
-        rm_conffile debian-edu-config /etc/pam.d/common-session-debian-edu
-        rm_conffile debian-edu-config /etc/pam.d/common-session-winbind-debian-edu
-    fi
-
     if dpkg --compare-versions "$2" le "1.446~svn71241"; then
         rm_conffile debian-edu-config /etc/X11/Xsession.d/15debian-edu-ltsp
     fi
diff --git a/debian/debian-edu-config.preinst b/debian/debian-edu-config.preinst
index d7ac071..d78ed68 100644
--- a/debian/debian-edu-config.preinst
+++ b/debian/debian-edu-config.preinst
@@ -39,180 +39,6 @@ case "$1" in
 install)
     ;;
 upgrade)
-    if dpkg --compare-versions "$2" le "1.416+svn39965"; then
-	for initdscript in loadcpufreq ; do
-	    rm_conffile debian-edu-config /etc/init.d/$initdscript
-	    update-rc.d $initdscript remove
-	done
-	for file in \
-	    /etc/X11/Xsession.d/20debian-edu-kdedirs \
-	    /etc/bind/debian-edu/named-bind8.conf \
-	    /etc/cfengine/debian-edu/cf.amanda \
-	    /etc/cfengine/debian-edu/cf.apache \
-	    /etc/cfengine/debian-edu/cf.bind8 \
-	    /etc/cfengine/debian-edu/cf.cpufrequtils \
-	    /etc/cfengine/debian-edu/cf.devfsd \
-	    /etc/cfengine/debian-edu/cf.dsp \
-	    /etc/cfengine/debian-edu/cf.issue \
-	    /etc/cfengine/debian-edu/cf.kdm_hdwarn \
-	    /etc/cfengine/debian-edu/cf.mozilla \
-	    /etc/cfengine/debian-edu/cf.opera \
-	    /etc/cfengine/debian-edu/cf.sarge-installation-cleanup \
-	    /etc/cfengine/debian-edu/cf.shell \
-	    /etc/cfengine/debian-edu/cf.shorewall \
-	    /etc/cfengine/debian-edu/cf.udev \
-	    /etc/cfengine/debian-edu/cf.webmin \
-	    /etc/ldap/slapd-debian-edu.conf \
-	    /etc/ldap/slapd-sarge_debian-edu.conf \
-	    /etc/pam.d/cron-debian-edu \
-	    /etc/pam.d/cupsys-debian-edu \
-	    /etc/pam.d/kde-debian-edu \
-	    /etc/pam.d/kscreensaver-debian-edu \
-	    /etc/pam.d/login-debian-edu \
-	    /etc/pam.d/other-debian-edu \
-	    /etc/pam.d/passwd-debian-edu \
-	    /etc/pam.d/samba-debian-edu \
-	    /etc/pam.d/ssh-debian-edu \
-	    /etc/pam.d/su-debian-edu \
-	    /etc/skel/.kde/share/config/kmailrc \
-	    ; do
-	    rm_conffile debian-edu-config $file
-	done
-    fi
-    if dpkg --compare-versions "$2" le "1.419"; then
-	for file in \
-	    /etc/munin/debian-edu-munin.conf \
-	    ; do
-	    rm_conffile debian-edu-config $file
-	done
-    fi
-    if dpkg --compare-versions "$2" le "1.419"; then
-	for file in \
-            /etc/apt/apt.conf.d/05debian-edu-etc-svk \
-	    ; do
-	    rm_conffile debian-edu-config $file
-	done
-    fi
-    if dpkg --compare-versions "$2" le "1.421"; then
-	for file in \
-	    /etc/cfengine/debian-edu/cf.iceweasel \
-	    /etc/modutils/debian-edu-config \
-	    ; do
-	    rm_conffile debian-edu-config $file
-	done
-    fi
-
-    if dpkg --compare-versions "$2" le "1.421"; then
-	for file in \
-            /etc/ldap/schema/EduPerson.schema \
-            /etc/ldap/schema/norEduPerson.schema \
-	    ; do
-	    rm_conffile debian-edu-config $file
-	done
-    fi
-
-    if dpkg --compare-versions "$2" le "1.426"; then
-	for file in \
-            /etc/nagios2/apache2.conf \
-	    /etc/nagios2/commands.cfg \
-	    /etc/nagios2/resource.cfg \
-	    /etc/nagios2/debian-edu/htpasswd.users \
-	    /etc/nagios2/debian-edu/host_templates.cfg \
-	    /etc/nagios2/debian-edu/hostgroups.cfg \
-	    /etc/nagios2/debian-edu/dependencies.cfg \
-	    /etc/nagios2/debian-edu/commands.cfg \
-	    /etc/nagios2/debian-edu/services.cfg \
-	    /etc/nagios2/debian-edu/timeperiods.cfg \
-	    /etc/nagios2/debian-edu/hostextinfo.cfg \
-	    /etc/nagios2/debian-edu/contactgroups.cfg \
-	    /etc/nagios2/debian-edu/cgi.cfg \
-	    /etc/nagios2/debian-edu/escalations.cfg \
-	    /etc/nagios2/debian-edu/service_templates.cfg \
-	    /etc/nagios2/debian-edu/resources.cfg \
-	    /etc/nagios2/debian-edu/contacts.cfg \
-	    /etc/nagios2/debian-edu/servicegroups.cfg \
-	    /etc/nagios2/debian-edu/nagios.cfg \
-	    /etc/nagios2/debian-edu/serviceextinfo.cfg \
-	    /etc/nagios2/debian-edu/hosts.cfg \
-	    ; do
-	    rm_conffile debian-edu-config $file
-	done
-    fi
-
-    if dpkg --compare-versions "$2" le "1.432~svn61068"; then
-	for file in \
-	    /etc/usbmount/usbmount-debian-edu.conf \
-	    ; do
-	    rm_conffile debian-edu-config $file
-	done
-	if [ -L /etc/usbmount/usbmount.conf ] &&
-	    "$(readlink /etc/usbmount/usbmount.conf)" \
-		= usbmount-debian-edu.conf ; then
-	    rm /etc/usbmount/usbmount.conf
-	fi
-    fi
-
-    if dpkg --compare-versions "$2" le "1.433~svn61254"; then
-	for file in \
-	    /etc/nagios/nagios-debian-edu.cfg \
-	    /etc/nagios/debian-edu/services.cfg \
-	    /etc/nagios/debian-edu/dependencies.cfg \
-	    /etc/nagios/debian-edu/servicetemplates.cfg \
-	    /etc/nagios/debian-edu/skolelinux_logo.png \
-	    /etc/nagios/debian-edu/hostgroups/servers.cfg \
-	    /etc/nagios/debian-edu/hostgroups/gateways.cfg \
-	    /etc/nagios/debian-edu/hosts/tjener.cfg \
-	    /etc/nagios/debian-edu/hosts/gateway.cfg \
-	    /etc/nagios/debian-edu/skolelinux_logo_140.png \
-	    /etc/nagios/debian-edu/timeperiods.cfg \
-	    /etc/nagios/debian-edu/hosttemplates.cfg \
-	    /etc/nagios/debian-edu/index.html \
-	    /etc/nagios/debian-edu/main.html \
-	    /etc/nagios/debian-edu/side.html \
-	    /etc/nagios/debian-edu/htpasswd.users \
-	    /etc/nagios/debian-edu/contactgroups.cfg \
-	    /etc/nagios/debian-edu/checkcommands.cfg \
-	    /etc/nagios/debian-edu/misccommands.cfg \
-	    /etc/nagios/debian-edu/contacts.cfg \
-	    /etc/nagios/debian-edu/resource.cfg \
-	    /etc/cfengine/debian-edu/cf.bind9 \
-	    /etc/cfengine/debian-edu/cf.locale \
-	    /etc/cfengine/debian-edu/cf.munin \
-	    /etc/cfengine/debian-edu/cf.nagios \
-	    /etc/cfengine/debian-edu/cf.nagios2 \
-	    /etc/cfengine/debian-edu/cf.ssh \
-	    /etc/cfengine/debian-edu/cf.pcmcia \
-	    /etc/cfengine/debian-edu/cf.mime-support \
-	    /etc/cfengine/debian-edu/cf.nat \
-	    /etc/cfengine/debian-edu/cf.slbackup \
-	    ; do
-	    rm_conffile debian-edu-config $file
-	done
-    fi
-
-    if dpkg --compare-versions "$2" le "1.442~svn65185"; then
-	update-rc.d -f resize_lvm remove
-	rm_conffile debian-edu-config /etc/init.d/resize_lvm
-    fi
-
-    if dpkg --compare-versions "$2" le "1.442~svn65396"; then
-        prep_mv_conffile debian-edu-config /etc/debian-edu/www/index.html.no
-    fi
-
-    # Make symlink is replaced with the content before the file is
-    # removed.
-    if dpkg --compare-versions "$2" le "1.443~svn67947" && \
-	[ /usr/share/debian-edu-config/rsyslog-client = \
-	"$(readlink /etc/rsyslog.d/debian-edu-client.conf)" ] ; then
-	(
-	    cd /etc/rsyslog.d
-	    cat debian-edu-client.conf > debian-edu-client.conf.new
-	    chmod a+r debian-edu-client.conf.new
-	    rm debian-edu-client.conf
-	    mv debian-edu-client.conf.new debian-edu-client.conf
-	)
-    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

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



More information about the debian-edu-commits mailing list