Bug#863838: unblock: debian-edu-install/1.926

[Wolfgang Schweer]

On Wed, Jun 07, 2017 at 10:29:15PM +0200, Cyril Brulebois wrote:
> Jonathan Wiltshire  (2017-06-06):
> > This fixed list really is a bit of a nuisance.  Are you able to commit
> > to not needing it in buster (or preferably before)? I can't speak for
> > d-i, but that might a be a compromise we can reach.
> 
> Works for me.

I've modified the patch proposed earlier; see
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863838#47

Then I've built the package from my locally modified git repo and 
installed it on a test system. Tests were ok: the version string was 
modified each time like expected; so I assume that it will work. 

But I propose to do this change for buster rather than now in a hurry.

This is the diff:

diff --git a/debian/debian-edu-install.postinst 
b/debian/debian-edu-install.postinst
index 1f145383..679a0ad6 100644
--- a/debian/debian-edu-install.postinst
+++ b/debian/debian-edu-install.postinst
@@ -115,54 +115,14 @@ fi
 # Source the debconf confmodule to ensure that the templates are loaded.
 . /usr/share/debconf/confmodule
 
-oldversions="sarge \
-  terra_alpha \
-  terra_test01 terra_test02 terra_test03 terra_test04 \
-  terra_pre01 terra_pre02 \
-  terra_rc1 terra_rc2 terra_rc3 terra_rc4 terra_rc5"
-
 # get the current version
 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).
-
-   # clean up missing version caused by bug introduced in version
-   # 1.810 and fixed in version 1.813.
-   if [ -z "$VERSION" ] ; then
sed -i $debian_edu_config -e \
"s/^VERSION=.*$/VERSION=\"$new_version\"/"
-   fi
-
-   # 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 \
-   "s/^VERSION=.*$/VERSION=\"$new_version\"/"
-   fi
-   done
)
 fi
 

Wolfgang


signature.asc
Description: PGP signature

Bug#863838: unblock: debian-edu-install/1.926

[Cyril Brulebois]

Jonathan Wiltshire  (2017-06-06):
> This fixed list really is a bit of a nuisance.  Are you able to commit
> to not needing it in buster (or preferably before)? I can't speak for
> d-i, but that might a be a compromise we can reach.

Works for me.

(Please cc me if you want to make sure I read your replies.)


KiBi.


signature.asc
Description: Digital signature

Bug#863838: unblock: debian-edu-install/1.926

[Holger Levsen]

On Tue, Jun 06, 2017 at 11:40:16PM +0100, Jonathan Wiltshire wrote:
> This fixed list really is a bit of a nuisance.  Are you able to commit
> to not needing it in buster (or preferably before)?

sure.


signature.asc
Description: Digital signature

Bug#863838: unblock: debian-edu-install/1.926

[Jonathan Wiltshire]

On Thu, Jun 01, 2017 at 10:48:21AM +, Holger Levsen wrote:
> On Thu, Jun 01, 2017 at 04:09:35AM +0200, Cyril Brulebois wrote:
> > I'm not sure why we're still having this hardcoded list of versions.
> 
> because: cruft in the way Debian Edu CDs are build/used…
> 
> (Also those who know this code are not really active anymore, so it's easier
> to just increment that version number now and move on…)
> 
> Now that for the first time ever we (edu) are about to release with Debian, we
> will also for the first time be able to develop on the next release for the
> full cycle, and I surely plan to remove quite some cruft from Debian Edu in
> the coming year.

This fixed list really is a bit of a nuisance.  Are you able to commit
to not needing it in buster (or preferably before)? I can't speak for d-i,
but that might a be a compromise we can reach.


-- 
Jonathan Wiltshire  j...@debian.org
Debian Developer http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51

Bug#863838: unblock: debian-edu-install/1.926

[Ivo De Decker]

Control: tags -1 confirmed moreinfo d-i

Hi,

On Thu, Jun 01, 2017 at 10:48:21AM +, Holger Levsen wrote:
> On Thu, Jun 01, 2017 at 04:09:35AM +0200, Cyril Brulebois wrote:
> > I'm not sure why we're still having this hardcoded list of versions.
> 
> because: cruft in the way Debian Edu CDs are build/used…

Unblocked.

It still needs the d-i ack for the unblock-udeb.

Cheers,

Ivo

Bug#863838: unblock: debian-edu-install/1.926

[Holger Levsen]

On Thu, Jun 01, 2017 at 04:09:35AM +0200, Cyril Brulebois wrote:
> I'm not sure why we're still having this hardcoded list of versions.

because: cruft in the way Debian Edu CDs are build/used…

(Also those who know this code are not really active anymore, so it's easier
to just increment that version number now and move on…)

Now that for the first time ever we (edu) are about to release with Debian, we
will also for the first time be able to develop on the next release for the
full cycle, and I surely plan to remove quite some cruft from Debian Edu in
the coming year.


-- 
cheers,
Holger


signature.asc
Description: Digital signature

Bug#863838: unblock: debian-edu-install/1.926

[Cyril Brulebois]

Holger Levsen  (2017-05-31):
> Please unblock package debian-edu-install, it only contains a trivial
> update in preparation of the Debian Edu Stretch release.
> 
> Please note that it also contains an (unmodified) udeb, thus cc:ing KiBi
> for the famous KiBi-ack! :)

I'm not sure why we're still having this hardcoded list of versions.


KiBi.


signature.asc
Description: Digital signature

Bug#863838: unblock: debian-edu-install/1.926

[Holger Levsen]

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package debian-edu-install, it only contains a trivial update
in preparation of the Debian Edu Stretch release.

Please note that it also contains an (unmodified) udeb, thus cc:ing KiBi for
the famous KiBi-ack! :)


$ debdiff debian-edu-install_1.915.dsc  debian-edu-install_1.916.dsc
diff -Nru debian-edu-install-1.915/debian/changelog 
debian-edu-install-1.916/debian/changelog
--- debian-edu-install-1.915/debian/changelog   2017-03-05 17:21:09.0 
+0100
+++ debian-edu-install-1.916/debian/changelog   2017-05-30 15:53:21.0 
+0200
@@ -1,3 +1,11 @@
+debian-edu-install (1.916) unstable; urgency=medium
+
+  * Set version number to 9+edu0 in preparation of the Debian Stretch release,
+which for the first time could also mark the Debian Edu Stretch release at
+the same time!
+
+ -- Holger Levsen   Tue, 30 May 2017 15:53:21 +0200
+
 debian-edu-install (1.915) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff -Nru debian-edu-install-1.915/debian/debian-edu-install.postinst 
debian-edu-install-1.916/debian/debian-edu-install.postinst
--- debian-edu-install-1.915/debian/debian-edu-install.postinst 2017-03-02 
20:20:10.0 +0100
+++ debian-edu-install-1.916/debian/debian-edu-install.postinst 2017-05-29 
17:48:03.0 +0200
@@ -155,7 +155,7 @@
 '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'
+'8.0+edu0~beta1' '8+edu0' '9+edu0~alpha0' '9+edu0~a0'
 
do
if [ "$VERSION" = "$i" ] ; then
diff -Nru debian-edu-install-1.915/version debian-edu-install-1.916/version
--- debian-edu-install-1.915/version2017-03-02 20:20:10.0 +0100
+++ debian-edu-install-1.916/version2017-05-29 17:47:19.0 +0200
@@ -1 +1 @@
-9+edu0~a0
+9+edu0


unblock debian-edu-install/1.926

Thanks for your work on Stretch!


-- 
cheers,
Holger


signature.asc
Description: Digital signature