Rebase patches

3 files changed, 13 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index fd5c0d06..259eb2e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 network-manager (1.1.93-1) UNRELEASED; urgency=medium
 
   * New upstream release (1.2 rc1).
+  * Rebase patches.
 
  -- Michael Biebl <biebl@debian.org>  Wed, 06 Apr 2016 00:47:19 +0200
 
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 e76bff20..cf76f6ab 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
@@ -18,10 +18,10 @@ Closes: #742933
  3 files changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 578b077..e2301d8 100644
+index 7ec52e3..6e217c6 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -470,8 +470,9 @@ fi
+@@ -474,8 +474,9 @@ fi
  case $with_suspend_resume in
      upower) ;;
      systemd)
@@ -33,10 +33,10 @@ index 578b077..e2301d8 100644
          ;;
      consolekit)
 diff --git a/src/Makefile.am b/src/Makefile.am
-index aee7eae..cc23c8b 100644
+index bf668d7..670c29e 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -483,6 +483,7 @@ AM_CPPFLAGS += \
+@@ -481,6 +481,7 @@ AM_CPPFLAGS += \
  	$(SELINUX_CFLAGS) \
  	$(LIBAUDIT_CFLAGS) \
  	$(SYSTEMD_LOGIN_CFLAGS) \
@@ -44,7 +44,7 @@ index aee7eae..cc23c8b 100644
  	$(SYSTEMD_JOURNAL_CFLAGS) \
  	$(SYSTEMD_NM_CFLAGS_PATHS) \
  	\
-@@ -516,6 +517,7 @@ libNetworkManager_la_LIBADD = \
+@@ -514,6 +515,7 @@ libNetworkManager_la_LIBADD = \
  	$(GUDEV_LIBS) \
  	$(LIBNL_LIBS) \
  	$(SYSTEMD_LOGIN_LIBS) \
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index 5c578d9a..4475a09d 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 dc394a4..fea7c0d 100644
+index 289a91d..f85b7ab 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -57,6 +57,8 @@
@@ -35,7 +35,7 @@ index dc394a4..fea7c0d 100644
  	guint timestamp_update_id;
  
  	gboolean startup;
-@@ -691,6 +697,29 @@ find_best_device_state (NMManager *manager)
+@@ -687,6 +693,29 @@ find_best_device_state (NMManager *manager)
  	return best_state;
  }
  
@@ -65,7 +65,7 @@ index dc394a4..fea7c0d 100644
  static void
  nm_manager_update_metered (NMManager *self)
  {
-@@ -731,6 +760,9 @@ nm_manager_update_state (NMManager *manager)
+@@ -727,6 +756,9 @@ nm_manager_update_state (NMManager *manager)
  
  	nm_connectivity_set_online (priv->connectivity, new_state >= NM_STATE_CONNECTED_LOCAL);
  
@@ -75,7 +75,7 @@ index dc394a4..fea7c0d 100644
  	if (new_state == NM_STATE_CONNECTED_SITE) {
  		nm_connectivity_check_async (priv->connectivity,
  		                             checked_connectivity,
-@@ -4403,6 +4435,65 @@ impl_manager_check_connectivity (NMManager *self,
+@@ -4400,6 +4432,65 @@ impl_manager_check_connectivity (NMManager *self,
  }
  
  static void
@@ -141,7 +141,7 @@ index dc394a4..fea7c0d 100644
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
  	nm_device_factory_start (factory);
-@@ -4473,6 +4564,9 @@ nm_manager_start (NMManager *self, GError **error)
+@@ -4470,6 +4561,9 @@ nm_manager_start (NMManager *self, GError **error)
  
  	check_if_startup_complete (self);
  
@@ -151,7 +151,7 @@ index dc394a4..fea7c0d 100644
  	return TRUE;
  }
  
-@@ -5273,6 +5367,22 @@ nm_manager_init (NMManager *self)
+@@ -5270,6 +5364,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -174,7 +174,7 @@ index dc394a4..fea7c0d 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -5515,6 +5625,16 @@ dispose (GObject *object)
+@@ -5512,6 +5622,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}