Merge ~raharper/ubuntu/+source/networkd-dispatcher:update-debian-dir-github-gitlab into ubuntu/+source/networkd-dispatcher:ubuntu/devel

[Ryan Harper]

Update project homepage/source move from github -> gitlab

Upstream has changed where the project is being hosted.

[Thomas Ward (teward)]

Rejection by Sponsors - Obsolete Merge Request.

review: Disapprove (rejection - sponsorship queue)

Unmerged commits

e865010... by Ryan Harper on 2018-06-18

Update project homepage/source move from github -> gitlab

Upstream has changed where the project is being hosted.

b172bb9... by Julian Andres Klode on 2018-05-31

Import patches-unapplied version 1.7-0ubuntu5 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: f581c8c014eda322b82e06d2049d3099260dfb05

New changelog entries:
  * Revert "Cherry-pick upstream fix to start before systemd-networkd"
    (reopens LP #1772137); the change caused an ordering cycle.

f581c8c... by Julian Andres Klode on 2018-05-25

Import patches-unapplied version 1.7-0ubuntu4 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: 5751f97453df06f1e07338b9ed6be4465c5f50e5

New changelog entries:
  * Cherry-pick upstream fix to start before systemd-networkd (LP: #1772137)

5751f97... by Julian Andres Klode on 2018-04-19

Import patches-unapplied version 1.7-0ubuntu3 to ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: 031bcbb0d57a91702c75842cb8d58e48010a3970

New changelog entries:
  * Use /usr/lib/networkd-dispatcher for scripts.
    This allows us to provide integration without conffiles. We later
    need to re-add support for /etc, and overrides.
    We need to pass --skip-private to dh-python3, otherwise it deletes
    all our directories in /usr/lib/networkd-dispatcher.

031bcbb... by Julian Andres Klode on 2018-04-18

Import patches-unapplied version 1.7-0ubuntu2 to ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: b01ee81185d7b56f9f1774b559771bbf96211133

New changelog entries:
  * Demote iw | wireless-tools to Suggests

b01ee81... by Julian Andres Klode on 2018-04-09

Import patches-unapplied version 1.7-0ubuntu1 to ubuntu/bionic-proposed

Imported using git-ubuntu import.

diff --git a/debian/control b/debian/control
index 4b4f8b8..ea3ea83 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: asciidoc,
                python3:any,
                xsltproc
 Standards-Version: 4.1.3
-Homepage: https://github.com/craftyguy/networkd-dispatcher
+Homepage: https://gitlab.com/craftyguy/networkd-dispatcher
 Vcs-Git: https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/networkd-dispatcher
 Vcs-Browser: https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/networkd-dispatcher
 
diff --git a/debian/copyright b/debian/copyright
index 98f404d..074fd10 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: networkd-dispatcher
-Source: https://github.com/craftyguy/networkd-dispatcher
+Source: https://gitlab.com/craftyguy/networkd-dispatcher
 
 Files: *
 Copyright:
diff --git a/debian/watch b/debian/watch
index 1c3f379..a95ab1b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=4
 opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%networkd-dispatcher-$1.tar.gz%" \
-   https://github.com/craftyguy/networkd-dispatcher/tags \
+   https://gitlab.com/craftyguy/networkd-dispatcher/tags \
    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian
diff --git a/networkd-dispatcher.txt b/networkd-dispatcher.txt
index 05b515e..36ee49c 100644
--- a/networkd-dispatcher.txt
+++ b/networkd-dispatcher.txt
@@ -66,7 +66,7 @@ for 'SCRIPT_DIR' is '/etc/networkd-dispatcher'.
 RESOURCES
 ---------
 
-GitHub: https://github.com/craftyguy/networkd-dispatcher
+GitHub: https://gitlab.com/craftyguy/networkd-dispatcher
 
 SEE ALSO
 --------