[debian-edu-commits] debian-edu/ 01/01: debian-edu-install.postinst: update version number in /etc/debian-edu/config on upgrades.

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

commit 3da8c380327e8f2bad5f22b4ac51a09186844989
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Aug 14 11:08:22 2017 -0400

    debian-edu-install.postinst: update version number in /etc/debian-edu/config on upgrades.
---
 debian/changelog                   |  5 +++--
 debian/debian-edu-install.postinst | 33 ++-------------------------------
 2 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6c7298f..9e95abd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ debian-edu-install (1.917) UNRELEASED; urgency=medium
   * Bump Standards-Version to 4.0.1, no changes needed.
   * Drop no longer active people from uploaders, thanks for all your work: 
     - Andrew Lee (李健秋).
-  * debian-edu-install.postinst: drop workaround for missing versions present
-    between 1.810 and 1.813.
+  * debian-edu-install.postinst:
+    - drop workaround for missing versions present between 1.810 and 1.813.
+    - update version number in /etc/debian-edu/config on upgrades.
 
  -- Holger Levsen <holger at debian.org>  Sat, 05 Aug 2017 17:58:22 -0400
 
diff --git a/debian/debian-edu-install.postinst b/debian/debian-edu-install.postinst
index cfb99cd..b81caec 100644
--- a/debian/debian-edu-install.postinst
+++ b/debian/debian-edu-install.postinst
@@ -125,38 +125,9 @@ oldversions="sarge \
 new_version="$(cat /usr/lib/debian-edu-install/version)"
 
 if [ -f $debian_edu_config ] ; then
-	( # Subshell to avoid importing the variables into the entire script
-	VERSION=""
-	. $debian_edu_config
-
-	# FIXME: the following code doesn't seem to make any sense and should
-	# be cleaned up post jessie release. It's seems way simpler (and
-	# easier to maintain) to just rewrite /etc/debian-edu/config on
-	# upgrades like it done on installation in pre-pkgsel (from this
-	# package).
-
-	# Need to list versions with space here, to avoid unwanted
-	# word splitting
-	for i in $oldversions '3.0r0 terra' '3.0r1 terra' '4.0r0 luna alpha1' \
-                 '5.0r0+edu0 alpha' '5.0.0+edu0 alpha' '5.0.1+edu0 alpha' \
-                 '5.0.2+edu0 alpha' '5.0.3+edu0 alpha' '5.0.3+edu0 rc1' \
-                 '5.0.4+edu0 rc2' '5.0.4+edu0' '5.0.6+edu1' '6.0.0+edu0 alpha' \
-                 '6.0.3+edu0 beta1' '6.0.3+edu0 beta2' '6.0.3+edu0 beta3' \
-                 '6.0.4+edu0 beta3' '6.0.4+edu0 rc1' '6.0.4+edu0 rc2' \
-	         '6.0.4+edu0 rc3' '6.0.4+edu+r0' '6.0.7+edu+r1' \
-	         '7.0.0+edu+alpha0' '7.0.0+edu+alpha2' '7.0.0+edu+alpha3' \
-		 '7.1+edu0~a3' '7.1+edu0~b0' '7.1+edu0~b1' '7.1+edu0~b2' \
-		 '7.1+edu0' '8.0.0+edu+alpha0' '8.0+edu+alpha0' \
-		 '8.0+edu0~alpha0' '8.0+edu0~alpha1' '8.0+edu0~alpha2' \
-		 '8.0+edu0~beta1' '8+edu0' '9+edu0~alpha0' '9+edu0~a0'
-
-	do
-		if [ "$VERSION" = "$i" ] ; then
-			sed -i $debian_edu_config -e \
+	# update version number in /etc/debian-edu/config on upgrades
+	sed -i $debian_edu_config -e \
 				"s/^VERSION=.*$/VERSION=\"$new_version\"/"
-		fi
-	done
-	)
 fi
 
 # handle preseeding to enable or disable firstboot script, as appropriate.

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