[debian-edu-commits] debian-edu/ 02/03: postinst: Drop code needed for upgrades from oldoldstable to oldstable, as we don't support skipping an upgrade, we can drop this legacy code now.

[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 64e722fe69acd19b61533b55e6bfa1041e93f816
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Oct 7 17:18:15 2017 +0200

    postinst: Drop code needed for upgrades from oldoldstable to oldstable, as we don't support skipping an upgrade, we can drop this legacy code now.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog                  |  5 ++++-
 debian/debian-edu-config.postinst | 28 ----------------------------
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1eadc95..2175f4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 debian-edu-config (1.935) UNRELEASED; urgency=medium
 
-  * postinst: only try to remove asound.conf if it exists.
+  * postinst: 
+    - Only try to remove asound.conf if it exists.
+    - Drop code needed for upgrades from oldoldstable to oldstable, as we
+      don't support skipping an upgrade, we can drop this legacy code now.
 
  -- Holger Levsen <holger at debian.org>  Sat, 07 Oct 2017 17:08:35 +0200
 
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index 23ede1e..a074538 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -143,34 +143,6 @@ configure)
         invoke-rc.d apache2 restart
     fi
 
-    if dpkg --compare-versions "$2" le "1.818+deb8u1" && [ -L /usr/bin/firefox-esr ] ; then
-	if [ -L /etc/iceweasel/pref/debian-edu-networked.js ] ; then
-	    rm /etc/iceweasel/pref/debian-edu-networked.js
-	fi
-	if [ -e /etc/iceweasel/pref/debian-edu-homepage-ldap.js ] ; then
-	    rm /etc/iceweasel/pref/debian-edu-homepage-ldap.js
-	fi
-	if [ -e /etc/iceweasel/profile/cert_override.txt ] ; then
-	    rm /etc/iceweasel/profile/cert_override.txt
-	fi
-	# for networked profiles only.
-	if grep -q Standalone /etc/debian-edu/config; then
-	    :
-	else
-	    if ! [ -e /etc/firefox-esr/debian-edu-networked.js ] ; then
-		ln -s /usr/share/debian-edu-config/firefox-networked-prefs.js /etc/firefox-esr/debian-edu-networked.js
-		if ! [ -e /etc/ltsp_chroot ] ; then
-		    /usr/share/debian-edu-config/tools/update-firefox-homepage ldap:homepage
-		    if egrep -q "(LTSP-Server|Thin-Client-Server)" /etc/debian-edu/config && [ -d /opt/ltsp ] ; then
-			for ltsp_chroot in `find /opt/ltsp/ -mindepth 1 -maxdepth 1 -type d`; do
-			    chroot $ltsp_chroot /usr/share/debian-edu-config/tools/update-firefox-homepage ldap:homepage
-			done
-		    fi
-		fi
-	    fi
-	fi
-    fi
-
     # sssd refuses to read the file if it has any other mode
     chmod 600 /etc/sssd/sssd-debian-edu.conf
     chown root:root /etc/sssd/sssd-debian-edu.conf

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