Branches for Wily

Author: Martin Pitt
Revision Date: 2015-06-01 08:42:43 UTC

* Merge with Debian unstable. Remaining Ubuntu changes:
  - debian/postinst: Make /etc/resolv.conf a relative symlink so that it
    works when setting up chroots.
  - Eliminate all references to /etc/resolvconf/run. This should all be done
    directly in /run, there is no reason to support making any of this
    configurable with a symlink since we already have a versioned dependency
    on the version of initscripts that introduces the /run transition.
* Clean up some merge delta, thanks to Thomas Hood for reviewing!
  - Put back debian/triggers (should have been re-added as part of fixing
    LP #1453185)
  - Drop symlink check in dhclient-enter-hooks.d/resolvconf, to avoid
    dhclient overwriting /etc/resolv.conf when resolvconf is installed.
    (LP: #1385010)
  - resolvconf/link-tail-to-original debconf question again defaults to
    false; it's rather irrelevant as we install resolvconf by default.

Author: Martin Pitt
Revision Date: 2015-06-01 08:42:43 UTC

* Merge with Debian unstable. Remaining Ubuntu changes:
  - debian/postinst: Make /etc/resolv.conf a relative symlink so that it
    works when setting up chroots.
  - Eliminate all references to /etc/resolvconf/run. This should all be done
    directly in /run, there is no reason to support making any of this
    configurable with a symlink since we already have a versioned dependency
    on the version of initscripts that introduces the /run transition.
* Clean up some merge delta, thanks to Thomas Hood for reviewing!
  - Put back debian/triggers (should have been re-added as part of fixing
    LP #1453185)
  - Drop symlink check in dhclient-enter-hooks.d/resolvconf, to avoid
    dhclient overwriting /etc/resolv.conf when resolvconf is installed.
    (LP: #1385010)
  - resolvconf/link-tail-to-original debconf question again defaults to
    false; it's rather irrelevant as we install resolvconf by default.