Rebase patches

5 files changed, 18 insertions, 18 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 cb3fe561..75430954 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 0cc4d7f..b1b63d4 100644
+index 941c1a2..b7c0a5f 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -3687,11 +3687,6 @@ endif
+@@ -3683,11 +3683,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 43712a3c..eb6fbd17 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 037db11..18282f1 100644
+index 7a37387..867e0d8 100644
 --- a/src/nm-sleep-monitor.c
 +++ b/src/nm-sleep-monitor.c
 @@ -25,6 +25,7 @@
diff --git a/debian/patches/Fix-iscsiadm-path.patch b/debian/patches/Fix-iscsiadm-path.patch
index 286e2099..c6ca5f72 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 9b1f5cc..8cc1313 100644
+index ea4d152..09a4579 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 62878813..d84f558f 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, 117 insertions(+)
 
 diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 2766e86..a14c0aa 100644
+index 7f1b9a9..956d11f 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -62,6 +62,8 @@
@@ -21,10 +21,10 @@ index 2766e86..a14c0aa 100644
  
 +#define IFUPDOWN_STATE_FILE "/run/network/ifstate"
 +
- static gboolean add_device (NMManager *self, NMDevice *device, GError **error);
+ /*****************************************************************************/
  
- static NMActiveConnection *_new_active_connection (NMManager *self,
-@@ -157,6 +159,10 @@ typedef struct {
+ typedef struct {
+@@ -167,6 +169,10 @@ typedef struct {
  	GFileMonitor *fw_monitor;
  	guint fw_changed_id;
  
@@ -35,7 +35,7 @@ index 2766e86..a14c0aa 100644
  	guint timestamp_update_id;
  
  	guint devices_inited_id;
-@@ -870,6 +876,29 @@ find_best_device_state (NMManager *manager)
+@@ -876,6 +882,29 @@ find_best_device_state (NMManager *manager)
  	return best_state;
  }
  
@@ -65,7 +65,7 @@ index 2766e86..a14c0aa 100644
  static void
  nm_manager_update_metered (NMManager *self)
  {
-@@ -908,6 +937,9 @@ nm_manager_update_state (NMManager *manager)
+@@ -914,6 +943,9 @@ nm_manager_update_state (NMManager *manager)
  	else
  		new_state = find_best_device_state (manager);
  
@@ -75,7 +75,7 @@ index 2766e86..a14c0aa 100644
  	if (   new_state >= NM_STATE_CONNECTED_LOCAL
  	    && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
  		new_state = NM_STATE_CONNECTED_GLOBAL;
-@@ -5090,6 +5122,62 @@ impl_manager_check_connectivity (NMManager *self,
+@@ -5174,6 +5206,62 @@ impl_manager_check_connectivity (NMManager *self,
  	nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE);
  }
  
@@ -138,7 +138,7 @@ index 2766e86..a14c0aa 100644
  static void
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
-@@ -5232,6 +5320,9 @@ nm_manager_start (NMManager *self, GError **error)
+@@ -5318,6 +5406,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);
  
@@ -148,7 +148,7 @@ index 2766e86..a14c0aa 100644
  	return TRUE;
  }
  
-@@ -6228,6 +6319,22 @@ nm_manager_init (NMManager *self)
+@@ -6313,6 +6404,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -171,7 +171,7 @@ index 2766e86..a14c0aa 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -6489,6 +6596,16 @@ dispose (GObject *object)
+@@ -6595,6 +6702,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}
  
diff --git a/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch b/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch
index c7219064..c78f9a45 100644
--- a/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch
+++ b/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch
@@ -54,10 +54,10 @@ After:
  create mode 100644 libnm/fake-typelib/typelibs.gresource.xml
 
 diff --git a/Makefile.am b/Makefile.am
-index b1b63d4..4fb8f5a 100644
+index b7c0a5f..f4c8e86 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -858,6 +858,7 @@ nodist_libnminclude_HEADERS += \
+@@ -852,6 +852,7 @@ nodist_libnminclude_HEADERS += \
  noinst_LTLIBRARIES += libnm/libnm-utils.la
  
  libnm_libnm_utils_la_CPPFLAGS = \
@@ -65,7 +65,7 @@ index b1b63d4..4fb8f5a 100644
  	$(libnm_lib_cppflags)
  
  libnm_libnm_utils_la_SOURCES = \
-@@ -956,6 +957,23 @@ libnm/libnm.typelib: libnm/libnm.gir
+@@ -950,6 +951,23 @@ libnm/libnm.typelib: libnm/libnm.gir
  	$(INTROSPECTION_COMPILER) --includedir=$(srcdir)/libnm-core --includedir=$(builddir)/libnm-core --includedir=$(srcdir)/libnm --includedir=$(builddir)/libnm $< -o $@
  
  INTROSPECTION_GIRS += libnm/NM-1.0.gir
@@ -90,7 +90,7 @@ index b1b63d4..4fb8f5a 100644
  
  if HAVE_INTROSPECTION
 diff --git a/configure.ac b/configure.ac
-index f8dcd13..f2e0cd2 100644
+index a4d7c24..01976bb 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -322,9 +322,12 @@ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_V