debian/changelog

@@ -17,6 +17,9 @@ debian-edu-config (2.11.4) UNRELEASED; urgency=medium
   * Drop share/debian-edu-config/tools/password-fix-squeeze-r0 for the same
     reason.
   * Drop stuff commented out in 2012 in ldap-bootstrap/root.ldif.
+  * Drop (some) code for upgrades from before buster in
+    debian/debian-edu-config.postinst and
+    debian/debian-edu-config.maintscript.
 
  -- Wolfgang Schweer <wschweer@arcor.de>  Tue, 08 Oct 2019 23:10:38 +1300
 

debian/debian-edu-config.maintscript

-mv_conffile /etc/apache2/sites-available/debian-edu-default /etc/apache2/sites-available/debian-edu-default.conf 1.719
-mv_conffile /etc/apache2/sites-available/debian-edu-ssl-default /etc/apache2/sites-available/debian-edu-ssl-default.conf 1.719
-mv_conffile /etc/apache2/conf.d/debian-edu-config-doc /etc/apache2/conf-available/debian-edu-config-doc.conf 1.719
-rm_conffile /etc/cfengine/debian-edu/cf.pdns 1.811
-rm_conffile /etc/insserv.conf.d/debian-edu-config 1.811
-rm_conffile /etc/powerdns/pdns.d/pdns-debian-edu.conf 1.811
-rm_conffile /etc/X11/Xsession.d/06debian-edu-iceweasel-ltsp 1.818+deb8u1
-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.kdm 1.906
-rm_conffile /etc/insserv/overrides/kdm 1.906
-rm_conffile /etc/ldap/slapd-debian-edu.conf 1.911
-rm_conffile /etc/ldap/slapd-lenny_debian-edu.conf 1.911
 rm_conffile /etc/cfengine3/debian-edu/cf.pki 2.10.19
 rm_conffile /etc/cfengine3/debian-edu/cf.thunderbird 2.10.19
 rm_conffile /etc/desktop-profiles/debian-edu-config.listing 2.10.22

debian/debian-edu-config.postinst

@@ -136,71 +136,6 @@ configure)
         rm -f /etc/ldap/slapd-squeeze_debian-edu.conf
     fi
 
-    if dpkg --compare-versions "$2" le "1.929" && dpkg --compare-versions "$2" ge "1.926" && \
-        egrep -q "(Main-Server)" /etc/debian-edu/config ; then
-	rm /etc/apache2/mods-available/userdir.load
-	cp /etc/apache2/mods-available/status.load /etc/apache2/mods-available/userdir.load
-	sed -i 's/status/userdir/g' /etc/apache2/mods-available/userdir.load
-	if ! [ -L /etc/apache2/mods-available/debian-edu-userdir.load ] ; then
-	    ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load
-	fi
-        if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
-             . /usr/share/apache2/apache2-maintscript-helper
-             apache2_invoke enmod debian-edu-userdir
-        fi
-    fi
-
-    if dpkg --compare-versions "$2" le "1.933" && [ -f /etc/asound.conf ] ; then
-	rm /etc/asound.conf
-    fi
-
-    if dpkg --compare-versions "$2" le "1.937" && \
-        [ -f /usr/share/debian-edu-config/tools/debian-edu-dovecot-create-cert ] ; then
-	rm /usr/share/debian-edu-config/tools/debian-edu-dovecot-create-cert
-    fi
-
-    if dpkg --compare-versions "$2" le "1.939" ; then
-        if [ -f /usr/share/debian-edu-config/tools/exim4-create-cert ] ; then
-	    rm /usr/share/debian-edu-config/tools/exim4-create-cert
-        fi
-        if [ -f /usr/sbin/snakeoil-on-ice ] ; then
-	    rm /usr/sbin/snakeoil-on-ice
-        fi
-        if [ -f /etc/skel/.mozilla/firefox/debian-edu.default/cert_override.txt ] ; then
-	    rm /etc/skel/.mozilla/firefox/debian-edu.default/cert_override.txt
-        fi
-    fi
-
-    if dpkg --compare-versions "$2" le "1.941" ; then
-        if [ -f /etc/debian-edu/www/index.html.es ] ; then
-	    rm /etc/debian-edu/www/index.html.es
-        fi
-        if [ -f /etc/debian-edu/www/index.html.nb ] ; then
-	    rm /etc/debian-edu/www/index.html.nb
-        fi
-    fi
-
-    if dpkg --compare-versions "$2" le "1.942" && \
-        [ -f /usr/share/ltsp/init-ltsp.d/70-edu-client-core ] ; then
-	rm /usr/share/ltsp/init-ltsp.d/70-edu-client-core
-    fi
-
-    # cleanup from cfengine2
-    if dpkg --compare-versions "$2" le "1.944" ; then
-        if [ -d /etc/cfengine/debian-edu ] ; then
-	    rm /etc/cfengine/debian-edu -rf
-        fi
-        if [ -d /etc/cfengine/inputs ] ; then
-	    rm /etc/cfengine/inputs -rf
-        fi
-        if [ -f /etc/cfengine/cfservd.conf ] ; then
-	    rm /etc/cfengine/cfservd.conf
-        fi
-        if [ -f /etc/cfengine/update.conf ] ; then
-	    rm /etc/cfengine/update.conf
-        fi
-    fi
-
     if dpkg --compare-versions "$2" le "2.10.19" && \
         [ -f /usr/share/man/man1/.1.gz ] ; then
 	rm /usr/share/man/man1/.1.gz
@@ -269,13 +204,6 @@ if [ -h /etc/exim4/exim4.conf ] && [ -x /etc/init.d/exim4 ] ; then
 	fi
 fi
 
-# cleanup from debian-edu-ltsp-audiodivert
-if dpkg --compare-versions "$2" le "1.931~" && [ -f /usr/bin/gtick.ltsp ] ; then
-    rm /usr/bin/gtick
-    dpkg-divert --package debian-edu-config --rename --remove /usr/bin/gtick
-    rm /usr/bin/gtick.ltsp
-fi
-
 # Register all changes done by this postinst script
 if which etckeeper > /dev/null ; then
     etckeeper commit "end of debian-edu-config postinst" || true