Rebase patches

1 files changed, 7 insertions, 7 deletions

diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index 1b904e06..c388bfbe 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/core/nm-manager.c b/src/core/nm-manager.c
-index a861b2f..e42bed5 100644
+index fce3707..a6533d9 100644
 --- a/src/core/nm-manager.c
 +++ b/src/core/nm-manager.c
 @@ -53,6 +53,8 @@
@@ -35,7 +35,7 @@ index a861b2f..e42bed5 100644
      guint timestamp_update_id;
  
      guint devices_inited_id;
-@@ -2040,6 +2046,27 @@ find_best_device_state(NMManager *manager)
+@@ -2042,6 +2048,27 @@ find_best_device_state(NMManager *manager)
      return best_state;
  }
  
@@ -63,7 +63,7 @@ index a861b2f..e42bed5 100644
  static void
  nm_manager_update_metered(NMManager *self)
  {
-@@ -2086,6 +2113,9 @@ nm_manager_update_state(NMManager *self)
+@@ -2088,6 +2115,9 @@ nm_manager_update_state(NMManager *self)
      else
          new_state = find_best_device_state(self);
  
@@ -73,7 +73,7 @@ index a861b2f..e42bed5 100644
      if (new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
          new_state = NM_STATE_CONNECTED_GLOBAL;
      }
-@@ -7821,6 +7851,62 @@ impl_manager_get_logging(NMDBusObject                      *obj,
+@@ -7818,6 +7848,62 @@ impl_manager_get_logging(NMDBusObject                      *obj,
          g_variant_new("(ss)", nm_logging_level_to_string(), nm_logging_domains_to_string()));
  }
  
@@ -136,7 +136,7 @@ index a861b2f..e42bed5 100644
  typedef struct {
      NMManager             *self;
      GDBusMethodInvocation *context;
-@@ -8125,6 +8211,9 @@ nm_manager_start(NMManager *self, GError **error)
+@@ -8122,6 +8208,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 a861b2f..e42bed5 100644
      return TRUE;
  }
  
-@@ -9010,6 +9099,22 @@ nm_manager_init(NMManager *self)
+@@ -9007,6 +9096,22 @@ nm_manager_init(NMManager *self)
          _LOGW(LOGD_CORE, "failed to monitor kernel firmware directory '%s'.", KERNEL_FIRMWARE_DIR);
      }
  
@@ -169,7 +169,7 @@ index a861b2f..e42bed5 100644
      priv->metered       = NM_METERED_UNKNOWN;
      priv->sleep_devices = g_hash_table_new(nm_direct_hash, NULL);
  }
-@@ -9301,6 +9406,16 @@ dispose(GObject *object)
+@@ -9298,6 +9403,16 @@ dispose(GObject *object)
          g_clear_object(&priv->fw_monitor);
      }