diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2018-08-24 11:00:09 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2018-08-24 11:06:47 +0200 |
| commit | b7db94545968c37886b7111d8c85f62eb063fbb4 (patch) | |
| tree | 7c2aedd497b1fdcb26bf9d49f98cc63a530baf2e /debian/patches/git-newglib-test.patch | |
| parent | 9d5cdc3adde9e7e57bf5a0e754e563b6a9e8e513 (diff) | |
| parent | caf1db9d6fbc056cc6c76a24574890f6c7895f3d (diff) | |
Import Debian changes 1.12.2-0ubuntu3
network-manager (1.12.2-0ubuntu3) cosmic; urgency=medium
* debian/rules:
- use --with-libnm-glib, the default reversed since that's a legacy
library but we still need it for unity-control-center
network-manager (1.12.2-0ubuntu2) cosmic; urgency=medium
* debian/patches/git-newglib-test.patch:
- backport upstream commit to fix the tests with the new glib
network-manager (1.12.2-0ubuntu1) cosmic; urgency=medium
* New upstream version
* d/p/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch,
d/p/e91f1a7d2a6b8400b6b331d5b72287dcb5164a39.patch,
d/p/git_thunderbolt_connect.patch:
- removed, those changes are in the new version
* Backport Debian changes
* Update symbols file for libnm0
* Enable iwd support
* Drop version requirements when oldstable ships a newer version
* Drop dh_strip override, the dbgsym migration is done
* Rebase patches
* Make sure the example server.conf is actually installed
* Update install path for plugins, it now includes a version number
* Drop libnl3 build dependency.
Upstream has copied the code directly from libnl3 for the few functions it
needs with a few small modifications.
* Drop libiw build dependency.
Hasn't been needed for a long time and was simply a left over from older
releases.
* Bump Standards-Version to 4.1.5
* Fix compile error due to NM_AVAILABLE_IN_1_12_2 macro (Closes: #905372)
Diffstat (limited to 'debian/patches/git-newglib-test.patch')
| -rw-r--r-- | debian/patches/git-newglib-test.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/debian/patches/git-newglib-test.patch b/debian/patches/git-newglib-test.patch new file mode 100644 index 00000000..eec6aafb --- /dev/null +++ b/debian/patches/git-newglib-test.patch @@ -0,0 +1,24 @@ +From 3e8eef538987c909e87b871a6b8c74aee08661a3 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel <lkundrak@v3.sk> +Date: Sat, 11 Aug 2018 11:08:42 +0200 +Subject: [PATCH] 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. +--- + shared/nm-utils/nm-test-utils.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h +index 246357f8a..b575382e4 100644 +--- a/shared/nm-utils/nm-test-utils.h ++++ b/shared/nm-utils/nm-test-utils.h +@@ -574,7 +574,7 @@ __nmtst_init (int *argc, char ***argv, g + } 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_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)) && |