diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-02-26 16:35:05 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-02-26 16:35:05 +0100 |
| commit | bcf7d7a952227c916345cb4d57726bd190afbf13 (patch) | |
| tree | e45f08f3ee8085359953983d348caded93c995d1 | |
| parent | 447eb1ee6c50e2cac4009e66add3c1d449822589 (diff) | |
* debian/patches/Disable-core-with-expect.patch
- remove this old patch, it has no bug reference and build is working
correctly on the described architectures in Debian.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/Disable-core-with-expect.patch | 21 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 5 insertions, 22 deletions
diff --git a/debian/changelog b/debian/changelog index b82c0bcf..da764bdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ network-manager (1.22.8-1ubuntu1) UNRELEASED; urgency=medium * Update to the current stable version, merging from Debian * debian/patches/gitlab_connection_ready.patch: - removed, the change is in the new version + * debian/patches/Disable-core-with-expect.patch + - remove this old patch, it has no bug reference and build is working + correctly on the described architectures in Debian. + -- Sebastien Bacher <seb128@ubuntu.com> Wed, 26 Feb 2020 16:29:15 +0100 network-manager (1.22.8-1) unstable; urgency=medium diff --git a/debian/patches/Disable-core-with-expect.patch b/debian/patches/Disable-core-with-expect.patch deleted file mode 100644 index 6bbf4b0f..00000000 --- a/debian/patches/Disable-core-with-expect.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> -Date: Fri, 13 May 2016 11:13:20 +0800 -Subject: Disable core-with-expect - -which tends to fail on ppc64el and arm64 ---- - Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -Index: network-manager-1.22.8/Makefile.am -=================================================================== ---- network-manager-1.22.8.orig/Makefile.am -+++ network-manager-1.22.8/Makefile.am -@@ -3933,7 +3933,6 @@ src_tests_ldadd = \ - - check_programs += \ - src/tests/test-core \ -- src/tests/test-core-with-expect \ - src/tests/test-ip4-config \ - src/tests/test-ip6-config \ - src/tests/test-dcb \ diff --git a/debian/patches/series b/debian/patches/series index ab08f3ab..f8150736 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,4 +4,4 @@ Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch # Ubuntu patches Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch Update-dnsmasq-parameters.patch -Disable-core-with-expect.patch + |