From df49315721969c1013256ce92c6a0f825450f814 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 22 Aug 2019 22:57:12 +0200 Subject: Track stable releases in watch file --- debian/watch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/watch b/debian/watch index 7a390582..b28a2c12 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -https://download.gnome.org/sources/NetworkManager/([\d\.]+)/NetworkManager-(.*)\.tar\.xz +https://download.gnome.org/sources/NetworkManager/([\d\.]+[02468])/NetworkManager-(.*)\.tar\.xz -- cgit 1.3.0-6-gf8a5 From 161dc29c2c24804c1c9d20d35265811ff84865bb Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 6 Sep 2019 09:31:31 +0200 Subject: New upstream version 1.20.2 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 36704124..b7b353f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (1.20.2-1) UNRELEASED; urgency=medium + + * New upstream version 1.20.2 + * Track stable releases in watch file + + -- Michael Biebl Fri, 06 Sep 2019 09:31:07 +0200 + network-manager (1.20.0-1) unstable; urgency=medium * New upstream version 1.20.0 -- cgit 1.3.0-6-gf8a5 From 04855044a6d60182a6eee1f4f176eebb88042b24 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 6 Sep 2019 09:31:50 +0200 Subject: Rebase patches --- debian/patches/Force-online-state-with-unmanaged-devices.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 5ea83b6e..d5ea3a2a 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 64cdb9a..b08af29 100644 +index 78f3722..c49e94a 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -60,6 +60,8 @@ @@ -73,7 +73,7 @@ index 64cdb9a..b08af29 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6486,6 +6516,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -6485,6 +6515,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index 64cdb9a..b08af29 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6659,6 +6745,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6658,6 +6744,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 64cdb9a..b08af29 100644 return TRUE; } -@@ -7507,6 +7596,22 @@ nm_manager_init (NMManager *self) +@@ -7506,6 +7595,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index 64cdb9a..b08af29 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7789,6 +7894,16 @@ dispose (GObject *object) +@@ -7788,6 +7893,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } -- cgit 1.3.0-6-gf8a5 From 857b32ce16c33d2fb191da77e9a3f3b542714d74 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 6 Sep 2019 10:43:41 +0200 Subject: Release version 1.20.2-1 to unstable --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b7b353f6..dcf2abbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -network-manager (1.20.2-1) UNRELEASED; urgency=medium +network-manager (1.20.2-1) unstable; urgency=medium * New upstream version 1.20.2 * Track stable releases in watch file + * Rebase patches - -- Michael Biebl Fri, 06 Sep 2019 09:31:07 +0200 + -- Michael Biebl Fri, 06 Sep 2019 10:43:28 +0200 network-manager (1.20.0-1) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5