Rebase patches

3 files changed, 9 insertions, 9 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 4539f99c..6b40857e 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 f06b7d65..143050af 100644
+index 8fa7a827..33761182 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -3306,11 +3306,6 @@ endif
+@@ -3309,11 +3309,6 @@ endif
  data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in
  	$(AM_V_GEN) $(data_edit) $< >$@
  
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index 337ee092..36d26956 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 867e0db6..92e457a9 100644
+index 0c1d36e1..13999aa9 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -59,6 +59,8 @@
@@ -75,7 +75,7 @@ index 867e0db6..92e457a9 100644
  	nm_connectivity_set_online (priv->connectivity, new_state >= NM_STATE_CONNECTED_LOCAL);
  
  	if (new_state == NM_STATE_CONNECTED_SITE || force_connectivity_check) {
-@@ -4705,6 +4737,65 @@ impl_manager_check_connectivity (NMManager *self,
+@@ -4712,6 +4744,65 @@ impl_manager_check_connectivity (NMManager *self,
  }
  
  static void
@@ -141,7 +141,7 @@ index 867e0db6..92e457a9 100644
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
  	nm_device_factory_start (factory);
-@@ -4827,6 +4918,9 @@ nm_manager_start (NMManager *self, GError **error)
+@@ -4834,6 +4925,9 @@ nm_manager_start (NMManager *self, GError **error)
  
  	check_if_startup_complete (self);
  
@@ -151,7 +151,7 @@ index 867e0db6..92e457a9 100644
  	return TRUE;
  }
  
-@@ -5833,6 +5927,22 @@ nm_manager_init (NMManager *self)
+@@ -5840,6 +5934,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -174,7 +174,7 @@ index 867e0db6..92e457a9 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -6072,6 +6182,16 @@ dispose (GObject *object)
+@@ -6079,6 +6189,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 74228e6b..06376a01 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 143050af..519b978a 100644
+index 33761182..7a4319a2 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -3306,12 +3306,6 @@ endif
+@@ -3309,12 +3309,6 @@ endif
  data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in
  	$(AM_V_GEN) $(data_edit) $< >$@