diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-08-31 11:11:14 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-08-31 11:11:14 +0200 |
| commit | bbb262bfd5200313834db8fb36b7fb20aa0913b5 (patch) | |
| tree | 70fad3f1f44bb7299dd1f5f376a6b8483a023136 /debian | |
| parent | 6e17a2e7ad9453c0afe34dab0e6768ad8ee447c2 (diff) | |
| parent | 9d722f3d3492e31c0b3e4bcba603ffd65309c621 (diff) | |
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 10 |
2 files changed, 18 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 0ba48227..fb66c9fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +network-manager (1.26.2-1ubuntu1) UNRELEASED; urgency=medium + + * Update to the current stable version + + -- Sebastien Bacher <seb128@ubuntu.com> Mon, 31 Aug 2020 11:09:40 +0200 + +network-manager (1.26.2-1) unstable; urgency=medium + + * New upstream version 1.26.2 + * Rebase patches + + -- Michael Biebl <biebl@debian.org> Wed, 19 Aug 2020 10:30:53 +0200 + network-manager (1.26.0-1ubuntu1) groovy; urgency=medium * Resynchronize on Debian, remaining changes: diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 1cbf104e..8c031b1c 100644 --- a/debian/patches/Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch @@ -12,7 +12,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286 1 file changed, 115 insertions(+) diff --git a/src/nm-manager.c b/src/nm-manager.c -index 9211253..32a6412 100644 +index 778e3b9..d0cc527 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -52,6 +52,8 @@ @@ -73,7 +73,7 @@ index 9211253..32a6412 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6547,6 +6577,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -6566,6 +6596,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index 9211253..32a6412 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6730,6 +6816,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6749,6 +6835,9 @@ nm_manager_start (NMManager *self, GError **error) nm_clear_g_source (&priv->devices_inited_id); priv->devices_inited_id = g_idle_add_full (G_PRIORITY_LOW + 10, devices_inited_cb, self, NULL); @@ -146,7 +146,7 @@ index 9211253..32a6412 100644 return TRUE; } -@@ -7584,6 +7673,22 @@ nm_manager_init (NMManager *self) +@@ -7603,6 +7692,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index 9211253..32a6412 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7863,6 +7968,16 @@ dispose (GObject *object) +@@ -7882,6 +7987,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } |