Merge ~mkukri/ubuntu/+source/ifupdown:merge into ubuntu/+source/ifupdown:debian/sid

[Mate Kukri]

Merge ifupdown with Debian Sid.

PPA testbuild: https://launchpad.net/~mkukri/+archive/ubuntu/dev/+build/27771026
PPA autopkgtest: https://autopkgtest.ubuntu.com/results/autopkgtest-noble-mkukri-dev/noble/amd64/i/ifupdown/20240214_155505_b8eed@/log.gz

[Simon Chopin (schopin)]

review: Approve

[Simon Chopin (schopin)]

Uploaded, thanks for the merge!

diff --git a/debian/changelog b/debian/changelog
index 95dc00a..13e1a51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+ifupdown (0.8.41ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - ifup@.service, ifupdown-hotplug: Additionally run for "auto" class. We
+      don't really support "allow-hotplug" in Ubuntu at the moment, so we need
+      to deal with "auto" devices appearing after the "networking" init script
+      already ran.
+    - Fix if-up.d/resolved hook to properly work with nameservers and search
+      domains (LP: 1981103)
+  * Changes now included in Debian:
+    - Ship resolved integration scripts.
+
+ -- Mate Kukri <[e-mail]>  Wed, 14 Feb 2024 14:14:08 +0000
+
 ifupdown (0.8.41) unstable; urgency=high
 
   * networking.service: Improve how to handle hotplug devices. Thanks to kibi,
@@ -74,6 +90,46 @@ ifupdown (0.8.37) unstable; urgency=low
 
  -- Santiago Ruano Rincón <[e-mail]>  Wed, 19 Jan 2022 20:55:17 +0100
 
+ifupdown (0.8.36+nmu1ubuntu5) mantic; urgency=medium
+
+  [ Uwe Kleine-König ]
+  * Fix if-up.d/resolved hook to properly work with nameservers and search
+    domains (LP: #1981103)
+
+ -- Heitor Alves de Siqueira <[e-mail]>  Wed, 06 Sep 2023 13:23:34 +0000
+
+ifupdown (0.8.36+nmu1ubuntu4) kinetic; urgency=medium
+
+  * Remove invalid lines from resolved integration scripts (LP: #1907878)
+
+ -- Heinrich Schuchardt <[e-mail]>  Sun, 15 May 2022 15:35:51 +0200
+
+ifupdown (0.8.36+nmu1ubuntu3) jammy; urgency=medium
+
+  * debian/if-up.d/resolved: also chown $statedir to
+    systemd-resolve:systemd-resolve (LP: #1896772)
+
+ -- Jamie Strandboge <[e-mail]>  Sun, 17 Apr 2022 21:21:49 +0000
+
+ifupdown (0.8.36+nmu1ubuntu2) jammy; urgency=medium
+
+  * No-change rebuild to update maintainer scripts, see LP: 1959054
+
+ -- Dave Jones <[e-mail]>  Wed, 16 Feb 2022 17:01:51 +0000
+
+ifupdown (0.8.36+nmu1ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - ifup@.service, ifupdown-hotplug: Additionally run for "auto" class. We
+      don't really support "allow-hotplug" in Ubuntu at the moment, so we need
+      to deal with "auto" devices appearing after the "networking" init script
+      already ran.
+    - Ship resolved integration scripts.
+
+ -- Steve Langasek <[e-mail]>  Mon, 18 Oct 2021 14:59:15 -0700
+
 ifupdown (0.8.36+nmu1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -81,6 +137,19 @@ ifupdown (0.8.36+nmu1) unstable; urgency=medium
 
  -- Christian Marillat <[e-mail]>  Thu, 19 Aug 2021 01:33:37 +0200
 
+ifupdown (0.8.36ubuntu1) impish; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - ifup@.service, ifupdown-hotplug: Additionally run for "auto" class. We
+      don't really support "allow-hotplug" in Ubuntu at the moment, so we need
+      to deal with "auto" devices appearing after the "networking" init script
+      already ran.
+    - Ship resolved integration scripts.
+
+ -- Steve Langasek <[e-mail]>  Mon, 17 May 2021 14:45:03 -0700
+
 ifupdown (0.8.36) unstable; urgency=low
 
   [ Janos Lenart ]
@@ -115,6 +184,24 @@ ifupdown (0.8.36) unstable; urgency=low
 
  -- Santiago Ruano Rincón <[e-mail]>  Wed, 04 Nov 2020 07:37:13 +0100
 
+ifupdown (0.8.35ubuntu2) groovy; urgency=medium
+
+  * Ship resolved integration scripts.
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 28 Jul 2020 10:55:18 +0100
+
+ifupdown (0.8.35ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - ifup@.service, ifupdown-hotplug: Additionally run for "auto" class. We
+      don't really support "allow-hotplug" in Ubuntu at the moment, so we need
+      to deal with "auto" devices appearing after the "networking" init script
+      already ran.
+
+ -- Steve Langasek <[e-mail]>  Thu, 02 May 2019 22:38:32 -0700
+
 ifupdown (0.8.35) unstable; urgency=medium
 
   [ Ondřej Nový ]
@@ -129,6 +216,24 @@ ifupdown (0.8.35) unstable; urgency=medium
 
  -- Guus Sliepen <[e-mail]>  Mon, 28 Jan 2019 21:37:33 +0100
 
+ifupdown (0.8.34ubuntu2) cosmic; urgency=medium
+
+  * Re-add chmod +x on ifupdown-hotplug.
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 28 Aug 2018 12:51:15 +0100
+
+ifupdown (0.8.34ubuntu1) cosmic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - ifup@.service, ifupdown-hotplug: Additionally run for "auto" class. We
+      don't really support "allow-hotplug" in Ubuntu at the moment, so we need
+      to deal with "auto" devices appearing after the "networking" init script
+      already ran.
+
+ -- Steve Langasek <[e-mail]>  Fri, 01 Jun 2018 13:35:16 -0700
+
 ifupdown (0.8.34) unstable; urgency=medium
 
   [ Guus Sliepen ]
@@ -141,6 +246,18 @@ ifupdown (0.8.34) unstable; urgency=medium
 
  -- Guus Sliepen <[e-mail]>  Fri, 25 May 2018 22:34:33 +0200
 
+ifupdown (0.8.33ubuntu1) cosmic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - ifup@.service, ifupdown-hotplug: Additionally run for "auto" class. We
+      don't really support "allow-hotplug" in Ubuntu at the moment, so we need
+      to deal with "auto" devices appearing after the "networking" init script
+      already ran.
+
+ -- Steve Langasek <[e-mail]>  Thu, 24 May 2018 15:59:45 -0700
+
 ifupdown (0.8.33) unstable; urgency=medium
 
   [ Guus Sliepen ]
@@ -152,6 +269,20 @@ ifupdown (0.8.33) unstable; urgency=medium
 
  -- Guus Sliepen <[e-mail]>  Thu, 24 May 2018 16:33:17 +0200
 
+ifupdown (0.8.32ubuntu1) cosmic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - ifup@.service, ifupdown-hotplug: Additionally run for "auto" class. We
+      don't really support "allow-hotplug" in Ubuntu at the moment, so we need
+      to deal with "auto" devices appearing after the "networking" init script
+      already ran.
+  * Dropped changes, included in Debian:
+    - Drop obsolete upstart integration.
+
+ -- Steve Langasek <[e-mail]>  Mon, 14 May 2018 21:17:23 -0700
+
 ifupdown (0.8.32) unstable; urgency=medium
 
   [ Guus Sliepen ]
@@ -292,6 +423,31 @@ ifupdown (0.8.18) unstable; urgency=medium
 
  -- Guus Sliepen <[e-mail]>  Wed, 11 Jan 2017 20:43:06 +0100
 
+ifupdown (0.8.17ubuntu1) bionic; urgency=medium
+
+  * Merge from Debian unstable.
+    - Resolve conflicts with newer bridge-utils.  LP: #1756846.
+  * Remaining changes:
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - ifup@.service, ifupdown-hotplug: Additionally run for "auto" class. We
+      don't really support "allow-hotplug" in Ubuntu at the moment, so we need
+      to deal with "auto" devices appearing after the "networking" init script
+      already ran. (LP: #1374521)
+    - Drop obsolete upstart integration.
+  * Dropped changes, included in Debian:
+    - networking.service: exclude loopback device lo in ExecStop.
+    - Export $CLASS to scripts.
+    - Add a few missing voids for functions that do not take any parameters.
+    - Add a bug-script to automatically add /etc/network/interfaces etc.  to
+      reportbug output.
+    - debian/ifup@.service: Start after device is up
+  * Dropped changes, superseded in Debian:
+    - disabled upping of bridges: this is now handled exclusively through
+      ifupdown, bridge-utils hook no longer handles this at all.
+
+ -- Steve Langasek <[e-mail]>  Wed, 21 Mar 2018 14:53:25 -0700
+
 ifupdown (0.8.17) unstable; urgency=medium
 
   [ Scott Moser ]
@@ -315,6 +471,40 @@ ifupdown (0.8.17) unstable; urgency=medium
 
  -- Guus Sliepen <[e-mail]>  Tue, 10 Jan 2017 17:25:18 +0100
 
+ifupdown (0.8.16ubuntu2) artful; urgency=medium
+
+  * Drop obsolete upstart integration.
+
+ -- Dimitri John Ledkov <[e-mail]>  Mon, 14 Aug 2017 18:39:14 +0100
+
+ifupdown (0.8.16ubuntu1) zesty; urgency=medium
+
+  * Merge with Debian unstable. Remaining Ubuntu changes:
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - link.defn, tests/testbuild-linux: Disable upping of bridges as it's not
+      covering all the cases supported by the vlan and bridge hooks and so
+      causes more harm than good at this point.  (LP: #1295304)
+    - ifup@.service, ifupdown-hotplug: Additionally run for "auto" class. We
+      don't really support "allow-hotplug" in Ubuntu at the moment, so we need
+      to deal with "auto" devices appearing after the "networking" init script
+      already ran. (LP: #1374521)
+
+  Changes from Debian packaging git:
+
+  [ Guus Sliepen ]
+  * Add a bug-script to automatically add /etc/network/interfaces etc. to reportbug output.
+  * Export $CLASS to scripts.
+  * Add a few missing voids for functions that do not take any parameters.
+
+  [ Scott Moser ]
+  * networking.service: exclude loopback device lo in ExecStop.
+
+  [ Martin Pitt ]
+  * debian/ifup@.service: Start after device is up
+
+ -- Guus Sliepen <[e-mail]>  Mon, 28 Nov 2016 14:40:17 +0100
+
 ifupdown (0.8.16) unstable; urgency=medium
 
   * Fix FTBFS due to testcases using the host's state information.
@@ -347,6 +537,44 @@ ifupdown (0.8.14) unstable; urgency=medium
 
  -- Guus Sliepen <[e-mail]>  Sat, 17 Sep 2016 11:40:39 +0200
 
+ifupdown (0.8.13ubuntu4) zesty; urgency=medium
+
+  * no-change rebuild for upload to zesty.
+
+ -- Scott Moser <[e-mail]>  Thu, 20 Oct 2016 12:40:08 -0400
+
+ifupdown (0.8.13ubuntu3) yakkety-proposed; urgency=medium
+
+  * networking.service: exclude loopback device lo in ExecStop (LP: #1629972)
+
+ -- Scott Moser <[e-mail]>  Fri, 14 Oct 2016 13:53:32 -0400
+
+ifupdown (0.8.13ubuntu2) yakkety; urgency=medium
+
+  * Fix a crash when multiple interfaces are specified for no-scripts
+    (LP: #1618726)
+
+ -- Richard Laager <[e-mail]>  Wed, 31 Aug 2016 02:26:31 -0500
+
+ifupdown (0.8.13ubuntu1) yakkety; urgency=medium
+
+  * Merge with Debian unstable. Remaining Ubuntu changes:
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - link.defn, tests/testbuild-linux: Disable upping of
+      bridges as it's not covering all the cases supported by the vlan and
+      bridge hooks and so causes more harm than good at this point.
+      (LP: #1295304)
+    - ifup@.service, ifupdown-hotplug: Additionally run for "auto" class. We
+      don't really support "allow-hotplug" in Ubuntu at the moment, so we need
+      to deal with "auto" devices appearing after the "networking" init script
+      already ran. (LP: #1374521)
+    - debian/postinst: Bring back missing /etc/rcS.d/networking symlink, to
+      clean up after old broken upgrades. (LP: #1439109) Needs to be kept
+      until after 16.04 LTS.
+
+ -- Martin Pitt <[e-mail]>  Wed, 08 Jun 2016 12:25:04 +0200
+
 ifupdown (0.8.13) unstable; urgency=medium
 
   * Fix test suite on kFreeBSD. Closes: #826062
@@ -383,6 +611,25 @@ ifupdown (0.8.11) unstable; urgency=medium
 
  -- Guus Sliepen <[e-mail]>  Thu, 21 Apr 2016 18:22:20 +0200
 
+ifupdown (0.8.10ubuntu1) xenial; urgency=medium
+
+  * Merge with Debian unstable. Remaining Ubuntu changes:
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - link.defn, tests/testbuild-linux: Disable upping of
+      bridges as it's not covering all the cases supported by the vlan and
+      bridge hooks and so causes more harm than good at this point.
+      (LP: #1295304)
+    - ifup@.service, ifupdown-hotplug: Additionally run for "auto" class. We
+      don't really support "allow-hotplug" in Ubuntu at the moment, so we need
+      to deal with "auto" devices appearing after the "networking" init script
+      already ran. (LP: #1374521)
+    - debian/postinst: Bring back missing /etc/rcS.d/networking symlink, to
+      clean up after old broken upgrades. (LP: #1439109) Needs to be kept
+      until after 16.04 LTS.
+
+ -- Martin Pitt <[e-mail]>  Sun, 24 Jan 2016 19:48:43 +0100
+
 ifupdown (0.8.10) unstable; urgency=medium
 
   * Allow "hwaddress random" to generate a random MAC address.
@@ -400,6 +647,37 @@ ifupdown (0.8.9) unstable; urgency=medium
 
  -- Guus Sliepen <[e-mail]>  Thu, 21 Jan 2016 22:02:11 +0100
 
+ifupdown (0.8.8ubuntu2) xenial; urgency=medium
+
+  * inet{,6}.defn: Don't down an interface when stopping. This breaks use
+    cases like LTSP which create a "manual" interfaces stanza to prevent
+    NetworkManager or other management software from touching the
+    interface of the remote root file system. In the past we had the
+    check_network_file_systems() check in /etc/init.d/networking that papered
+    over this misbehaviour, but that is not being done any more in
+    networking.service. (Closes: #809166, LP: #1492546)
+
+ -- Martin Pitt <[e-mail]>  Wed, 13 Jan 2016 16:00:49 +0100
+
+ifupdown (0.8.8ubuntu1) xenial; urgency=medium
+
+  * Merge with Debian unstable. Remaining Ubuntu changes:
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - link.defn, tests/testbuild-linux: Disable upping of
+      bridges as it's not covering all the cases supported by the vlan and
+      bridge hooks and so causes more harm than good at this point.
+      (LP: #1295304)
+    - debian/postinst: Bring back missing /etc/rcS.d/networking symlink, to
+      clean up after old broken upgrades. (LP: #1439109) Needs to be kept
+      until after 16.04 LTS.
+    - ifup@.service, ifupdown-hotplug: Additionally run for "auto" class. We
+      don't really support "allow-hotplug" in Ubuntu at the moment, so we need
+      to deal with "auto" devices appearing after the "networking" init script
+      already ran. (LP: #1374521)
+
+ -- Martin Pitt <[e-mail]>  Wed, 13 Jan 2016 07:00:46 +0100
+
 ifupdown (0.8.8) unstable; urgency=medium
 
   [ Martin Pitt ]
@@ -431,6 +709,32 @@ ifupdown (0.8.7) unstable; urgency=medium
 
  -- Guus Sliepen <[e-mail]>  Mon, 11 Jan 2016 22:58:44 +0100
 
+ifupdown (0.8.6ubuntu2) xenial; urgency=medium
+
+  * Fix ifquery crash if interface state file does not exist yet.
+    (Closes: #810779, LP: #1532722)
+
+ -- Martin Pitt <[e-mail]>  Tue, 12 Jan 2016 08:13:08 +0100
+
+ifupdown (0.8.6ubuntu1) xenial; urgency=medium
+
+  * Merge with Debian unstable. Remaining Ubuntu changes:
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - link.defn, tests/testbuild-linux: Disable upping of bridges as it's not
+      covering all the cases supported by the vlan and bridge hooks and so
+      causes more harm than good at this point. (LP: #1295304)
+    - debian/postinst: Bring back missing /etc/rcS.d/networking symlink, to
+      clean up after old broken upgrades. (LP: #1439109) Needs to be kept
+      until after 16.04 LTS.
+    - ifup@.service, ifupdown-hotplug: Additionally run for "auto" class. We
+      don't really support "allow-hotplug" in Ubuntu at the moment, so we need
+      to deal with "auto" devices appearing after the "networking" init script
+      already ran. (LP: #1374521)
+  * Removed Breaks: on udev fixes upgrade failure. (LP: #1531685)
+
+ -- Martin Pitt <[e-mail]>  Thu, 07 Jan 2016 11:45:47 +0100
+
 ifupdown (0.8.6) unstable; urgency=medium
 
   * Remove the Breaks: udev (<< 228-3~) to work around a bug in udev's prerm
@@ -440,6 +744,30 @@ ifupdown (0.8.6) unstable; urgency=medium
 
  -- Guus Sliepen <[e-mail]>  Tue, 05 Jan 2016 15:57:45 +0100
 
+ifupdown (0.8.5ubuntu1) xenial; urgency=medium
+
+  * Merge with Debian unstable. Remaining Ubuntu changes:
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - Allow setting the MTU and HWADDR on manual interfaces. (LP: #1294807)
+    - inet.defn: Bring up "manual" interfaces automatically, as that's what
+      many users expect.
+    - link.defn, tests/testbuild-linux: Disable upping of bridges as it's not
+      covering all the cases supported by the vlan and bridge hooks and so
+      causes more harm than good at this point. (LP: #1295304)
+    - debian/postinst: Bring back missing /etc/rcS.d/networking symlink, to
+      clean up after old broken upgrades. (LP: #1439109) Needs to be kept
+      until after 16.04 LTS.
+  * Drop ifup-wait-all-auto.service. This has been implemented more elegantly
+    by making network-online.target Wants=networking.service directly.
+  * ifup@.service, ifupdown-hotplug: Additionally run for "auto" class. We
+    don't really support "allow-hotplug" in Ubuntu at the moment, so we need
+    to deal with "auto" devices appearing after the "networking" init script
+    already ran. This change previously lived in systemd, but the ifupdown
+    hotplug handling moved to ifupdown proper now. (LP: #1374521)
+
+ -- Martin Pitt <[e-mail]>  Sun, 03 Jan 2016 11:20:08 +0100
+
 ifupdown (0.8.5) unstable; urgency=medium
 
   [ Stéphane Graber ]
@@ -533,6 +861,33 @@ ifupdown (0.8) unstable; urgency=medium
 
  -- Guus Sliepen <[e-mail]>  Tue, 01 Dec 2015 23:09:54 +0100
 
+ifupdown (0.7.54ubuntu2) xenial; urgency=medium
+
+  * Per-interface hierarchical locking. Backported from Debian git head.
+    (LP: #1337873, Closes: #753755)
+
+ -- Dariusz Gadomski <[e-mail]>  Thu, 10 Nov 2015 11:30:14 +0200
+
+ifupdown (0.7.54ubuntu1) wily; urgency=medium
+
+  * Merge with Debian unstable. Remaining Ubuntu changes:
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - Allow setting the MTU and HWADDR on manual interfaces. (LP: #1294807)
+    - The above change also means that manual interfaces will now be
+      brought up and down (as many users expected until now).
+    - Disable link.defn as it's not covering all the cases supported by
+      the vlan and bridge hooks and so causes more harm than good at this
+      point. (LP: #1295304)
+    - Add ifup-wait-all-auto.service which makes network-online.target wait
+      for all "auto" /etc/network/interfaces for up to two minutes.
+    - debian/postinst: Bring back missing /etc/rcS.d/networking symlink, to
+      clean up after old broken upgrades. (LP: #1439109) Needs to be kept
+      until after 16.04 LTS.
+   * Drop debian/ifupdown.udev. We don't support the "netdev" group.
+
+ -- Martin Pitt <[e-mail]>  Fri, 10 Jul 2015 06:44:18 +0200
+
 ifupdown (0.7.54) unstable; urgency=medium
 
   [ Guus Sliepen ]
@@ -614,6 +969,116 @@ ifupdown (0.7.49) unstable; urgency=medium
 
  -- Andrew Shadura <[e-mail]>  Tue, 23 Sep 2014 17:39:51 +0200
 
+ifupdown (0.7.48.1ubuntu10) vivid; urgency=medium
+
+  * ifup-wait-all-auto.service: Relax dependencies to allow early boot
+    services like open-iscsi to wait for network-online.target.
+    (LP: #1444555)
+
+ -- Martin Pitt <[e-mail]>  Wed, 15 Apr 2015 17:20:09 -0500
+
+ifupdown (0.7.48.1ubuntu9) vivid; urgency=medium
+
+  * debian/ifupdown.ifup-wait-all-auto.service: Wait until ifup's are actually
+    done (their pid files go away), not just until ifstate claims that they
+    are up (which happens at the beginning of ifup, not at the end). Fixes
+    network-online.target to wait until "auto" interfaces are really up.
+    (LP: #1442828)
+
+ -- Martin Pitt <[e-mail]>  Sun, 12 Apr 2015 06:49:10 -0500
+
+ifupdown (0.7.48.1ubuntu8) vivid; urgency=medium
+
+  * debian/postinst: Bring back missing /etc/rcS.d/networking symlink, to
+    clean up after old broken upgrades. (LP: #1439109)
+
+ -- Martin Pitt <[e-mail]>  Wed, 08 Apr 2015 12:02:39 +0200
+
+ifupdown (0.7.48.1ubuntu7) vivid; urgency=medium
+
+  * Fix symlink target of ifup-wait-all-auto.service so that it works as
+    intended.  LP: #1425376.
+
+ -- Steve Langasek <[e-mail]>  Fri, 03 Apr 2015 17:42:13 -0700
+
+ifupdown (0.7.48.1ubuntu6) vivid; urgency=medium
+
+  * Add ifup-wait-all-auto.service which makes network-online.target wait for
+    all "auto" /etc/network/interfaces for up to two minutes. This provides
+    the counterpart of upstart's static-network-up signal under systemd, so
+    that network-online.target behaves as intended with statically configured
+    interfaces.
+
+ -- Martin Pitt <[e-mail]>  Mon, 19 Jan 2015 17:48:38 +0100
+
+ifupdown (0.7.48.1ubuntu5) utopic; urgency=medium
+
+  * Fix broken loopback handling due to incorrect patching of the Debian
+    source. (LP: #1375821)
+
+ -- Stéphane Graber <[e-mail]>  Wed, 01 Oct 2014 11:43:43 -0400
+
+ifupdown (0.7.48.1ubuntu4) utopic; urgency=high
+
+  * No change rebuild against new dh_installinit, to call update-rc.d at
+    postinst.
+
+ -- Dimitri John Ledkov <[e-mail]>  Wed, 28 May 2014 10:41:23 +0100
+
+ifupdown (0.7.48.1ubuntu3) utopic; urgency=medium
+
+  * Use exec ifup/ifdown again for network-interface upstart job.
+
+ -- Benjamin Drung <[e-mail]>  Thu, 08 May 2014 19:30:03 +0200
+
+ifupdown (0.7.48.1ubuntu2) utopic; urgency=medium
+
+  * Do not call ifup/ifdown twice in network-interface upstart job
+    if auto and auto-hotplug are specified. (LP: #1315756)
+
+ -- Benjamin Drung <[e-mail]>  Thu, 08 May 2014 16:07:26 +0200
+
+ifupdown (0.7.48.1ubuntu1) utopic; urgency=medium
+
+  [ Stéphane Graber ]
+  * Merge from Debian. Remaining changes:
+    - Add transition code for moving /etc/init.d/networking from netbase
+      to ifupdown.
+    - On upgrade from 0.7.5ubuntu4, handle the fact that our unmodified
+      conffile may have a mismatch in the dpkg database and manually
+      shuffle the file around on upgrade.  LP: #1217263.
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - Allow setting the MTU and HWADDR on manual interfaces. (LP: #1294807)
+    - The above change also means that manual interfaces will now be
+      brought up and down (as many users expected until now).
+    - Disable link.defn as it's not covering all the cases supported by
+      the vlan and bridge hooks and so causes more harm than good at this
+      point. (LP: #1295304)
+    - Also enable network-interface-container for OpenVZ. (LP: #1294155)
+    - Update networking.init to exit 1 on reload when on an upstart system.
+    - Pass --force to ifdown in network-interface to silence errors on
+      non-existing interfaces. (LP: #1295620)
+    - Prevent the ability to stop or restart networking service
+      interactively. As that is not supported. Networking job is only stopped
+      during shutdown sequence. (LP: #1072518)
+  * Dropped NetworkManager.conf support, the NetworkManager
+    ifupdown:managed mode was never really supported and this causes quite a
+    massive delta on ifupdown's side.
+    If you do use that option at the moment, you will need to decide
+    between managing the interface with NetworkManager (removing it from
+    interfaces) or managing it with ifupdown (removing ifupdown:managed=true
+    and the interface from NM).
+  * Stopped removing /etc/default/networking. The file still won't be
+    used as the upstart jobs don't parse it but there wasn't a good reason
+    to carry this as a delta.
+
+  [ Benjamin Drung ]
+  * Fix network-interface upstart job to bring up allow-hotplug devices.
+    (LP: #1307429)
+
+ -- Stéphane Graber <[e-mail]>  Thu, 01 May 2014 19:01:35 -0400
+
 ifupdown (0.7.48.1) unstable; urgency=low
 
   * Add --ignore-errors option.
@@ -638,6 +1103,64 @@ ifupdown (0.7.48) unstable; urgency=low
 
  -- Andrew Shadura <[e-mail]>  Sun, 23 Mar 2014 15:03:09 +0100
 
+ifupdown (0.7.47.2ubuntu4) trusty; urgency=medium
+
+  * Update the previous fix to actually apply to the upgrade path we
+    care about, saucy to trusty. (LP: #1283274)
+
+ -- Stéphane Graber <[e-mail]>  Thu, 03 Apr 2014 22:15:20 -0400
+
+ifupdown (0.7.47.2ubuntu3) trusty; urgency=medium
+
+  * Fix the preinst to match the current networking.init. (LP: #1283274)
+
+ -- Stéphane Graber <[e-mail]>  Thu, 03 Apr 2014 17:34:53 -0400
+
+ifupdown (0.7.47.2ubuntu2) trusty; urgency=medium
+
+  [ Stéphane Graber ]
+  * Allow setting the MTU and HWADDR on manual interfaces. (LP: #1294807)
+  * The above change also means that manual interfaces will now be
+    brought up and down (as many users expected until now).
+  * Disable link.defn as it's not covering all the cases supported by
+    the vlan and bridge hooks and so causes more harm than good at this
+    point. (LP: #1295304)
+  * Also enable network-interface-container for OpenVZ. (LP: #1294155)
+  * Update networking.init to exit 1 on reload when on an upstart system.
+  * Pass --force to ifdown in network-interface to silence errors on
+    non-existing interfaces. (LP: #1295620)
+
+  [ Dimitri John Ledkov ]
+  * Prevent the ability to stop or restart networking service
+    interactively. As that is not supported. Networking job is only stopped
+    during shutdown sequence. (LP: #1072518)
+
+ -- Stéphane Graber <[e-mail]>  Wed, 19 Mar 2014 18:04:49 -0400
+
+ifupdown (0.7.47.2ubuntu1) trusty; urgency=low
+
+  * Merge from Debian. Remaining changes:
+    - If the /etc/NetworkManager/NetworkManager.conf file is present
+      but doesn't have the "ifupdown:managed" the previous upload instructed
+      the iniparser to return -1, which evaluates to TRUE. We instead instruct
+      it to return 0, as we shouldn't prevent ifupdown from managing the
+      interfaces in that case, as NM won't either. (LP: #281984)
+    - Remove /etc/default/networking as the upstart job doesn't use it and
+      can't really use it without some significant changes (support exclusion
+      lists in all the upstart jobs).
+    - Add transition code for moving /etc/init.d/networking from netbase
+      to ifupdown.
+    - Make /etc/init.d/networking exit 1 immediately on Upstart system
+      with an error message telling the user to use 'service'.
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - On upgrade from 0.7.5ubuntu4, handle the fact that our unmodified
+      conffile may have a mismatch in the dpkg database and manually
+      shuffle the file around on upgrade.  LP: #1217263.
+    - Fix testbuild.linux (missing settle-dad.sh)
+
+ -- Stéphane Graber <[e-mail]>  Wed, 08 Jan 2014 16:48:32 -0500
+
 ifupdown (0.7.47.2) unstable; urgency=low
 
   * Rebuild to avoid useless dependencies on sysv-rc and file-rc.
@@ -645,6 +1168,30 @@ ifupdown (0.7.47.2) unstable; urgency=low
 
  -- Andrew Shadura <[e-mail]>  Mon, 06 Jan 2014 21:23:03 +0100
 
+ifupdown (0.7.47.1ubuntu1) trusty; urgency=low
+
+  * Merge from Debian. Remaining changes:
+    - If the /etc/NetworkManager/NetworkManager.conf file is present
+      but doesn't have the "ifupdown:managed" the previous upload instructed
+      the iniparser to return -1, which evaluates to TRUE. We instead instruct
+      it to return 0, as we shouldn't prevent ifupdown from managing the
+      interfaces in that case, as NM won't either. (LP: #281984)
+    - Remove /etc/default/networking as the upstart job doesn't use it and
+      can't really use it without some significant changes (support exclusion
+      lists in all the upstart jobs).
+    - Add transition code for moving /etc/init.d/networking from netbase
+      to ifupdown.
+    - Make /etc/init.d/networking exit 1 immediately on Upstart system
+      with an error message telling the user to use 'service'.
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - On upgrade from 0.7.5ubuntu4, handle the fact that our unmodified
+      conffile may have a mismatch in the dpkg database and manually
+      shuffle the file around on upgrade.  LP: #1217263.
+    - Fix testbuild.linux (missing settle-dad.sh)
+
+ -- Stéphane Graber <[e-mail]>  Mon, 02 Dec 2013 18:00:44 -0500
+
 ifupdown (0.7.47.1) unstable; urgency=low
 
   * Depend on adduser (Closes: #730598).
@@ -659,6 +1206,30 @@ ifupdown (0.7.47) unstable; urgency=low
 
  -- Andrew Shadura <[e-mail]>  Tue, 26 Nov 2013 08:27:29 +0100
 
+ifupdown (0.7.46.1ubuntu1) trusty; urgency=low
+
+  * Merge from Debian. Remaining changes:
+    - If the /etc/NetworkManager/NetworkManager.conf file is present
+      but doesn't have the "ifupdown:managed" the previous upload instructed
+      the iniparser to return -1, which evaluates to TRUE. We instead instruct
+      it to return 0, as we shouldn't prevent ifupdown from managing the
+      interfaces in that case, as NM won't either. (LP: #281984)
+    - Remove /etc/default/networking as the upstart job doesn't use it and
+      can't really use it without some significant changes (support exclusion
+      lists in all the upstart jobs).
+    - Add transition code for moving /etc/init.d/networking from netbase
+      to ifupdown.
+    - Make /etc/init.d/networking exit 1 immediately on Upstart system
+      with an error message telling the user to use 'service'.
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - On upgrade from 0.7.5ubuntu4, handle the fact that our unmodified
+      conffile may have a mismatch in the dpkg database and manually
+      shuffle the file around on upgrade.  LP: #1217263.
+  * Fix testbuild.linux (missing settle-dad.sh)
+
+ -- Stéphane Graber <[e-mail]>  Thu, 14 Nov 2013 16:21:04 -0500
+
 ifupdown (0.7.46.1) unstable; urgency=low
 
   * Disable DHCP test on Hurd to make the package buildable again.
@@ -675,6 +1246,29 @@ ifupdown (0.7.46) unstable; urgency=low
 
  -- Andrew Shadura <[e-mail]>  Wed, 13 Nov 2013 13:46:58 +0100
 
+ifupdown (0.7.45ubuntu1) trusty; urgency=low
+
+  * Merge from Debian. Remaining changes:
+    - If the /etc/NetworkManager/NetworkManager.conf file is present
+      but doesn't have the "ifupdown:managed" the previous upload instructed
+      the iniparser to return -1, which evaluates to TRUE. We instead instruct
+      it to return 0, as we shouldn't prevent ifupdown from managing the
+      interfaces in that case, as NM won't either. (LP: #281984)
+    - Remove /etc/default/networking as the upstart job doesn't use it and
+      can't really use it without some significant changes (support exclusion
+      lists in all the upstart jobs).
+    - Add transition code for moving /etc/init.d/networking from netbase
+      to ifupdown.
+    - Make /etc/init.d/networking exit 1 immediately on Upstart system
+      with an error message telling the user to use 'service'.
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - On upgrade from 0.7.5ubuntu4, handle the fact that our unmodified
+      conffile may have a mismatch in the dpkg database and manually
+      shuffle the file around on upgrade.  LP: #1217263.
+
+ -- Stéphane Graber <[e-mail]>  Mon, 21 Oct 2013 13:28:07 -0400
+
 ifupdown (0.7.45) unstable; urgency=low
 
   * Fix files enumeration in source-directory.
@@ -692,6 +1286,47 @@ ifupdown (0.7.45) unstable; urgency=low
 
  -- Andrew Shadura <[e-mail]>  Sat, 19 Oct 2013 20:25:51 +0200
 
+ifupdown (0.7.44ubuntu3) saucy; urgency=low
+
+  * Backport a fix from upstream mercurial
+    (http://anonscm.debian.org/hg/collab-maint/ifupdown/rev/fb3055c2c4f0)
+    for a regression introduced by a93db3ecb8f0. LP: #1226067
+
+ -- Chris J Arges <[e-mail]>  Mon, 16 Sep 2013 11:10:08 -0500
+
+ifupdown (0.7.44ubuntu2) saucy; urgency=low
+
+  * On upgrade from 0.7.5ubuntu4, handle the fact that our unmodified conffile
+    may have a mismatch in the dpkg database and manually shuffle the file
+    around on upgrade.  LP: #1217263.
+
+  [ Chris Arges ]
+  * Backport a fix from upstream mercurial
+    (http://anonscm.debian.org/hg/collab-maint/ifupdown/rev/a93db3ecb8f0)
+    for a race condition when updating the state file.  LP: #1160490
+
+ -- Steve Langasek <[e-mail]>  Sun, 01 Sep 2013 06:43:53 +0000
+
+ifupdown (0.7.44ubuntu1) saucy; urgency=low
+
+  * Merge from Debian. Remaining changes:
+    - If the /etc/NetworkManager/NetworkManager.conf file is present
+      but doesn't have the "ifupdown:managed" the previous upload instructed
+      the iniparser to return -1, which evaluates to TRUE. We instead instruct
+      it to return 0, as we shouldn't prevent ifupdown from managing the
+      interfaces in that case, as NM won't either. (LP: #281984)
+    - Remove /etc/default/networking as the upstart job doesn't use it and
+      can't really use it without some significant changes (support exclusion
+      lists in all the upstart jobs).
+    - Add transition code for moving /etc/init.d/networking from netbase
+      to ifupdown.
+    - Make /etc/init.d/networking exit 1 immediately on Upstart system
+      with an error message telling the user to use 'service'.
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+
+ -- Stéphane Graber <[e-mail]>  Mon, 26 Aug 2013 16:56:45 -0400
+
 ifupdown (0.7.44) unstable; urgency=low
 
   * Convert from noweb to plain C (Closes: #707209).
@@ -805,6 +1440,63 @@ ifupdown (0.7.6) unstable; urgency=low
 
  -- Andrew Shadura <[e-mail]>  Sun, 03 Mar 2013 12:08:16 +0100
 
+ifupdown (0.7.5ubuntu4) saucy; urgency=low
+
+  * Due to the checkered history of /etc/init.d/networking, only remove the
+    upstart-job symlink in the preinst if the dpkg status is 'newconffile',
+    to avoid bogus conffile prompts on upgrade, and manually manipulate the
+    new conffile into place in the postinst.  LP: #1181856.
+
+ -- Steve Langasek <[e-mail]>  Mon, 20 May 2013 19:05:31 +0000
+
+ifupdown (0.7.5ubuntu3) saucy; urgency=low
+
+  * Restore lsb-base and init_is_upstart now that the new lsb-base is in
+    Ubuntu.
+  * Explicitly invoke update-rc.d for networking in the postinst (and
+    postrm): we will need this in the sequence in order to be able to use
+    insserv later.
+  * Drop redundant debian/conffiles.
+
+ -- Steve Langasek <[e-mail]>  Sat, 18 May 2013 23:31:07 +0000
+
+ifupdown (0.7.5ubuntu2) raring; urgency=low
+
+  * Update network-interface-security job to stop when the parent job is
+    stopped itself. This avoids leftover instances. (LP: #1065684)
+  * Set mtu of tunnel devices. (LP: #1074048)
+  * Actually set the new calculated value for duplicate entries. (LP: #1086517)
+
+ -- Stéphane Graber <[e-mail]>  Tue, 11 Dec 2012 19:53:56 -0500
+
+ifupdown (0.7.5ubuntu1) raring; urgency=low
+
+  * Merge ifupdown 0.7.5 from Debian. Remaining changes:
+    - debian/ifupdown.neworking.upstart (forwarded to Debian):
+      + Don't bring 'lo' down (add it to --exclude)
+      + Emit deconfiguring-networking (LP: #1061639)
+    - Remove /etc/default/networking as the upstart job doesn't use it and
+      can't really use it without some significant changes (support exclusion
+      lists in all the upstart jobs).
+    - Add resolvconf (8) to SEE ALSO section of the interfaces manpage.
+      (LP: #1043335)
+    - If the /etc/NetworkManager/NetworkManager.conf file is present
+      but doesn't have the "ifupdown:managed" the previous upload instructed
+      the iniparser to return -1, which evaluates to TRUE. We instead instruct
+      it to return 0, as we shouldn't prevent ifupdown from managing the
+      interfaces in that case, as NM won't either. (LP: #281984)
+    - debian/postinst: If the loopback interface is missing from the config
+      in /etc/network/interfaces, add it on upgrade.
+    - Decrease version dependency against initscripts as the new version isn't
+      in Ubuntu yet and the relevant change was added to the older version.
+  * Remove versioned dependency against lsb-base and matching init_is_upstart
+    calls in the various scripts as the new version isn't in Ubuntu yet.
+  * debian/rules revert changes to dh_installinit calls to force all init
+    scripts to be only upstart scripts. This can probably be reverted once we
+    have the new lsb-base.
+
+ -- Stéphane Graber <[e-mail]>  Mon, 05 Nov 2012 11:06:10 -0500
+
 ifupdown (0.7.5) unstable; urgency=low
 
   * Fix upstart hooks (Closes: #692110).
@@ -829,6 +1521,33 @@ ifupdown (0.7.3) unstable; urgency=low
 
  -- Andrew O. Shadura <[e-mail]>  Tue, 16 Oct 2012 10:39:24 +0200
 
+ifupdown (0.7.2ubuntu2) quantal; urgency=low
+
+  * Fix regression with the removal of the sysvinit networking job:
+    - Don't bring 'lo' down (add it to --exclude)
+    - Emit deconfiguring-networking (LP: #1061639)
+
+ -- Stéphane Graber <[e-mail]>  Tue, 09 Oct 2012 11:13:27 -0400
+
+ifupdown (0.7.2ubuntu1) quantal; urgency=low
+
+  * Merge ifupdown 0.7.2 from Debian. Remaining changes:
+    - If the /etc/NetworkManager/NetworkManager.conf file is present
+      but doesn't have the "ifupdown:managed" the previous upload instructed
+      the iniparser to return -1, which evaluates to TRUE. We instead instruct
+      it to return 0, as we shouldn't prevent ifupdown from managing the
+      interfaces in that case, as NM won't either. (LP: #281984)
+    - debian/postinst: If the loopback interface is missing from the config
+      in /etc/network/interfaces, add it on upgrade.
+    - Add jobs and hooks for upstart.
+  * Remove /etc/default/networking as the upstart job doesn't use it and
+    can't really use it without some significant changes (support exclusion
+    lists in all the upstart jobs).
+  * Add resolvconf (8) to SEE ALSO section of the interfaces manpage.
+    (LP: #1043335)
+
+ -- Stéphane Graber <[e-mail]>  Thu, 13 Sep 2012 11:18:07 -0400
+
 ifupdown (0.7.2) unstable; urgency=low
 
   * Don't install /etc/default/networking as executable (Closes: #679623).
@@ -843,6 +1562,56 @@ ifupdown (0.7.2) unstable; urgency=low
 
  -- Andrew O. Shadura <[e-mail]>  Thu, 16 Aug 2012 23:22:32 +0200
 
+ifupdown (0.7.1ubuntu3) quantal; urgency=low
+
+  * Add a 'stop on' rule for the networking service, so that we tear the
+    network down at the correct point in the shutdown sequence (after remote
+    filesystems have been unmounted).  This is mostly needed when using
+    insserv upstart integration (not yet in Ubuntu) to ensure the shutdown
+    doesn't hang waiting for an unsatisfiable init script dependency, but it
+    also addresses the need for shutting down networking on runlevel changes
+    - provided that umountnfs.sh itself is called for runlevel 1, which it
+    currently is not.
+  * Also start the job on runlevel [2345].  This is a no-op during a normal
+    boot since the network will be started *before* runlevel is emitted, but
+    is needed to restart the network after a change from runlevel 1.
+    LP: #752481.
+
+ -- Steve Langasek <[e-mail]>  Thu, 06 Sep 2012 15:05:32 -0400
+
+ifupdown (0.7.1ubuntu2) quantal; urgency=low
+
+  * Make /etc/init.d/networking a conffile even if it's a symlink.
+    This should help dpkg do the right thing when moving the file from netbase
+    over to ifupdown. This is a workaround for (LP: #1023437)
+
+ -- Stéphane Graber <[e-mail]>  Wed, 11 Jul 2012 11:51:57 -0400
+
+ifupdown (0.7.1ubuntu1) quantal; urgency=low
+
+  * Resynchronise with Debian experimental.  Remaining changes:
+    - If the /etc/NetworkManager/NetworkManager.conf file is present
+      but doesn't have the "ifupdown:managed" the previous upload instructed
+      the iniparser to return -1, which evaluates to TRUE. We instead instruct
+      it to return 0, as we shouldn't prevent ifupdown from managing the
+      interfaces in that case, as NM won't either. (LP: #281984)
+    - debian/postinst: If the loopback interface is missing from the config
+      in /etc/network/interfaces, add it on upgrade.
+    - Add jobs and hooks for upstart.
+    - Cherry-pick commit a1f8efc4d93f from upstream, add --no-scripts as a
+      parameter to ifup/ifdown, allowing the user to bypass the the scripts
+      in /etc/network/if-*.d/ (LP: #258782)
+  * Don't include new /etc/default/networking as it's incompatible with event
+    based networking configuration.
+  * Don't bump dependency on initscripts as the dependency isn't required with
+    the upstart jobs and the new version isn't in Ubuntu yet.
+  * Drop our code hardcoding the metric at 100 for the default gateway,
+    this was used to avoid conflicts between ifupdown and Network Manager.
+    Nowadays Network Manager won't manage an interface defined in ifupdown
+    and the rest of the metric changes are now in ifupdown.
+
+ -- Stéphane Graber <[e-mail]>  Tue, 03 Jul 2012 13:49:30 -0400
+
 ifupdown (0.7.1) unstable; urgency=low
 
   * Supply metric setting to dhclient (Closes: #279741, #364581, #676323).
@@ -867,6 +1636,32 @@ ifupdown (0.7.1) unstable; urgency=low
 
  -- Andrew O. Shadura <[e-mail]>  Thu, 21 Jun 2012 18:59:10 +0200
 
+ifupdown (0.7ubuntu1) quantal-proposed; urgency=low
+
+  * Resynchronise with Debian experimental.  Remaining changes:
+    (LP: #298488, LP: #663352)
+    - ifupdown.nw: Use 100 as default route metric unless an explicit metric
+      parameter is set in /etc/network/interface.
+    - If the /etc/NetworkManager/NetworkManager.conf file is present
+      but doesn't have the "ifupdown:managed" the previous upload instructed
+      the iniparser to return -1, which evaluates to TRUE. We instead instruct
+      it to return 0, as we shouldn't prevent ifupdown from managing the
+      interfaces in that case, as NM won't either. (LP: #281984)
+    - debian/postinst: If the loopback interface is missing from the config
+      in /etc/network/interfaces, add it on upgrade.
+    - Add jobs and hooks for upstart.
+  * Cherry-pick commit 011d5904c09d from upstream, fixing cases where the
+    error messages wouldn't be triggered (caused test failure).
+  * Cherry-pick commit 7c1a226cc995 from upstream, adds support for two
+    options on dhcpv6 (accept_ra and autoconf) (LP: #1013597)
+  * Cherry-pick commit 5af7e814faee from upstream, fixing a failure in the
+    example script generate-interfaces.pl (LP: #286808)
+  * Cherry-pick commit a1f8efc4d93f from upstream, add --no-scripts as a
+    parameter to ifup/ifdown, allowing the user to bypass the the scripts
+    in /etc/network/if-*.d/ (LP: #258782)
+
+ -- Stéphane Graber <[e-mail]>  Thu, 28 Jun 2012 17:21:45 -0400
+
 ifupdown (0.7) unstable; urgency=low
 
   * Accept duplicate options in /etc/network/interfaces, join them using
@@ -917,6 +1712,31 @@ ifupdown (0.7~rc3) unstable; urgency=low
 
  -- Andrew O. Shadura <[e-mail]>  Mon, 14 May 2012 11:42:08 +0200
 
+ifupdown (0.7~rc2+experimentalubuntu2) quantal; urgency=low
+
+  * Fix upstart hook to ignore ADDRFAM=meta (ifup -a).
+  * Cherry-pick commit 6c67e908b934 from upstream, making ifquery only
+    list interfaces with a matching iface entry.
+
+ -- Stéphane Graber <[e-mail]>  Mon, 14 May 2012 10:14:34 -0400
+
+ifupdown (0.7~rc2+experimentalubuntu1) quantal; urgency=low
+
+  * Resynchronise with Debian experimental.  Remaining changes:
+    - ifupdown.nw: Use 100 as default route metric unless an explicit metric
+      parameter is set in /etc/network/interface.
+    - If the /etc/NetworkManager/NetworkManager.conf file is present
+      but doesn't have the "ifupdown:managed" the previous upload instructed
+      the iniparser to return -1, which evaluates to TRUE. We instead instruct
+      it to return 0, as we shouldn't prevent ifupdown from managing the
+      interfaces in that case, as NM won't either. (LP: #281984)
+    - debian/postinst: If the loopback interface is missing from the config
+      in /etc/network/interfaces, add it on upgrade.
+    - Add jobs and hooks for upstart, don't install ifupdown's
+      /etc/init.d/networking (using net-base's for now)
+
+ -- Stéphane Graber <[e-mail]>  Wed, 02 May 2012 22:55:36 -0400
+
 ifupdown (0.7~rc2+experimental) experimental; urgency=low
 
   * Try to bring hotplug interfaces up on initscript restart
@@ -979,6 +1799,138 @@ ifupdown (0.7~rc1+experimental) experimental; urgency=low
 
  -- Andrew O. Shadura <[e-mail]>  Tue, 17 Apr 2012 01:05:42 +0200
 
+ifupdown (0.7~beta2ubuntu8) precise; urgency=low
+
+  * Start networking upstart job on 'or container', to let us optimize the
+    udevtrigger job.
+
+ -- Steve Langasek <[e-mail]>  Wed, 04 Apr 2012 17:27:03 -0700
+
+ifupdown (0.7~beta2ubuntu7) precise; urgency=low
+
+  [ Wookey ]
+  * Use cross-compiler when cross-compiling (LP: #967227)
+    Also merged upstream as:
+    http://anonscm.debian.org/hg/collab-maint/ifupdown/rev/b21bc14d9109
+
+  [ Stéphane Graber ]
+  * Cherry pick commits from upstream to fix the broadcast address (LP: #924880)
+    http://anonscm.debian.org/hg/collab-maint/ifupdown/rev/d31ffdb89dbb
+    http://anonscm.debian.org/hg/collab-maint/ifupdown/rev/b996bb5866f5
+    http://anonscm.debian.org/hg/collab-maint/ifupdown/rev/fbe3c242d6f8
+    http://anonscm.debian.org/hg/collab-maint/ifupdown/rev/bdfd32ad6287
+    http://anonscm.debian.org/hg/collab-maint/ifupdown/rev/d144dfdd7940
+
+  * Detect bogus dns-nameservers line in /etc/network/interfaces and
+    automatically comment them (LP: #932275)
+
+ -- Stéphane Graber <[e-mail]>  Thu, 29 Mar 2012 17:39:32 -0400
+
+ifupdown (0.7~beta2ubuntu6) precise; urgency=low
+
+  * Fix previous upload.
+  * Forgot to update the test suite in previous upload...
+    Update debian/testbuild-linux to drop --exit-on-error.
+
+ -- Stéphane Graber <[e-mail]>  Thu, 16 Feb 2012 10:50:53 -0500
+
+ifupdown (0.7~beta2ubuntu5) precise; urgency=low
+
+  * Revert upstream commit setting --exit-on-error to the run-parts call.
+    Scripts still shouldn't exit non-zero unless they plan to stop the
+    network configuration, but considering the amount of broken scripts
+    out there, it was considered safer to ignore their return value for
+    12.04.
+    This change will be reverted in 12.10 when Debian also has the new
+    ifupdown.
+    http://anonscm.debian.org/hg/collab-maint/ifupdown/rev/2625e15a5fc2
+
+ -- Stéphane Graber <[e-mail]>  Thu, 16 Feb 2012 10:17:56 -0500
+
+ifupdown (0.7~beta2ubuntu4) precise; urgency=low
+
+  * Add a new network-interface-container upstart job that will emit
+    a fake net-device-added for the loopback interface on LXC
+    and LXC-libvirt.
+    This is needed as we don't get a udev event for the loopback interface
+    and net-device-up won't be emitted for the loopback interface in the
+    if-up.d hook (as it's supposed to be done in network-interface).
+
+ -- Stéphane Graber <[e-mail]>  Sun, 12 Feb 2012 16:14:53 -0500
+
+ifupdown (0.7~beta2ubuntu3) precise; urgency=low
+
+  * More label fixes from upstream, don't bring down the parent
+    when bringing down a label.
+    http://anonscm.debian.org/hg/collab-maint/ifupdown/rev/f9cef973859e
+    http://anonscm.debian.org/hg/collab-maint/ifupdown/rev/80a68bbbd45d
+  * /etc/init/network-interface-security.conf was made a conffile in
+    maverick. Update the check in postinst to fix upgrade from Oneiric.
+    (LP: #918323)
+  * Fix NetworkManager managed mode detection to look at
+    /etc/NetworkManager/NetworkManager.conf instead of
+    /etc/NetworkManager/nm-system-settings.conf (LP: #918354)
+
+ -- Stéphane Graber <[e-mail]>  Wed, 18 Jan 2012 14:19:03 -0500
+
+ifupdown (0.7~beta2ubuntu2) precise; urgency=low
+
+  * Make sure we always call dhclient(3) with /var/lib/dhcp instead of
+    /var/lib/dhcp3 (needed as dhclient3 is now a symlink to dhclient).
+    (LP: #900234)
+  * Fix typo in previous changelog entry (LP: #916263)
+  * Automatically convert network-interface-security.conf to a conffile
+    (LP: #917185)
+
+ -- Stéphane Graber <[e-mail]>  Mon, 16 Jan 2012 17:54:26 -0500
+
+ifupdown (0.7~beta2ubuntu1) precise; urgency=low
+
+  * Resynchronise with Debian experimental.  Remaining changes
+    (LP: #905660, LP: #850566, LP: #611877, LP: #678425):
+    - ifupdown.nw: Use 100 as default route metric unless an explicit metric
+      parameter is set in /etc/network/interface.
+    - Add iniparser3.0b sources (dictionary.c, dictionary.h, iniparser.c,
+      iniparser.h), to let ifupdown avoid auto-up/down of interfaces if
+      network-manager's ifupdown plugin is in managed=true mode.
+    - Add a new query interface, 'ifquery', that can be used by upstart
+      hooks to ask for the list of possible interfaces that they might need
+      to bring up.
+    - debian/ifupdown.network-interface.upstart: Replace the init scripts
+      with a per-interface Upstart job.
+    - debian/ifupdown.networking.upstart: Add a "networking" job that
+      partially replaces the networking init script from netbase.
+    - debian/control: Bump build-dependency on debhelper for Upstart-aware
+      dh_installinit.
+    - debian/rules: Due to debhelper always adding /etc/init.d symlinks, we
+      must manually remove /etc/init.d/networking for as long as netbase
+      still provides it.
+    - Add if-up and if-down scripts to emit Upstart events when interfaces
+      come up and go down.
+    - debian/ifupdown.network-interface-security.upstart: Ensure apport is
+      started before interfaces are brought up by either ifupdown or
+      network-manager.
+    - debian/postinst: If the loopback interface is missing from the config
+      in /etc/network/interfaces, add it on upgrade.
+    - debian/ifupdown.preinst: Since files in /etc were not conffiles in
+      lucid, and /etc/network/if-up.d/upstart and
+      /etc/init/network-interface.conf changed between lucid final and
+      maverick, add extra handling to avoid spurious conffile prompts.
+    - invoke dhclient3 with '-1', meaning it should exit failure if it does
+      not receive a response in 60 seconds. (LP: #838968)
+    - contrib/ifstate-check: Use /run/network/ifstate instead of
+      /etc/network/run/ifstate
+    - ifup.8: Update man page to indicate that Ubuntu uses /run
+      and that it's always writable as it's a temporary filesystem
+  * ifupdown.nw: When calling dhclient3, also use /var/lib/dhcp as
+    dhclient3 is now a symlink to dhclient and /var/lib/dhcp3 no longer
+    exists. (LP: #900234)
+  * Mark ifupdown as Multi-Arch foreign
+  * Replace remaining references to /var/run/network by /run/network
+    (LP: #885506)
+
+ -- Stéphane Graber <[e-mail]>  Thu, 12 Jan 2012 10:25:30 +0100
+
 ifupdown (0.7~beta2) experimental; urgency=low
 
   * Put interfaces down in the reverse order than they were
@@ -1019,6 +1971,90 @@ ifupdown (0.7~beta1) experimental; urgency=low
 
  -- Andrew O. Shadura <[e-mail]>  Tue, 23 Aug 2011 11:49:19 +0300
 
+ifupdown (0.7~alpha5.1ubuntu6) precise; urgency=low
+
+  * debian/ifupdown.preinst: further conffile upgrade handling is needed
+    for three files to get smooth upgrades from lucid (two of these were
+    modified in a lucid SRU, one was modified in oneiric that previously
+    didn't need special handling because the old and new checksums always
+    matched).  LP: #903131.
+
+ -- Steve Langasek <[e-mail]>  Fri, 16 Dec 2011 23:16:47 -0800
+
+ifupdown (0.7~alpha5.1ubuntu5) oneiric; urgency=low
+
+  * use 'ifquery' in if-up.d/upstart rather than parsing interfaces
+    manually. This fixes issue where devices with 'auto' but without a
+    config stanza would be blocked on (LP: #850226).
+
+ -- Scott Moser <[e-mail]>  Wed, 14 Sep 2011 14:30:57 -0400
+
+ifupdown (0.7~alpha5.1ubuntu4) oneiric; urgency=low
+
+  * invoke dhclient3 with '-1', meaning it should exit failure if it does
+    not receive a response in 60 seconds. (LP: #838968)
+  * fix the broken static-network-up-emitted event. This now keeps
+    state of which interfaces have been brought up by marker files
+    in /run/network named ifup.IFACE and a directory named
+    static-network-up-emitted indicating static-network-up has been
+    emitted.
+
+ -- Scott Moser <[e-mail]>  Fri, 02 Sep 2011 15:50:47 -0400
+
+ifupdown (0.7~alpha5.1ubuntu3) oneiric; urgency=low
+
+  * Document what events are emitted properly. (LP: #819928)
+
+ -- Clint Byrum <[e-mail]>  Mon, 22 Aug 2011 11:28:32 +0100
+
+ifupdown (0.7~alpha5.1ubuntu2) oneiric; urgency=low
+
+  * Rename Vcs-* to XS-Debian-Vcs-*.
+  * Close mkdir's stderr when creating
+    /var/run/network/static-network-up-emitted to silence (expected) error on
+    second run.
+
+ -- Loïc Minier <[e-mail]>  Wed, 10 Aug 2011 17:01:24 +0200
+
+ifupdown (0.7~alpha5.1ubuntu1) oneiric; urgency=low
+
+  * Resynchronise with Debian experimental.  Remaining changes:
+    - ifupdown.nw: Use 100 as default route metric unless an explicit metric
+      parameter is set in /etc/network/interface.
+    - ifupdown.nw: Add 'ipv4ll' method which uses avahi-autoipd to bring up
+      an interface with an IPv4 link-layer address from 169.254.0.0/16 (aka
+      'Zeroconf').
+    - Add iniparser3.0b sources (dictionary.c, dictionary.h, iniparser.c,
+      iniparser.h), to let ifupdown avoid auto-up/down of interfaces if
+      network-manager's ifupdown plugin is in managed=true mode.
+    - Add a new query interface, 'ifquery', that can be used by upstart
+      hooks to ask for the list of possible interfaces that they might need
+      to bring up.
+    - debian/ifupdown.network-interface.upstart: Replace the init scripts
+      with a per-interface Upstart job.
+    - debian/ifupdown.networking.upstart: Add a "networking" job that
+      partially replaces the networking init script from netbase.
+    - debian/control: Bump build-dependency on debhelper for Upstart-aware
+      dh_installinit.
+    - debian/rules: Due to debhelper always adding /etc/init.d symlinks, we
+      must manually remove /etc/init.d/networking for as long as netbase
+      still provides it.
+    - Add if-up and if-down scripts to emit Upstart events when interfaces
+      come up and go down.
+    - debian/ifupdown.network-interface-security.upstart: Ensure apport is
+      started before interfaces are brought up by either ifupdown or
+      network-manager.
+    - debian/postinst: If the loopback interface is missing from the config
+      in /etc/network/interfaces, add it on upgrade.
+    - debian/ifupdown.preinst: Since files in /etc were not conffiles in
+      lucid, and /etc/network/if-up.d/upstart and
+      /etc/init/network-interface.conf changed between lucid final and
+      maverick, add extra handling to avoid spurious conffile prompts.
+  * Backport from upstream Mercurial repository:
+    - Add initial DHCPv6 support (LP: #733547).
+
+ -- Colin Watson <[e-mail]>  Tue, 09 Aug 2011 14:41:00 +0100
+
 ifupdown (0.7~alpha5.1) experimental; urgency=low
 
   * Non-maintainer upload.
@@ -1160,6 +2196,98 @@ ifupdown (0.7~alpha2) experimental; urgency=low
 
  -- Anthony Towns <[e-mail]>  Mon, 18 Jun 2007 15:47:21 +0100
 
+ifupdown (0.6.10ubuntu5) oneiric; urgency=low
+
+  [Scott Moser]
+  * debian/ifupdown.upstart.if-up: emit static-network-up when all auto
+    network interfaces are up. (LP: #810044)
+
+  [ Clint Byrum ]
+  * debian/rules: dh_installinit has changed and exposes that the
+    network-interface-security job should also have --noscripts
+
+ -- Clint Byrum <[e-mail]>  Mon, 01 Aug 2011 12:40:37 -0700
+
+ifupdown (0.6.10ubuntu4) natty; urgency=low
+
+  * debian/ifupdown.network-interface{,-security}.upstart: handle race
+    condition when loading AppArmor profiles for interfaces (LP: #689892).
+
+ -- Kees Cook <[e-mail]>  Mon, 13 Dec 2010 13:53:12 -0800
+
+ifupdown (0.6.10ubuntu3) maverick; urgency=low
+
+  * debian/ifupdown.preinst: since files in /etc were not conffiles in
+    lucid, and /etc/network/if-up.d/upstart and
+    /etc/init/network-interface.conf changed between lucid final and
+    maverick, add extra handling to avoid spurious conffile prompts.
+    LP: #620956.
+
+ -- Steve Langasek <[e-mail]>  Tue, 31 Aug 2010 02:11:35 +0000
+
+ifupdown (0.6.10ubuntu2) maverick; urgency=low
+
+  * debian/ifupdown.network-interface.conf: Bring up lo manually, so that it
+    comes up even if /etc/network/interfaces is broken (LP: #512253).
+  * debian/ifupdown.upstart.if-up: Don't emit a duplicate net-device-up
+    event for lo here, as network-interface.conf will have taken care of it.
+
+ -- Colin Watson <[e-mail]>  Thu, 22 Jul 2010 13:52:49 +0100
+
+ifupdown (0.6.10ubuntu1) maverick; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - ifupdown.nw: use 100 as default route metric unless an explicit metric
+      parameter is set in /etc/network/interface
+    - ifupdown.nw: Add 'ipv4ll' method which uses avahi-autoipd to bring up
+      an interface with an IPv4 link-layer address from 169.254.0.0/16 (aka
+      'Zeroconf').
+    - Add iniparser3.0b sources (dictionary.c, dictionary.h, iniparser.c,
+      iniparser.h), to let ifupdown avoid auto-up/down of interfaces if
+      network-manager's ifupdown plugin is in managed=true mode
+    - move ifstate file to /var/run/network/ifstate
+    - Add a new query interface, 'ifquery', that can be used by upstart
+      hooks to ask for the list of possible interfaces that they might need
+      to bring up.
+    - debian/ifupdown.network-interface.upstart: replace the init scripts
+      with a per-interface Upstart job.
+    - debian/ifupdown.networking.upstart: add a "networking" job that
+      partially replaces the networking init script from netbase.
+    - debian/control: bump build-dependency on debhelper for Upstart-aware
+      dh_installinit.
+    - debian/rules: due to debhelper always adding /etc/init.d symlinks, we
+      must manually remove /etc/init.d/networking for as long as netbase
+      still provides it.
+    - Add if-up and if-down scripts to emit Upstart events when interfaces
+      come up and go down.
+    - debian/ifupdown.network-interface-security.upstart: ensure apport is
+      started before interfaces are brought up by either ifupdown or
+      network-manager.
+    - debian/postinst: if the loopback interface is missing from the config
+      in /etc/network/interfaces, add it on upgrade.
+    - Fix a wrong path to examples in the interfaces(5) manpage.
+  * Changes superseded in Debian:
+    - ifupdown.nw: modprobe ipv6 before configuring it.
+    - debian/control: Add missing ${misc:Depends}
+  * Dropped changes:
+    - Drop versioned dependency on netbase - no rationale is given for the
+      dependency to exist at all.
+    - No need to version the dep on lsb-base, every release since dapper and
+      earlier satisfies this constraint.
+    - Drop Breaks on old, pre-jaunty versions of udev.
+    - Drop migration of "mapping hotplug" to "auto", this migration was done
+      in hardy and upstream has dropped the debconf support so let's not
+      readd it.
+    - Drop edits to ifupdown-clean, no longer used in Ubuntu.
+    - Drop the udev rules, which are now completely superseded by upstart
+      jobs.
+    - Drop preinst, postinst cleanup of the obsolete, Ubuntu-specific
+      loopback script.
+  * update all generated files to match their source versions (*.defn,
+    main.c).
+
+ -- Steve Langasek <[e-mail]>  Thu, 03 Jun 2010 17:18:43 +0000
+
 ifupdown (0.6.10) unstable; urgency=low
 
   * Try to load the ipv6 module when doing up on inet6 stansas except
@@ -1220,6 +2348,283 @@ ifupdown (0.6.8+nmu1) unstable; urgency=low
 
  -- Christian Perrier <[e-mail]>  Sat, 12 Apr 2008 13:32:24 +0200
 
+ifupdown (0.6.8ubuntu29) lucid; urgency=low
+
+  * debian/postinst: if the loopback interface is missing from the config in
+    /etc/network/interfaces, add it on upgrade; there is no valid use case
+    for a system without localhost, and not bringing this up will cause
+    upstart runlevel handling to fail.  LP: #497299.
+
+ -- Steve Langasek <[e-mail]>  Fri, 19 Feb 2010 20:29:32 -0800
+
+ifupdown (0.6.8ubuntu28) lucid; urgency=low
+
+  * debian/ifupdown.upstart.if-up, debian/ifupdown.upstart.if-down:
+    - Do not wait for the Upstart event to complete; while this seems like
+      a good idea, it can cause "ifup -a" to hang forever if anybody creates
+      a job that waits for two interfaces to come up.
+
+      I still want this to be the default behaviour for "emit", and I do
+      want this to block, but I need to fix Upstart first so that it doesn't
+      keep happening accidentally.
+
+ -- Scott James Remnant <[e-mail]>  Wed, 17 Feb 2010 11:03:18 +0000
+
+ifupdown (0.6.8ubuntu27) lucid; urgency=low
+
+  * Add a new query interface, 'ifquery', that can be used by upstart hooks
+    to ask for the list of possible interfaces that they might need to bring
+    up.
+
+ -- Steve Langasek <[e-mail]>  Thu, 04 Feb 2010 16:28:53 -0800
+
+ifupdown (0.6.8ubuntu26) lucid; urgency=low
+
+  * debian/ifupdown.network-interface-security.upstart: do not load on liveCD.
+
+ -- Kees Cook <[e-mail]>  Fri, 08 Jan 2010 08:24:52 -0800
+
+ifupdown (0.6.8ubuntu25) lucid; urgency=low
+
+  * debian/ifupdown.network-interface-security.upstart:
+    - trigger on network-manager too.
+    - load from a directory rather than hard-coded list of profiles.
+
+ -- Kees Cook <[e-mail]>  Tue, 15 Dec 2009 10:33:15 -0800
+
+ifupdown (0.6.8ubuntu24) lucid; urgency=low
+
+  * debian/ifupdown.network-interface-security.upstart:
+    - Assume that virtual-filesystems are mounted; we can get away with
+      this because of the start conditions of networking and network-interface
+      if we don't every other network interface will wait for virtual
+      filesystems to get mounted again.
+
+      I *really* need to fix this Upstart bug!
+
+ -- Scott James Remnant <[e-mail]>  Tue, 15 Dec 2009 18:05:41 +0000
+
+ifupdown (0.6.8ubuntu23) lucid; urgency=low
+
+  * debian/ifupdown.network-interface.upstart:
+  * debian/ifupdown.networking.upstart:
+    - Revert Kees's change; this flat out doesn't work.
+  * debian/ifupdown.network-interface-security.upstart:
+    - Instead use "starting" so that the network-interface-security job
+      is started before the first network-interface, and blocks it from
+      finishing.
+
+  (The above fixes the second ifup never completing due to waiting for
+   network-interface-security to be restarted - which will never happen.)
+
+  * debian/ifupdown.networking.upstart:
+    - Make /var/run/network as we do in the network-interface job; this
+      might end up running first.  LP: #446031.
+
+ -- Scott James Remnant <[e-mail]>  Tue, 15 Dec 2009 14:34:56 +0000
+
+ifupdown (0.6.8ubuntu22) lucid; urgency=low
+
+  * Add AppArmor boot-time bits to upstart jobs.
+  * Due to debhelper always adding /etc/init.d symlinks, we must
+    manually remove /etc/init.d/networking for as long as netbase
+    still provides it.
+
+ -- Kees Cook <[e-mail]>  Fri, 04 Dec 2009 10:11:38 -0800
+
+ifupdown (0.6.8ubuntu21) karmic; urgency=low
+
+  * --no-scripts is not --noscripts.  LP: #430878.
+
+ -- Scott James Remnant <[e-mail]>  Tue, 22 Sep 2009 15:30:28 -0700
+
+ifupdown (0.6.8ubuntu20) karmic; urgency=low
+
+  FFE LP: #427356.
+
+  * Replace the udev rule with a per-interface Upstart job.
+  * Add a "networking" job that partially replaces the networking init
+    script from netbase.
+  * debian/control:
+    - Bump build-dependency on debhelper for Upstart-aware dh_installinit
+    - Add missing ${misc:Depends}
+
+  * Add if-up and if-down scripts to emit Upstart events when interfaces
+    come up and go down.
+
+ -- Scott James Remnant <[e-mail]>  Tue, 15 Sep 2009 03:30:29 +0100
+
+ifupdown (0.6.8ubuntu19) jaunty; urgency=low
+
+  * debian/ifupdown.udev: In fact, there's no reason not to call the ifup
+    unconditionally either; if it doesn't have a driver, but is listed in
+    /etc/network/interfaces with "auto" we can still have a crack at
+    bringing it up.  We may as well make the /var/run/network directory
+    in this rule too.
+  * debian/loopback.init: Then this init script can go away.
+
+ -- Scott James Remnant <[e-mail]>  Thu, 05 Mar 2009 14:13:53 +0000
+
+ifupdown (0.6.8ubuntu18) jaunty; urgency=low
+
+  * debian/ifupdown.udev: Unconditionally call ifdown when the network
+    interface is removed, instead of checking DRIVERS which is likely gone
+    anyway.  LP: #130437.
+  * Clean up the mess of the rules file while I was in there ;)
+
+ -- Scott James Remnant <[e-mail]>  Thu, 05 Mar 2009 14:11:42 +0000
+
+ifupdown (0.6.8ubuntu17) jaunty; urgency=low
+
+  * Restore _darcs directory caused by using intrepid's dpkg; makes the
+    Debian->Ubuntu diff somewhat more readable.
+
+ -- Scott James Remnant <[e-mail]>  Thu, 05 Mar 2009 14:01:18 +0000
+
+ifupdown (0.6.8ubuntu16) jaunty; urgency=low
+
+  * modprobe failures for ipv6 are benign as the module is likely built-in.
+    (LP: #107432)
+  * modprobe -Q is now deprecated and going away, move to using -q.
+  * modprobe for ipv6 should honour the blacklists.
+  * update all generated files to match their source versions (*.defn,
+    main.c).
+
+ -- Andy Whitcroft <[e-mail]>  Thu, 05 Mar 2009 13:47:48 +0000
+
+ifupdown (0.6.8ubuntu15) jaunty; urgency=low
+
+  * Add Breaks to ensure the right version of udev is used.
+
+ -- Scott James Remnant <[e-mail]>  Fri, 09 Jan 2009 11:55:30 +0000
+
+ifupdown (0.6.8ubuntu14) jaunty; urgency=low
+
+  * debian/ifupdown.rules: Rename to debian/ifupdown.udev so debhelper can
+    pick it up.
+  * debian/rules: Use dh_installudev to install the udev rule.
+  * debian/dirs: Drop /etc/udev/rules.d
+  * debian/conffiles: Drop old rules location.
+  * debian/control: Increase dependency on debhelper.
+
+ -- Scott James Remnant <[e-mail]>  Wed, 07 Jan 2009 10:22:03 +0000
+
+ifupdown (0.6.8ubuntu13) jaunty; urgency=low
+
+  * debian/ifupdown.rules: remove udev rule that ensures that the networking
+    init script has been started. We want to configure network interfaces as
+    soon as possible ie at discovery time. ifupdown scripts that don't work
+    early in the boot process should fail gracefully and leave the interface
+    unconfigured until networking is started.
+
+ -- Mathias Gug <[e-mail]>  Wed, 26 Nov 2008 18:34:03 -0500
+
+ifupdown (0.6.8ubuntu12) intrepid; urgency=low
+
+  * resurrect _darcs directory
+
+ -- Alexander Sack <[e-mail]>  Mon, 13 Oct 2008 00:12:03 +0200
+
+ifupdown (0.6.8ubuntu11) intrepid; urgency=low
+
+  * If the /etc/NetworkManager/nm-system-settings.conf file is present
+    but doesn't have the "ifupdown:managed" the previous upload instructed
+    the iniparser to return -1, which evaluates to TRUE. We instead instruct
+    it to return 0, as we shouldn't prevent ifupdown from managing the
+    interfaces in that case, as NM won't either. (LP: #281984)
+
+ -- James Westby <[e-mail]>  Sun, 12 Oct 2008 16:09:15 +0100
+
+ifupdown (0.6.8ubuntu10) intrepid; urgency=low
+
+  https://lists.ubuntu.com/archives/ubuntu-devel/2008-October/026656.html:
+
+  * stop ifupdown to auto-up/down interfaces if network-manager's
+    ifupdown plugin is in managed=true mode
+    - add iniparser3.0b sources
+      + add dictionary.c,dictionary.h,iniparser.c,iniparser.h
+    - Makefile: add iniparser objects to build (aka OBJ)
+
+ -- Alexander Sack <[e-mail]>  Thu, 09 Oct 2008 16:46:47 +0200
+
+ifupdown (0.6.8ubuntu9) intrepid; urgency=low
+
+  * debian/ifupdown.rules: (the udev rule) ensure that the init script
+    /etc/network/networking has been started to ensure that the udev
+    script does not start too early in the boot process. This way we
+    ensure that the root file system is already writable and ifupdown has
+    a chance to actually work. LP: #44194
+  * Add versioned dependency on a version of netbase that actually does
+    indicate that it has been configured.
+
+ -- Reinhard Tartler <[e-mail]>  Sat, 21 Jun 2008 23:32:56 +0200
+
+ifupdown (0.6.8ubuntu8) gutsy; urgency=low
+
+  * ifupdown.nw: use 100 as default route metric unless an explicit metric
+    parameter is set in /etc/network/interface; this applies for static and
+    dhcp interfaces and passes the -e IF_METRIC=%metric% option to dhclient{3}
+    in order to accomplish this. For details see the launchpad bug
+    (LP: #139403).
+
+ -- Alexander Sack <[e-mail]>  Thu, 20 Sep 2007 00:38:33 +0200
+
+ifupdown (0.6.8ubuntu7) gutsy; urgency=low
+
+  * Fix a wrong example location into interfaces(5) manpage (LP: #97509).
+
+ -- William Lima <[e-mail]>  Fri, 22 Jun 2007 15:14:23 -0300
+
+ifupdown (0.6.8ubuntu6) feisty; urgency=low
+
+  * Change DRIVERS!= to use the start/end trick, since DRIVERS!= doesn't
+    work.  LP: #102675.
+
+ -- Scott James Remnant <[e-mail]>  Tue, 10 Apr 2007 12:44:13 +0100
+
+ifupdown (0.6.8ubuntu5) feisty; urgency=low
+
+  * Change DRIVER to DRIVERS to suppress a warning, even though I think we
+    really wanted the former.  LP: #102770.
+
+ -- Scott James Remnant <[e-mail]>  Wed,  4 Apr 2007 10:27:14 +0100
+
+ifupdown (0.6.8ubuntu4) feisty; urgency=low
+
+  * Update udev rules so that devices without a driver don't get ifup
+    or ifdown called for them, and are left to the S40networking script.
+    LP: #78043.
+
+ -- Scott James Remnant <[e-mail]>  Tue,  3 Apr 2007 16:11:28 +0100
+
+ifupdown (0.6.8ubuntu3) feisty; urgency=low
+
+  * ifupdown.nw: modprobe ipv6 before configuring it.
+  (Closes LP: #7091)
+
+ -- Fabio M. Di Nitto <[e-mail]>  Fri, 30 Mar 2007 08:54:50 +0200
+
+ifupdown (0.6.8ubuntu2) feisty; urgency=low
+
+  * ifupdown.nw: Add 'ipv4ll' method which uses avahi-autoipd to bring up an
+    interface with an IPv4 link-layer address from 169.254.0.0/16 (aka
+    'Zeroconf'). See https://wiki.ubuntu.com/ZeroConfNetworking for details.
+    (This patch was prepared last November, but for some reason never made it
+    to the archive)
+  * debian/control: Set Ubuntu maintainer.
+
+ -- Martin Pitt <[e-mail]>  Tue, 20 Feb 2007 11:25:38 +0100
+
+ifupdown (0.6.8ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - ship udev rules to call ifup
+    - init script to bring up loopback seperately
+    - ifstate file moved to /var/run/network/ifstate, no need to clean up
+    - dhcp3 leases files moved to /var/lib/dhcp3
+
+ -- Scott James Remnant <[e-mail]>  Mon, 27 Nov 2006 13:16:58 +0000
+
 ifupdown (0.6.8) unstable; urgency=low
 
   * Add myself as co-maintainer with approval from Anthony Towns.
@@ -1244,6 +2649,81 @@ ifupdown (0.6.8) unstable; urgency=low
 
  -- Petter Reinholdtsen <[e-mail]>  Thu, 28 Sep 2006 18:14:47 +0200
 
+ifupdown (0.6.7ubuntu7) dapper; urgency=low
+
+  * Fix up the interfaces file removing duplicated "auto" lines, and
+    don't write them in the first place.  Ubuntu #29654.
+
+ -- Scott James Remnant <[e-mail]>  Mon, 30 Jan 2006 12:45:19 +0000
+
+ifupdown (0.6.7ubuntu6) dapper; urgency=low
+
+  * Rewrite the way that ifup and ifdown read and write the state file.
+    Instead of storing it in memory and holding a lock on it (preventing
+    concurrent processes from actually being concurrent) use atomic read and
+    write functions that only hold the lock for very short periods.
+
+  * Write to the state file when we start bringing up or tearing down the
+    interface, so we don't ever try to do the same operation at the same
+    time.
+  * Update the state file once the operation is complete to ensure we
+    record the actual status of it.
+
+  * Restore the dhcp wait, so "ifup eth0" will hang around until DHCP is
+    either successful or times out.  Adjust the udev rule again so that
+    udevplug doesn't hang around.
+
+ -- Scott James Remnant <[e-mail]>  Thu, 26 Jan 2006 15:56:54 +0000
+
+ifupdown (0.6.7ubuntu5) dapper; urgency=low
+
+  * Don't wait for dhcp to complete ... there's a general ifup problem that
+    it doesn't have any state to record "I'm bringing this interface up",
+    so no way to avoid multiple dhcp invocations for the same interface which
+    end up blocking on each other.  This is a short-term hack until I sit
+    down and think about this properly (probably next week at the sprint).
+
+ -- Scott James Remnant <[e-mail]>  Tue, 24 Jan 2006 18:04:53 +0000
+
+ifupdown (0.6.7ubuntu4) dapper; urgency=low
+
+  * Install new loopback init script at S:S08 which brings up the loopback
+    (127.0.0.1) network device early enough for anything needing DHCP.  This
+    also deals with creating /var/run/network if necessary.
+  * Move /etc/network/run/ifstate to /var/run/network/ifstate
+  * Drop the ifupdown and ifupdown-clean init scripts as everything they did
+    is obsolete or already taken care of.
+
+  * Ship a udev rule that brings network devices up or down if the device
+    is marked "auto" in the configuration file.
+  * Convert existing /etc/network/interfaces file with "mapping hotplug"
+    lines to just use "auto" lines.
+
+  * Adjusted "ifup -a" and "ifdown -a" to not report when interfaces are
+    already up or down.
+
+ -- Scott James Remnant <[e-mail]>  Mon, 23 Jan 2006 18:56:54 +0000
+
+ifupdown (0.6.7ubuntu3) dapper; urgency=low
+
+  * Silence init.d/ifupdown-clean
+
+ -- Matt Zimmerman <[e-mail]>  Wed,  4 Jan 2006 09:46:09 -0800
+
+ifupdown (0.6.7ubuntu2) dapper; urgency=low
+
+  * Change the dhclient3 leases path to /var/lib/dhcp3 so the leases survive
+    a reboot.  (Ubuntu: #18148)
+
+ -- Scott James Remnant <[e-mail]>  Wed, 23 Nov 2005 16:11:30 +0000
+
+ifupdown (0.6.7ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian, resolving merge conflicts.
+  * Remove the initscripts dependency, since we now use our own readlink.
+
+ -- Adam Conrad <[e-mail]>  Fri, 27 May 2005 06:43:06 +0000
+
 ifupdown (0.6.7-0.4) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -1401,6 +2881,32 @@ ifupdown (0.6.4-4.11) unstable; urgency=low
 
  -- Thomas Hood <[e-mail]>  Sun, 12 Sep 2004 14:46:29 +0200
 
+ifupdown (0.6.4-4.10ubuntu4) breezy; urgency=low
+
+  * Fixed typo in interfaces (5) man page (closes: Ubuntu #9854)
+
+ -- Charles Majola <[e-mail]>  Thu, 12 May 2005 10:12:36 +0200
+
+ifupdown (0.6.4-4.10ubuntu3) hoary; urgency=low
+
+  * Add a dependency on initscripts (>= 2.85-12) to make sure we get
+    a working /lib/init/readlink for our scripts (Ubuntu bug #8605)
+
+ -- Adam Conrad <[e-mail]>  Tue,  5 Apr 2005 10:29:07 +0000
+
+ifupdown (0.6.4-4.10ubuntu2) hoary; urgency=low
+
+  * Fancify new ifupdown-clean init script
+  * Re-fancify ifupdown init script due to many conflicts
+
+ -- Matt Zimmerman <[e-mail]>  Thu, 28 Oct 2004 21:00:28 -0700
+
+ifupdown (0.6.4-4.10ubuntu1) hoary; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Scott James Remnant <[e-mail]>  Wed, 27 Oct 2004 21:41:56 +0100
+
 ifupdown (0.6.4-4.10) unstable; urgency=low
 
   * Non-maintainer upload. Fix critical bugs.
@@ -1471,6 +2977,17 @@ ifupdown (0.6.4-4.9) unstable; urgency=low
 
  -- Javier Fernandez-Sanguino Pen~a <[e-mail]>  Wed, 28 Jul 2004 17:04:19 +0200
 
+ifupdown (0.6.4-4.8ubuntu2) warty; urgency=low
+
+  * Added versioned depend on lsb-base
+
+ -- Nathaniel McCallum <[e-mail]>  Fri,  3 Sep 2004 14:55:12 -0400
+
+ifupdown (0.6.4-4.8ubuntu1) warty; urgency=low
+
+  * debian/ifupdown.init: pretty initscript
+
+ -- Nathaniel McCallum <[e-mail]>  Fri,  3 Sep 2004 11:00:40 -0400
 
 ifupdown (0.6.4-4.8) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 710721d..d674cd3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ifupdown
 Section: admin
 Priority: important
-Maintainer: Josué Ortega <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Josué Ortega <[e-mail]>
 Uploaders: Santiago Ruano Rincón <[e-mail]>
 Standards-Version: 4.6.1
 Build-Depends: debhelper-compat (= 13)
diff --git a/debian/if-up.d/resolved b/debian/if-up.d/resolved
index cb331ca..e79f997 100755
--- a/debian/if-up.d/resolved
+++ b/debian/if-up.d/resolved
@@ -43,11 +43,11 @@ if systemctl is-enabled systemd-resolved > /dev/null 2>&1; then
     fi
     if  [ -n "$NEW_DNS" ]; then
         cat <<EOF >"$mystatedir/ifupdown-${ADDRFAM}-$interface"
-"$DNS"="$NEW_DNS"
+$DNS="$NEW_DNS"
 EOF
         if  [ -n "$NEW_DOMAINS" ]; then
             cat <<EOF >>"$mystatedir/ifupdown-${ADDRFAM}-$interface"
-"$DOMAINS"="$NEW_DOMAINS"
+$DOMAINS="$NEW_DOMAINS"
 EOF
         fi
     fi
@@ -66,7 +66,7 @@ EOF
     # ignore errors due to nonexistent file
     md5sum "$mystatedir/isc-dhcp-v4-$interface" "$mystatedir/isc-dhcp-v6-$interface" "$mystatedir/ifupdown-inet-$interface" "$mystatedir/ifupdown-inet6-$interface" > "$newstate" 2> /dev/null || true
     if ! cmp --silent "$oldstate" "$newstate" 2>/dev/null; then
-        DNS DNS6 DOMAINS DOMAINS6 DEFAULT_ROUTE
+        unset DNS DNS6 DOMAINS DOMAINS6 DEFAULT_ROUTE
         # v4 first
         if [ -e "$mystatedir/isc-dhcp-v4-$interface" ]; then
             . "$mystatedir/isc-dhcp-v4-$interface"
diff --git a/debian/ifup@.service b/debian/ifup@.service
index b65ec7b..40b4722 100644
--- a/debian/ifup@.service
+++ b/debian/ifup@.service
@@ -11,7 +11,8 @@ IgnoreOnIsolate=yes
 [Service]
 # avoid stopping on shutdown via stopping system-ifup.slice
 Slice=system.slice
-ExecStart=/bin/sh -ec 'ifup --allow=hotplug %I; ifquery --state %I'
+ExecStart=/bin/sh -ec 'ifup --allow=hotplug %I; ifup --allow=auto %I; \
+    if ifquery %I >/dev/null; then ifquery --state %I >/dev/null; fi'
 ExecStop=/sbin/ifdown %I
 RemainAfterExit=true
 TimeoutStartSec=5min
diff --git a/debian/ifupdown-hotplug b/debian/ifupdown-hotplug
index 6e5f6c5..b56f7aa 100755
--- a/debian/ifupdown-hotplug
+++ b/debian/ifupdown-hotplug
@@ -59,6 +59,9 @@ net_ifup() {
     # exit if the interface is not configured as allow-hotplug
     TARGET_IFACE=$(ifquery --allow hotplug -l "$INTERFACE" || true)
     if [ -z "$TARGET_IFACE" ]; then
+        TARGET_IFACE=$(/sbin/ifquery --allow auto -l "$INTERFACE" || true)
+    fi
+    if [ -z "$TARGET_IFACE" ]; then
         exit 0
     fi
 
diff --git a/debian/rules b/debian/rules
index ee44acf..11acc19 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,11 @@ override_dh_installsystemd:
 	dh_installsystemd --no-start -r --no-restart-after-upgrade --name=ifupdown-pre
 	dh_installsystemd --no-enable -r --no-start --no-restart-after-upgrade --name=ifupdown-wait-online
 
+override_dh_install:
+	dh_install
+	# just in case executable bit is lost in a merge
+	[ -x debian/ifupdown/lib/udev/ifupdown-hotplug ]
+
 override_dh_auto_clean:
 	$(MAKE) clean
 
diff --git a/inet.defn b/inet.defn
index c29f8b7..ab1ccf3 100644
--- a/inet.defn
+++ b/inet.defn
@@ -97,7 +97,7 @@ method dhcp
 
   up
     [[ip link set dev %iface% address %hwaddress%]]
-    CLIENT="-i"; [[[ "%client%" = no ] && CLIENT="";]] dhclient -4 -v $CLIENT -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
+    CLIENT="-i"; [[[ "%client%" = no ] && CLIENT="";]] dhclient -1 -4 -v $CLIENT -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
 	[[-e IF_METRIC=%metric%]] \
         if (execable("dhclient"))
     udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x hostname:%hostname%]] \
@@ -279,7 +279,7 @@ method dhcp
 
   up
     [[ifconfig %iface% link %hwaddress%]]
-    CLIENT="-i"; [[[ "%client%" = no ] && CLIENT="";]] dhclient -4 -v $CLIENT -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
+    CLIENT="-i"; [[[ "%client%" = no ] && CLIENT="";]] dhclient -1 -4 -v $CLIENT -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
 	[[-e IF_METRIC=%metric%]] \
         if (execable("dhclient"))
     udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \
@@ -431,7 +431,7 @@ method dhcp
 
   up
     [[Warning: Option hwaddress: %hwaddress% not yet supported]]
-    CLIENT="-i"; [[[ "%client%" = no ] && CLIENT="";]] dhclient -4 -v $CLIENT -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
+    CLIENT="-i"; [[[ "%client%" = no ] && CLIENT="";]] dhclient -1 -4 -v $CLIENT -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
         if (execable("dhclient"))
     udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H %hostname%]] \
            [[-c %client%]] \
diff --git a/inet6.defn b/inet6.defn
index d62123b..dad4a13 100644
--- a/inet6.defn
+++ b/inet6.defn
@@ -29,7 +29,7 @@ method auto
         if (var_set("accept_ra", ifd) && !var_true("accept_ra", ifd))
     ip link set dev %iface% up
     /lib/ifupdown/wait-for-ll6.sh if (var_true("dhcp", ifd) && execable("/lib/ifupdown/wait-for-ll6.sh"))
-    dhclient -6 -v -P -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+    dhclient -6 -1 -v -P -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         if (var_true("dhcp", ifd) && execable("dhclient") && var_true("request_prefix", ifd))
     dhclient -6 -1 -v -S -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         elsif (var_true("dhcp", ifd) && execable("dhclient"))
@@ -158,9 +158,9 @@ method dhcp
         if (var_set("accept_ra", ifd) && !var_true("accept_ra", ifd))
     ip link set dev %iface% [[address %hwaddress%]] up
     /lib/ifupdown/wait-for-ll6.sh if (execable("/lib/ifupdown/wait-for-ll6.sh"))
-    dhclient -6 -v -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -P -N -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+    dhclient -1 -6 -v -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -P -N -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         if (execable("dhclient") && var_true("request_prefix", ifd))
-    dhclient -6 -v -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+    dhclient -1 -6 -v -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         elsif (execable("dhclient"))
     echo 'No DHCPv6 client software found!' >&2; false \
         elsif (1)
@@ -338,7 +338,7 @@ method auto
 
   up
     ifconfig %iface% inet6 accept_rtadv up
-    dhclient -6 -S -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+    dhclient -1 -6 -S -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         if (var_true("dhcp", ifd) && execable("dhclient"))
     echo 'No DHCPv6 client software found!' >&2; false \
         elsif (var_true("dhcp", ifd))
@@ -362,7 +362,7 @@ method dhcp
 
   up
     ifconfig %iface% [[link %hwaddress%]] up
-    dhclient -6 -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+    dhclient -1 -6 -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         if (execable("dhclient"))
     echo 'No DHCPv6 client software found!' >&2; false \
         elsif (1)
@@ -434,7 +434,7 @@ method dhcp
   up
     [[Warning: Option hwaddress: %hwaddress% not yet supported]]
     inetutils-ifconfig --interface %iface% --up
-    dhclient -6 -pf /run/dhclient6.%iface///.%.pid -lf /var/lib/dhcp/dhclient6.%iface///.%.leases -I -df /var/lib/dhcp/dhclient.%iface///.%.leases %iface% \
+    dhclient -1 -6 -pf /run/dhclient6.%iface///.%.pid -lf /var/lib/dhcp/dhclient6.%iface///.%.leases -I -df /var/lib/dhcp/dhclient.%iface///.%.leases %iface% \
         if (execable("dhclient"))
     echo 'No DHCPv6 client software found!' >&2; false \
         elsif (1)
diff --git a/interfaces.5.pre b/interfaces.5.pre
index d1905ee..7c3bdf4 100644
--- a/interfaces.5.pre
+++ b/interfaces.5.pre
@@ -451,6 +451,11 @@ The class of interfaces being processed.
 This is a copy of the value given to the \fB-\-allow\fP option when running ifup or ifdown,
 otherwise it is set to "auto" when the \fB-\-all\fP option is used.
 .TP
+.B CLASS
+The class of interfaces being processed.
+This is a copy of the value given to the \fB-\-allow\fP option when running ifup or ifdown,
+otherwise it is set to "auto" when the \fB-\-all\fP option is used.
+.TP
 .B MODE
 .IR start " if run from ifup, " stop " if run from ifdown".
 .TP