diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rw-r--r-- | debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch | 29 |
3 files changed, 39 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index d2b54cbb..98b0ab47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (1.12.2-0ubuntu4) cosmic; urgency=medium + + Cherry-pick fixes from debian: + * Fix compile error due to NM_AVAILABLE_IN_1_12_2 macro in n-m-applet + * Apply patch from upstream to fix FTBFS with GLib 2.57 + + -- Didier Roche <didrocks@ubuntu.com> Mon, 10 Sep 2018 11:36:35 +0200 + network-manager (1.12.2-0ubuntu3) cosmic; urgency=medium * debian/rules: diff --git a/debian/patches/series b/debian/patches/series index cc2d17a2..7639a789 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,5 @@ libnm-Check-self-still-NMManager-or-not.patch #dns-manager-don-t-merge-split-DNS-search-domains.patch Read-system-connections-from-run.patch git-newglib-test.patch +version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch +utils-test-don-t-assert-on-debug-level-messages.patch diff --git a/debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch b/debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch new file mode 100644 index 00000000..a9374f7b --- /dev/null +++ b/debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch @@ -0,0 +1,29 @@ +From: Lubomir Rintel <lkundrak@v3.sk> +Date: Sat, 11 Aug 2018 11:08:42 +0200 +Subject: utils/test: don't assert on debug level messages + +They come and go in GLib core for all sorts of purposes. Don't let that +break our tests. + +(cherry picked from commit 3e8eef538987c909e87b871a6b8c74aee08661a3) +Origin: upstream, 1.12.4, commit:5810c46b118447567e52199ca139c7a5e9be6ab4 +--- + shared/nm-utils/nm-test-utils.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +Index: network-manager-1.12.2/shared/nm-utils/nm-test-utils.h +=================================================================== +--- network-manager-1.12.2.orig/shared/nm-utils/nm-test-utils.h ++++ network-manager-1.12.2/shared/nm-utils/nm-test-utils.h +@@ -573,8 +573,9 @@ __nmtst_init (int *argc, char ***argv, g + #endif + } else { + /* We were called not to set logging levels. This means, that the user +- * expects to assert against (all) messages. Any uncought message is fatal. */ +- g_log_set_always_fatal (G_LOG_LEVEL_MASK & ~G_LOG_LEVEL_DEBUG); ++ * expects to assert against (all) messages. ++ * Any uncaught message on >debug level is fatal. */ ++ g_log_set_always_fatal (G_LOG_LEVEL_MASK & ~G_LOG_LEVEL_DEBUG); + } + + if ((!__nmtst_internal.assert_logging || (__nmtst_internal.assert_logging && __nmtst_internal.no_expect_message)) && |