diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:52:15 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 11:24:27 +0100 |
| commit | e8ac7dacdcf4b38addef4f8ac6ab038f9d29582c (patch) | |
| tree | 017883e210043859ee695250f6285380b795f8e4 /debian/patches/Disable-general-with-expect.patch | |
| parent | b05c072fe2594e0369cbfb00a3fba176d2d309dc (diff) | |
| parent | 1b878e595ff7be634a4800ca6cc506046e49548e (diff) | |
Merge remote-tracking branch 'salsa/master' into disco
Diffstat (limited to 'debian/patches/Disable-general-with-expect.patch')
| -rw-r--r-- | debian/patches/Disable-general-with-expect.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/Disable-general-with-expect.patch b/debian/patches/Disable-general-with-expect.patch index c053fe1e..1440af27 100644 --- a/debian/patches/Disable-general-with-expect.patch +++ b/debian/patches/Disable-general-with-expect.patch @@ -7,11 +7,11 @@ which tends to fail on ppc64el and arm64 Makefile.am | 1 - 1 file changed, 1 deletion(-) -Index: network-manager-1.12.2/Makefile.am +Index: network-manager-1.14.4/Makefile.am =================================================================== ---- network-manager-1.12.2.orig/Makefile.am -+++ network-manager-1.12.2/Makefile.am -@@ -3180,7 +3180,6 @@ src_tests_ldadd = \ +--- network-manager-1.14.4.orig/Makefile.am ++++ network-manager-1.14.4/Makefile.am +@@ -3404,7 +3404,6 @@ src_tests_ldadd = \ check_programs += \ src/tests/test-general \ |