Branches for Intrepid

Author: Reinhard Tartler
Revision Date: 2008-06-23 16:22:45 UTC

* Merge from debian unstable, remaining changes:
  - introduce flag file for indicating the network has been
    configured. This is needed so that ifupdown udev rules does not 'ifup'
    the interface too early. Related to LP: 44194
  - debian/netbase.init: silence ifup/ifdown if VERBOSE == no
  - debian/netbase.init: silence debuging output if VERBOSE == no
  - debian/netbase.init: Temporarily increase usplash timeout to 120 seconds
    to cope with slop DHCP server responses. (LP: 21617)
* netbase.preinst: removed. It would only affect pre-dapper upgrades which we don't
  support anyways.
* netbase.postinst: dropped all ubuntu modifications. It would only
  affect pre-dapper upgrades which we don't support anyways.
* debian/control: drop dependency on update-inetd.