ubuntu/+source/resolvconf:applied/ubuntu/wily-proposed

Last commit made on 2015-06-01
Get this branch:
git clone -b applied/ubuntu/wily-proposed https://git.launchpad.net/ubuntu/+source/resolvconf
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
applied/ubuntu/wily-proposed
Repository:
lp:ubuntu/+source/resolvconf

Recent commits

00056d4... by Martin Pitt on 2015-06-01

Import patches-applied version 1.77ubuntu1 to applied/ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 25ea50704d9592415f1807c11db204b1f328c2dd
Unapplied parent: 59e400c86d1bd7f464f913308cd7863530064908

New changelog entries:
  * 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.

59e400c... by Martin Pitt on 2015-06-01

Import patches-unapplied version 1.77ubuntu1 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: bcdd3b70fe08e54aa5895d8f92a9f15f94e7bf5d

New changelog entries:
  * 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.

25ea507... by Thomas Hood on 2015-04-21

Import patches-applied version 1.77 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: ba364f3d943a21175936a960ab815195395126c6
Unapplied parent: bcdd3b70fe08e54aa5895d8f92a9f15f94e7bf5d

New changelog entries:
  * [0781847] interface-order: match br ifaces at the same
    priority as eth ifaces (see LP#1446681)
  * Remove obsolete upgrade code
  * [00ad4bf] Override immutability attrib on /etc/resolv.conf
    if dnssec-trigger is installed. See #776778 for background.

bcdd3b7... by Thomas Hood on 2015-04-21

Import patches-unapplied version 1.77 to debian/sid

Imported using git-ubuntu import.

Changelog parent: c49074b04f699849c5c90cc00774506aa2a948fe

New changelog entries:
  * [0781847] interface-order: match br ifaces at the same
    priority as eth ifaces (see LP#1446681)
  * Remove obsolete upgrade code
  * [00ad4bf] Override immutability attrib on /etc/resolv.conf
    if dnssec-trigger is installed. See #776778 for background.

ba364f3... by Thomas Hood on 2015-01-23

Import patches-applied version 1.76.1 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: 27c170ca0da001dc9ae997522af22f322bb16179
Unapplied parent: c49074b04f699849c5c90cc00774506aa2a948fe

New changelog entries:
  * [eb81ca0] Eliminate bashisms.
    Thanks to Michael Gilbert (Closes: #775356)

c49074b... by Thomas Hood on 2015-01-23

Import patches-unapplied version 1.76.1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 634033f48d18b7dfb44a8a7714a007449b12128e

New changelog entries:
  * [eb81ca0] Eliminate bashisms.
    Thanks to Michael Gilbert (Closes: #775356)

27c170c... by Thomas Hood on 2014-10-10

Import patches-applied version 1.76 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: 84f08c9fbcf4512faf07f357700640513c1eb52f
Unapplied parent: 634033f48d18b7dfb44a8a7714a007449b12128e

New changelog entries:
  * resolvconf.service: Install into sysinit.target, not into
    network.target (Closes: #749405)
    Thanks to Martin Pitt and Edward Allcutt
  * [c405030] Add exclusion for L2TP VPN plugin (LP#1349011)
  * [4cbd73d] Bump Standards-Version

634033f... by Thomas Hood on 2014-10-10

Import patches-unapplied version 1.76 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 4bd95ab14b9e1851691ff49056126f531610e1ae

New changelog entries:
  * resolvconf.service: Install into sysinit.target, not into
    network.target (Closes: #749405)
    Thanks to Martin Pitt and Edward Allcutt
  * [c405030] Add exclusion for L2TP VPN plugin (LP#1349011)
  * [4cbd73d] Bump Standards-Version

84f08c9... by Thomas Hood on 2014-05-08

Import patches-applied version 1.75 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: dd3f35da47959f1f435692e50a4dcbf08fb132dc
Unapplied parent: 4bd95ab14b9e1851691ff49056126f531610e1ae

New changelog entries:
  * [49dedb8] Update man page re: "dns-nameserver" (Closes: 718021)
  * [6195584] Don't give update-rc.d start and stop (Closes: #718232)
  * [eed7eb1] Add pt_BR.po. Thanks to A. R. Gomes (Closes: #718714)
  * [a84a8f2] Remove buggy dnscache update script which should be in
              dnscache-run anyway
  * [b93b150] Fix typo in README (Closes: #737158)
  * [6a47a50] Add systemd unit. Thanks Martin Pitt (Closes: #700846)

4bd95ab... by Thomas Hood on 2014-05-08

Import patches-unapplied version 1.75 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 8db174974a8e8d29bb2fcc6eed39f542a81b117e

New changelog entries:
  * [49dedb8] Update man page re: "dns-nameserver" (Closes: 718021)
  * [6195584] Don't give update-rc.d start and stop (Closes: #718232)
  * [eed7eb1] Add pt_BR.po. Thanks to A. R. Gomes (Closes: #718714)
  * [a84a8f2] Remove buggy dnscache update script which should be in
              dnscache-run anyway
  * [b93b150] Fix typo in README (Closes: #737158)
  * [6a47a50] Add systemd unit. Thanks Martin Pitt (Closes: #700846)