Stable update proposal: debian-edu-install 0.667.1+svn39522

[Petter Reinholdtsen <pere@hungry.com>]

Ref item 9 on <URL:http://wiki.debian.org/DebianEdu/Meeting/20070813>,
here is a update proposal for the stable release.

I propose to update the version of debian-edu-install in the stable
repository from 0.667.1+svn39277 to 0.667.1+svn39522.

The new debian-edu-install package fixes/works around a bug in the DVD
installation of a single thin-client-server (skolelinux bug #1229,
#1258), as well as updates the translations of the installation
question for Italien, Finnish, Polish, Greek and Catalan.  There is
also a minor fix to the 'make status' target, but it is only used by
the developer and not useful for the users of the package.

Here is the diff -r output between the two versions, excluding
translations to keep the email short.

Index: debian/changelog
===================================================================
--- debian/changelog    (revision 39277)
+++ debian/changelog    (working copy)
@@ -1,3 +1,21 @@
+debian-edu-install (0.667.1+svn39522) terra; urgency=low
+
+  [ Holger Levsen ]
+  * Makefile: use C locale within status target, so that the egrep works as
+    expected. Always return true on this egrep, even if the last .po is
+    completly translated.  :-)
+  * Updated italien translation thanks to Claudio Carboncini.
+  * Updated finish translation thanks to Lars Wirzenius.
+  * Updated polish translation thanks to Bartosz Fenski.
+  * Updated greek translation thanks to Faidon Liambotis.
+  * Updated catalan translation thanks to Miguel Gea Milvaques.
+
+  [ Petter Reinholdtsen ]
+  * Make sure to close file descriptor 3 when restarting the network, as
+    a workaround for skolelinux bug #1229.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sun,  2 Dec 2007 10:14:05 +0100
+
 debian-edu-install (0.667.1+svn39277) terra; urgency=low

   * Fix postinst to upgrade version string '3.0r0 terra' to '3.0r1 terra'.
Index: debian/po/pl.po
===================================================================
--- debian/po/pl.po     (revision 39277)
+++ debian/po/pl.po     (working copy)
[...]
Index: debian/po/it.po
===================================================================
--- debian/po/it.po     (revision 39277)
+++ debian/po/it.po     (working copy)
[...]
Index: debian/po/templates.pot
===================================================================
--- debian/po/templates.pot     (revision 39277)
+++ debian/po/templates.pot     (working copy)
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
Index: debian/po/ca.po
===================================================================
--- debian/po/ca.po     (revision 39277)
+++ debian/po/ca.po     (working copy)
[...]
Index: debian/po/fi.po
===================================================================
--- debian/po/fi.po     (revision 39277)
+++ debian/po/fi.po     (working copy)
[...]
Index: debian/po/el.po
===================================================================
--- debian/po/el.po     (revision 39277)
+++ debian/po/el.po     (working copy)
[...]
Index: debian-edu-preseed
===================================================================
--- debian-edu-preseed  (revision 39277)
+++ debian-edu-preseed  (working copy)
@@ -223,7 +223,10 @@
        log "Not restarting network, as it seem to be up already."
     else
        log "Restarting network to prepare for cfengine run."
-       in-target /etc/init.d/networking start || true
+       # Redirecting fd 3 as a workaround for skolelinux bug #1229.
+       # make sure the redirecting happen inside the chroot, as
+       # in-target need to talk to debconf.
+       in-target /bin/sh -c "/etc/init.d/networking start 3> /dev/null" || true
     fi

     # Update hostname based on DHCP/DNS if enabled
Index: Makefile
===================================================================
--- Makefile    (revision 39277)
+++ Makefile    (working copy)
@@ -106,8 +106,8 @@

 status:
        ( for f in debian/po/*.po; do \
-               echo -n $$f:; msgfmt --statistics -o /dev/null $$f 2>&1 ; \
-       done ) | egrep 'fuzzy|untranslated'
+               echo -n $$f:; LANG=C msgfmt --statistics -o /dev/null $$f 2>&1 ; \
+       done ) | egrep 'fuzzy|untranslated' || true
 dist:
        debuild -us -uc