diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 27 | ||||
| -rw-r--r-- | debian/network-manager.README.Debian | 2 | ||||
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 10 |
3 files changed, 23 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog index e67d19be..69b83c89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,4 @@ -network-manager (1.25.91-1ubuntu2) groovy; urgency=medium - - * debian/tests: - - don't use the old service name in the test, the compatibility alias - has been removed - - -- Sebastien Bacher <seb128@ubuntu.com> Tue, 07 Jul 2020 11:06:20 +0200 - -network-manager (1.25.91-1ubuntu1) groovy; urgency=medium +network-manager (1.26.0-1ubuntu1) UNRELEASED; urgency=medium * Resynchronize on Debian, remaining changes: - Use systemd-resolved instead of dnsmasq @@ -44,7 +36,22 @@ network-manager (1.25.91-1ubuntu1) groovy; urgency=medium + Read-system-connections-from-run.patch - debian/tests/urfkill-integration - don't stop/start network manager - -- Sebastien Bacher <seb128@ubuntu.com> Thu, 02 Jul 2020 10:31:37 +0200 + -- Sebastien Bacher <seb128@ubuntu.com> Mon, 27 Jul 2020 17:09:03 +0200 + +network-manager (1.26.0-1) unstable; urgency=medium + + * New upstream version 1.26.0 + * Rebase patches + + -- Michael Biebl <biebl@debian.org> Mon, 13 Jul 2020 22:34:27 +0200 + +network-manager (1.25.91-2) unstable; urgency=medium + + [ Sebastien Bacher ] + * Use the correct service name in README.Debian, the compat one has been + removed + + -- Michael Biebl <biebl@debian.org> Tue, 07 Jul 2020 21:28:37 +0200 network-manager (1.25.91-1) unstable; urgency=medium diff --git a/debian/network-manager.README.Debian b/debian/network-manager.README.Debian index cade0bd2..66716ede 100644 --- a/debian/network-manager.README.Debian +++ b/debian/network-manager.README.Debian @@ -48,5 +48,5 @@ ignore those devices and mark them as "unmanaged". If you want to have a network interface managed by NetworkManager it is thus recommended to manually remove any configuration for that interface from /etc/network/interfaces. You need to restart NetworkManager afterwards via -"service network-manager restart". +"service NetworkManager restart". diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 344f9152..1cbf104e 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 ae78b7c..81bbbe8 100644 +index 9211253..32a6412 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -52,6 +52,8 @@ @@ -73,7 +73,7 @@ index ae78b7c..81bbbe8 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6548,6 +6578,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -6547,6 +6577,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index ae78b7c..81bbbe8 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6731,6 +6817,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6730,6 +6816,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 ae78b7c..81bbbe8 100644 return TRUE; } -@@ -7585,6 +7674,22 @@ nm_manager_init (NMManager *self) +@@ -7584,6 +7673,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index ae78b7c..81bbbe8 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7864,6 +7969,16 @@ dispose (GObject *object) +@@ -7863,6 +7968,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } |