Rebase patches

6 files changed, 13 insertions, 13 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 6b40857e..781eb305 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 8fa7a827..33761182 100644
+index 268c02c..1b33525 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -3309,11 +3309,6 @@ endif
+@@ -3310,11 +3310,6 @@ endif
  data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in
  	$(AM_V_GEN) $(data_edit) $< >$@
  
@@ -26,7 +26,7 @@ index 8fa7a827..33761182 100644
  	install -d $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants
  	ln -sf $(systemdsystemunitdir)/NetworkManager-wait-online.service $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants
 diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
-index a9e87310..e6cd392e 100644
+index a9e8731..e6cd392 100644
 --- a/data/NetworkManager.service.in
 +++ b/data/NetworkManager.service.in
 @@ -24,6 +24,5 @@ ProtectHome=read-only
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 2d98c9e7..096114d8 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 3be542c7..d552d5c2 100644
+index 3be542c..d552d5c 100644
 --- a/src/nm-sleep-monitor.c
 +++ b/src/nm-sleep-monitor.c
 @@ -25,6 +25,7 @@
diff --git a/debian/patches/Fix-arping-path.patch b/debian/patches/Fix-arping-path.patch
index d5bef393..fd149157 100644
--- a/debian/patches/Fix-arping-path.patch
+++ b/debian/patches/Fix-arping-path.patch
@@ -15,7 +15,7 @@ Closes: #755039
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/devices/nm-arping-manager.c b/src/devices/nm-arping-manager.c
-index 7b765844..59f0faed 100644
+index 7b76584..59f0fae 100644
 --- a/src/devices/nm-arping-manager.c
 +++ b/src/devices/nm-arping-manager.c
 @@ -222,7 +222,7 @@ nm_arping_manager_start_probe (NMArpingManager *self, guint timeout, GError **er
diff --git a/debian/patches/Fix-iscsiadm-path.patch b/debian/patches/Fix-iscsiadm-path.patch
index 86df4204..a439dc1b 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 c9069dc7..9dcf7dc8 100644
+index c9069dc..9dcf7dc 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 36d26956..9912cac2 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, 120 insertions(+)
 
 diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 0c1d36e1..13999aa9 100644
+index 7dfaa5a..f433c32 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -59,6 +59,8 @@
@@ -75,7 +75,7 @@ index 0c1d36e1..13999aa9 100644
  	nm_connectivity_set_online (priv->connectivity, new_state >= NM_STATE_CONNECTED_LOCAL);
  
  	if (new_state == NM_STATE_CONNECTED_SITE || force_connectivity_check) {
-@@ -4712,6 +4744,65 @@ impl_manager_check_connectivity (NMManager *self,
+@@ -4710,6 +4742,65 @@ impl_manager_check_connectivity (NMManager *self,
  }
  
  static void
@@ -141,7 +141,7 @@ index 0c1d36e1..13999aa9 100644
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
  	nm_device_factory_start (factory);
-@@ -4834,6 +4925,9 @@ nm_manager_start (NMManager *self, GError **error)
+@@ -4832,6 +4923,9 @@ nm_manager_start (NMManager *self, GError **error)
  
  	check_if_startup_complete (self);
  
@@ -151,7 +151,7 @@ index 0c1d36e1..13999aa9 100644
  	return TRUE;
  }
  
-@@ -5840,6 +5934,22 @@ nm_manager_init (NMManager *self)
+@@ -5838,6 +5932,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -174,7 +174,7 @@ index 0c1d36e1..13999aa9 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -6079,6 +6189,16 @@ dispose (GObject *object)
+@@ -6077,6 +6187,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}
  
diff --git a/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.serv.patch b/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.serv.patch
index 06376a01..53018432 100644
--- a/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.serv.patch
+++ b/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.serv.patch
@@ -14,10 +14,10 @@ This way the user can easily disable the service.
  1 file changed, 6 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 33761182..7a4319a2 100644
+index 1b33525..51d8bf7 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -3309,12 +3309,6 @@ endif
+@@ -3310,12 +3310,6 @@ endif
  data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in
  	$(AM_V_GEN) $(data_edit) $< >$@