Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
x-debbugs-cc: debian-edu@lists.debian.org
Hi,
Please unblock package debian-edu-config, it fixes an important bug:
* Adjust Debian-custom/001-ltsp-settings to enable LTSP installation
in case the usbstick ISO image is used. (Closes: #854203).
$ debdiff debian-edu-config_1.922.dsc debian-edu-config_1.923.dsc
debian/changelog | 12 ++++++++++
debian/source/format | 2 -
share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings | 3 +-
3 files changed, 15 insertions(+), 2 deletions(-)
unblock debian-edu-config/1.923
The full debdiff is:
diff -Nru debian-edu-config-1.922/debian/changelog debian-edu-config-1.923/debian/changelog
--- debian-edu-config-1.922/debian/changelog 2017-01-17 21:49:18.000000000 +0100
+++ debian-edu-config-1.923/debian/changelog 2017-02-17 17:37:41.000000000 +0100
@@ -1,3 +1,15 @@
+debian-edu-config (1.923) unstable; urgency=medium
+
+ [ Wolfgang Schweer ]
+ * Adjust Debian-custom/001-ltsp-settings to enable LTSP installation
+ in case the usbstick ISO image is used. (Closes: #854203).
+
+ [ Holger Levsen ]
+ * Switch to native source format 3.0, to easily avoid including .git into
+ the source package.
+
+ -- Holger Levsen <holger@debian.org> Fri, 17 Feb 2017 17:37:41 +0100
+
debian-edu-config (1.922) unstable; urgency=medium
[ Wolfgang Schweer ]
diff -Nru debian-edu-config-1.922/debian/source/format debian-edu-config-1.923/debian/source/format
--- debian-edu-config-1.922/debian/source/format 2014-09-04 21:01:59.000000000 +0200
+++ debian-edu-config-1.923/debian/source/format 2017-02-17 17:36:23.000000000 +0100
@@ -1 +1 @@
-1.0
+3.0 (native)
diff -Nru debian-edu-config-1.922/share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings debian-edu-config-1.923/share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings
--- debian-edu-config-1.922/share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings 2017-01-13 13:11:08.000000000 +0100
+++ debian-edu-config-1.923/share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings 2017-02-17 17:27:20.000000000 +0100
@@ -1,9 +1,10 @@
# File Debian-custom/001-ltsp-settings
# Deal with case that ltsp-client-builder doesn't look up another
# mirror if cdrom is still mounted.
+# Lookup if ISO type is NETINST, not if usbstick (debian-cd BD disk type) ISO image is used.
case $MODE in
configure)
- if [ file:///media/cdrom = "$option_mirror_value" ] ; then
+ if [ file:///media/cdrom = "$option_mirror_value" ] && ! grep -q BD /etc/apt/sources.list ; then
NEWMIRROR=$(awk '/^deb (http|ftp):\/\/.* main/ { if (!first) { print $2; first=1 } }' < /etc/apt/sources.list)
echo "info: Changing LTSP mirror from '$option_mirror_value' to '$NEWMIRROR'"
option_mirror_value=$NEWMIRROR
--
cheers,
Holger
Attachment:
signature.asc
Description: Digital signature