Merge ~rafaeldtinoco/ubuntu/+source/vlan:lp1883788-groovy into ubuntu/+source/vlan:ubuntu/devel

[Rafael David Tinoco]

BUG: https://bugs.launchpad.net/ubuntu/+source/vlan/+bug/1883788
PPA: https://launchpad.net/~rafaeldtinoco/+archive/ubuntu/lp1883788

Unmerged commits

a85f93a... by Rafael David Tinoco on 2020-06-17

update-maintainer

367f34c... by Rafael David Tinoco on 2020-06-17

reconstruct-changelog

83809e2... by Rafael David Tinoco on 2020-06-17

merge-changelogs

3e008a1... by Rafael David Tinoco on 2020-06-17

* d/network/if-pre-up.d/vlan,
  d/network/if-up.d/vlan,
  d/vlan-network-interface:
  - Fix file mode to 775 (LP: #1876781)

c84a7e1... by Rafael David Tinoco on 2020-06-17

- Add support for biosdevname
  Only small change still required
  From: Debian bts 922801
  Files changed:
  - debian/network/if-pre-up.d/vlan

e3db914... by Rafael David Tinoco on 2020-06-17

- Add a udeb for vconfig in debian-installer
  From: Ubuntu bug 530468
  Note: This should be droppable as d-i should not require
        'vconfig' because it can use 'ip' to create vlans,
        but currently it still depends on vlan-udeb
  Files changed:
  - debian/control
  - debian/vlan-udeb.install

5e46bb0... by Rafael David Tinoco on 2020-06-17

- Conditionally defer udev-triggered vlan interface creation
  to after raw-interface-device ifup is complete
  From: Ubuntu bug 1701023
  Files changed:
  - debian/vlan.udev
  - debian/network/if-up.d/vlan

de7c25b... by Willem van den Akker <email address hidden> on 2019-02-21

Import patches-unapplied version 2.0.5 to debian/sid

Imported using git-ubuntu import.

Changelog parent: aa9c02b4e4782adf4a6109ee8024402fcf5bae1a

New changelog entries:
  * debian/network/if-pre-up.d/vlan: add missing biosdevname (Closes: #922801).
    - Thanks to Dan Steetman for the patch.

diff --git a/debian/changelog b/debian/changelog
index 0b6cab3..a1b2fb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,42 @@
+<<<<<<< debian/changelog
+=======
+vlan (2.0.5ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1883788). Remaining changes:
+    - Conditionally defer udev-triggered vlan interface creation
+      to after raw-interface-device ifup is complete
+      From: Ubuntu bug 1701023
+      Files changed:
+      - debian/vlan.udev
+      - debian/network/if-up.d/vlan
+    - Add a udeb for vconfig in debian-installer
+      From: Ubuntu bug 530468
+      Note: This should be droppable as d-i should not require
+      'vconfig' because it can use 'ip' to create vlans,
+      but currently it still depends on vlan-udeb
+      Files changed:
+      - debian/control
+      - debian/vlan-udeb.install
+    - Add support for biosdevname
+      Only small change still required
+      From: Debian bts 922801
+      Files changed:
+      - debian/network/if-pre-up.d/vlan
+    - d/network/if-pre-up.d/vlan,
+      d/network/if-up.d/vlan,
+      d/vlan-network-interface:
+      - Fix file mode to 775 (LP: #1876781)
+
+ -- Rafael David Tinoco <[e-mail]>  Wed, 17 Jun 2020 12:15:28 +0000
+
+vlan (2.0.5) unstable; urgency=medium
+
+  * debian/network/if-pre-up.d/vlan: add missing biosdevname (Closes: #922801).
+    - Thanks to Dan Steetman for the patch.
+
+ -- Willem van den Akker <[e-mail]>  Thu, 21 Feb 2019 08:29:59 +0100
+
+>>>>>>> debian/changelog
 vlan (2.0.4ubuntu2) groovy; urgency=medium
 
   * d/network/if-pre-up.d/vlan,