Rebase patches

4 files changed, 14 insertions, 14 deletions

diff --git a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
index 70f702d1..85d59320 100644
--- a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
+++ b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
@@ -10,10 +10,10 @@ to be autostarted by a client request.
  2 files changed, 6 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index b575616..6728fbd 100644
+index 79b0462..aa8971e 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -3794,11 +3794,6 @@ endif
+@@ -3877,11 +3877,6 @@ endif
  data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in
  	$(AM_V_GEN) $(data_edit) $< >$@
  
diff --git a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
index eb6fbd17..e2516d62 100644
--- a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
+++ b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
@@ -16,7 +16,7 @@ Closes: #742933
  1 file changed, 5 insertions(+)
 
 diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c
-index 7a37387..867e0d8 100644
+index a7e3a7c..9931f12 100644
 --- a/src/nm-sleep-monitor.c
 +++ b/src/nm-sleep-monitor.c
 @@ -25,6 +25,7 @@
@@ -27,7 +27,7 @@ index 7a37387..867e0d8 100644
  
  #include "nm-core-internal.h"
  #include "NetworkManagerUtils.h"
-@@ -345,6 +346,10 @@ on_proxy_acquired (GObject *object,
+@@ -344,6 +345,10 @@ on_proxy_acquired (GObject *object,
  static void
  nm_sleep_monitor_init (NMSleepMonitor *self)
  {
diff --git a/debian/patches/Fix-iscsiadm-path.patch b/debian/patches/Fix-iscsiadm-path.patch
index c6ca5f72..7af98133 100644
--- a/debian/patches/Fix-iscsiadm-path.patch
+++ b/debian/patches/Fix-iscsiadm-path.patch
@@ -12,7 +12,7 @@ binary as /sbin/iscsiadm (and /usr/bin/iscsiadm is a compat symlink).
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/settings/plugins/ibft/nms-ibft-plugin.c b/src/settings/plugins/ibft/nms-ibft-plugin.c
-index ea4d152..09a4579 100644
+index 77ce208..f84276d 100644
 --- a/src/settings/plugins/ibft/nms-ibft-plugin.c
 +++ b/src/settings/plugins/ibft/nms-ibft-plugin.c
 @@ -74,7 +74,7 @@ read_connections (NMSIbftPlugin *self)
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index b9aced11..743aa63c 100644
--- a/debian/patches/Force-online-state-with-unmanaged-devices.patch
+++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch
@@ -12,10 +12,10 @@ 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 1ccfad8..1e99a4e 100644
+index 9f0891a..6b299d2 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
-@@ -60,6 +60,8 @@
+@@ -62,6 +62,8 @@
  #include "nm-dispatcher.h"
  #include "NetworkManagerUtils.h"
  
@@ -24,7 +24,7 @@ index 1ccfad8..1e99a4e 100644
  /*****************************************************************************/
  
  typedef struct {
-@@ -164,6 +166,10 @@ typedef struct {
+@@ -192,6 +194,10 @@ typedef struct {
  	GFileMonitor *fw_monitor;
  	guint fw_changed_id;
  
@@ -35,7 +35,7 @@ index 1ccfad8..1e99a4e 100644
  	guint timestamp_update_id;
  
  	guint devices_inited_id;
-@@ -1206,6 +1212,27 @@ find_best_device_state (NMManager *manager)
+@@ -1385,6 +1391,27 @@ find_best_device_state (NMManager *manager)
  	return best_state;
  }
  
@@ -63,7 +63,7 @@ index 1ccfad8..1e99a4e 100644
  static void
  nm_manager_update_metered (NMManager *self)
  {
-@@ -1244,6 +1271,9 @@ nm_manager_update_state (NMManager *self)
+@@ -1423,6 +1450,9 @@ nm_manager_update_state (NMManager *self)
  	else
  		new_state = find_best_device_state (self);
  
@@ -73,7 +73,7 @@ index 1ccfad8..1e99a4e 100644
  	if (   new_state >= NM_STATE_CONNECTED_LOCAL
  	    && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
  		new_state = NM_STATE_CONNECTED_GLOBAL;
-@@ -5640,6 +5670,62 @@ impl_manager_check_connectivity (NMDBusObject *obj,
+@@ -5875,6 +5905,62 @@ impl_manager_check_connectivity (NMDBusObject *obj,
  	nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE);
  }
  
@@ -136,7 +136,7 @@ index 1ccfad8..1e99a4e 100644
  static void
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
-@@ -5790,6 +5876,9 @@ nm_manager_start (NMManager *self, GError **error)
+@@ -6025,6 +6111,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 1ccfad8..1e99a4e 100644
  	return TRUE;
  }
  
-@@ -6637,6 +6726,22 @@ nm_manager_init (NMManager *self)
+@@ -6888,6 +6977,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -169,7 +169,7 @@ index 1ccfad8..1e99a4e 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -6910,6 +7015,16 @@ dispose (GObject *object)
+@@ -7163,6 +7268,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}