Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock x-debbugs-cc: debian-edu@lists.debian.org, kibi@debian.org Dear release team, This is an unblock request as previously discussed (*) for debian-edu-install with a trivial preseeding change fixing PXE installations (#781515, please note that this change in d-e-install is needed to unbreak those installations, no matter whether the fix (enabling eatmydata) will be accepted for d-e- config) as well as some cleanup related to the sugar removal from Jessie. The above is included in 1.820. And then 1.821 is also needed: 1.821 has a single change: it bumps the Debian Edu version (which is not the package version..) to 8.0+edu0~beta1 in preparation of our first Jessie beta release, which we plan to release together with Debian Jessie proper! (Which I personally find super exciting because it basically marks reaching a goal I've worked on for the last ten years.) The package builds an udeb (unused by regular d-i) so needs a kibi ack. (*) see https://lists.debian.org/20141107121705.GF3095@coloquinte.cristau.org debian-edu-install (1.821) unstable; urgency=high * Update version number to 8.0+edu0~beta1 in preparation of our first Jessie beta release. -- Holger Levsen <holger@debian.org> Tue, 14 Apr 2015 19:27:05 +0200 debian-edu-install (1.820) unstable; urgency=high [ Wolfgang Schweer ] * preseed-values/defaults.thin-client-server: Remove preseeding for LTSP build-client-opts as this breaks PXE installs. Setting '--eatmydata' is now done in (d-e-config) share/ltsp/plugins/ltsp-build-client/Debian-custom/080-eatmydata. (Closes: #781515). [ Holger Levsen ] * debian-edu-profile: drop sugar from supported profiles as it has been removed from Jessie, see #782504. * Drop Sugar from debian/debian-edu-profile-udeb.templates and debian/po/templates.pot as well. -- Holger Levsen <holger@debian.org> Tue, 14 Apr 2015 18:38:01 +0200 $ debdiff debian-edu-install_1.819.dsc debian-edu-install_1.821.dsc|diffstat debian-edu-profile | 6 ------ debian/changelog | 24 ++++++++++++++++++++++++ debian/debian-edu-install.postinst | 2 +- debian/debian-edu-profile-udeb.templates | 7 ------- debian/po/templates.pot | 13 ++++++------- preseed-values/defaults.thin-client-server | 4 ---- version | 2 +- 7 files changed, 32 insertions(+), 26 deletions(-) The full debdiff between the version in jessie and sid is attached and the package has been accepted into unstable. cheers, Holger
diff -Nru debian-edu-install-1.819/debian/changelog debian-edu-install-1.821/debian/changelog --- debian-edu-install-1.819/debian/changelog 2015-01-05 19:50:38.000000000 +0100 +++ debian-edu-install-1.821/debian/changelog 2015-04-14 19:27:13.000000000 +0200 @@ -1,3 +1,27 @@ +debian-edu-install (1.821) unstable; urgency=high + + * Update version number to 8.0+edu0~beta1 in preparation of our first Jessie + beta release. + + -- Holger Levsen <holger@debian.org> Tue, 14 Apr 2015 19:27:05 +0200 + +debian-edu-install (1.820) unstable; urgency=high + + [ Wolfgang Schweer ] + * preseed-values/defaults.thin-client-server: + Remove preseeding for LTSP build-client-opts as this breaks PXE + installs. Setting '--eatmydata' is now done in (d-e-config) + share/ltsp/plugins/ltsp-build-client/Debian-custom/080-eatmydata. + (Closes: #781515). + + [ Holger Levsen ] + * debian-edu-profile: drop sugar from supported profiles as it has been + removed from Jessie, see #782504. + * Drop Sugar from debian/debian-edu-profile-udeb.templates and + debian/po/templates.pot as well. + + -- Holger Levsen <holger@debian.org> Tue, 14 Apr 2015 18:38:01 +0200 + debian-edu-install (1.819) unstable; urgency=medium [ Wolfgang Schweer ] diff -Nru debian-edu-install-1.819/debian/debian-edu-install.postinst debian-edu-install-1.821/debian/debian-edu-install.postinst --- debian-edu-install-1.819/debian/debian-edu-install.postinst 2015-01-05 19:49:27.000000000 +0100 +++ debian-edu-install-1.821/debian/debian-edu-install.postinst 2015-04-14 19:23:20.000000000 +0200 @@ -154,7 +154,7 @@ '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~alpha0' '8.0+edu0~alpha1' '8.0+edu0~alpha2' do if [ "$VERSION" = "$i" ] ; then sed -i $debian_edu_config -e \ diff -Nru debian-edu-install-1.819/debian/debian-edu-profile-udeb.templates debian-edu-install-1.821/debian/debian-edu-profile-udeb.templates --- debian-edu-install-1.819/debian/debian-edu-profile-udeb.templates 2014-10-21 14:22:01.000000000 +0200 +++ debian-edu-install-1.821/debian/debian-edu-profile-udeb.templates 2015-04-14 18:20:56.000000000 +0200 @@ -5,12 +5,8 @@ Template: debian-edu-install/profile Type: multiselect -#flag:translate!:7 -#__Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar __Choices: Main Server, Workstation, Roaming Workstation, Thin Client Server, Standalone, Minimal Choices-C: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal -#flag:comment:3 -## Translators, do not translate "Sugar" _Description: Profile(s) to apply to this machine: Profiles determine how the machine can be used out-of-the-box: . @@ -29,9 +25,6 @@ profiles. - Minimal: fully integrated into the Debian Edu network but contains only a basic system without any GUI. -# - Sugar: variant of 'Standalone' that includes the Sugar -# desktop environment which promotes sharing and -# collaborative learning for children. Template: debian-edu-install/standalone_only Type: error diff -Nru debian-edu-install-1.819/debian/po/templates.pot debian-edu-install-1.821/debian/po/templates.pot --- debian-edu-install-1.819/debian/po/templates.pot 2014-10-12 12:50:46.000000000 +0200 +++ debian-edu-install-1.821/debian/po/templates.pot 2015-04-14 18:22:23.000000000 +0200 @@ -26,42 +26,42 @@ #. Type: multiselect #. Choices -#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar +#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal #: ../debian-edu-profile-udeb.templates:2001 msgid "Main Server" msgstr "" #. Type: multiselect #. Choices -#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar +#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal #: ../debian-edu-profile-udeb.templates:2001 msgid "Workstation" msgstr "" #. Type: multiselect #. Choices -#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar +#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal #: ../debian-edu-profile-udeb.templates:2001 msgid "Roaming Workstation" msgstr "" #. Type: multiselect #. Choices -#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar +#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal #: ../debian-edu-profile-udeb.templates:2001 msgid "Thin Client Server" msgstr "" #. Type: multiselect #. Choices -#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar +#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal #: ../debian-edu-profile-udeb.templates:2001 msgid "Standalone" msgstr "" #. Type: multiselect #. Choices -#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar +#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal #: ../debian-edu-profile-udeb.templates:2001 msgid "Minimal" msgstr "" @@ -80,7 +80,6 @@ #. Type: multiselect #. Description -#. # Translators, do not translate "Sugar" #: ../debian-edu-profile-udeb.templates:2002 msgid "" " - Main Server: reserved for the Debian Edu server. It does not\n" diff -Nru debian-edu-install-1.819/debian-edu-profile debian-edu-install-1.821/debian-edu-profile --- debian-edu-install-1.819/debian-edu-profile 2014-09-04 21:01:40.000000000 +0200 +++ debian-edu-install-1.821/debian-edu-profile 2015-04-14 13:10:31.000000000 +0200 @@ -62,7 +62,6 @@ networked=false standalone=false minimal=false - sugar=false for value in `echo $EDUPROFILE |sed 's/ /-/g' | sed 's/,-/ /g'`; do case $value in @@ -94,11 +93,6 @@ server=true log "Added task '$value'" ;; - Sugar) - standalone=true - sugar=true - log "Added task '$value'" - ;; Standalone) standalone=true if test "$networked" = true ; then diff -Nru debian-edu-install-1.819/preseed-values/defaults.thin-client-server debian-edu-install-1.821/preseed-values/defaults.thin-client-server --- debian-edu-install-1.819/preseed-values/defaults.thin-client-server 2014-12-13 16:24:12.000000000 +0100 +++ debian-edu-install-1.821/preseed-values/defaults.thin-client-server 2015-04-05 13:05:26.000000000 +0200 @@ -19,10 +19,6 @@ # Try to use the ltsp-client-builder udeb if present d-i ltsp-client-builder/run boolean true -# Speed up the LTSP chroot build by adding --eatmydata to the default -# set of arguments. -d-i ltsp-client-builder/build-client-opts string --eatmydata --mirror file:///media/cdrom --security-mirror none --updates-mirror none --accept-unsigned-packages - # enable NAT on thin-client-network debian-edu-config debian-edu-config/enable-nat boolean true diff -Nru debian-edu-install-1.819/version debian-edu-install-1.821/version --- debian-edu-install-1.819/version 2015-01-05 19:49:41.000000000 +0100 +++ debian-edu-install-1.821/version 2015-04-14 19:23:20.000000000 +0200 @@ -1 +1 @@ -8.0+edu0~alpha2 +8.0+edu0~beta1
Attachment:
signature.asc
Description: This is a digitally signed message part.