diff options
4 files changed, 14 insertions, 23 deletions
diff --git a/debian/changelog b/debian/changelog index 1eccb813..f5b7778e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ network-manager (0.9.8.10-1) UNRELEASED; urgency=medium * New upstream release + * debian/patches/*: Refresh if necessary - -- Sjoerd Simons <sjoerd@debian.org> Sat, 26 Apr 2014 20:56:03 +0200 + -- Sjoerd Simons <sjoerd@debian.org> Sat, 26 Apr 2014 20:57:41 +0200 network-manager (0.9.8.8-7) unstable; urgency=medium diff --git a/debian/patches/0001-Add-D-Bus-policy-for-group-netdev.patch b/debian/patches/0001-Add-D-Bus-policy-for-group-netdev.patch index a1aea3e0..4c55530c 100644 --- a/debian/patches/0001-Add-D-Bus-policy-for-group-netdev.patch +++ b/debian/patches/0001-Add-D-Bus-policy-for-group-netdev.patch @@ -7,11 +7,9 @@ This is more or less a verbatim copy of the at_console section. src/org.freedesktop.NetworkManager.conf | 61 +++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) -diff --git a/src/org.freedesktop.NetworkManager.conf b/src/org.freedesktop.NetworkManager.conf -index 5e7bafa..e5378d7 100644 --- a/src/org.freedesktop.NetworkManager.conf +++ b/src/org.freedesktop.NetworkManager.conf -@@ -86,6 +86,67 @@ +@@ -87,6 +87,67 @@ send_interface="org.freedesktop.NetworkManager" send_member="wake"/> </policy> diff --git a/debian/patches/0003-Force-online-state-with-unmanaged-devices.patch b/debian/patches/0003-Force-online-state-with-unmanaged-devices.patch index bd1c4bc8..7fe346bd 100644 --- a/debian/patches/0003-Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/0003-Force-online-state-with-unmanaged-devices.patch @@ -11,8 +11,6 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286 src/nm-manager.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) -diff --git a/src/nm-manager.c b/src/nm-manager.c -index 9c82d14..5e732e4 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -78,6 +78,8 @@ @@ -24,7 +22,7 @@ index 9c82d14..5e732e4 100644 static gboolean impl_manager_get_devices (NMManager *manager, GPtrArray **devices, GError **err); -@@ -249,6 +251,11 @@ typedef struct { +@@ -250,6 +252,11 @@ guint fw_monitor_id; guint fw_changed_id; @@ -36,7 +34,7 @@ index 9c82d14..5e732e4 100644 guint timestamp_update_id; GHashTable *nm_bridges; -@@ -618,6 +625,14 @@ nm_manager_update_state (NMManager *manager) +@@ -620,6 +627,14 @@ } } @@ -51,7 +49,7 @@ index 9c82d14..5e732e4 100644 if (nm_device_is_activating (dev)) new_state = NM_STATE_CONNECTING; else if (new_state != NM_STATE_CONNECTING) { -@@ -3887,6 +3902,65 @@ impl_manager_check_connectivity (NMManager *manager, +@@ -3963,6 +3978,65 @@ nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -117,7 +115,7 @@ index 9c82d14..5e732e4 100644 void nm_manager_start (NMManager *self) { -@@ -3949,6 +4023,9 @@ nm_manager_start (NMManager *self) +@@ -4025,6 +4099,9 @@ /* FIXME: remove when we handle bridges non-destructively */ g_hash_table_unref (priv->nm_bridges); priv->nm_bridges = NULL; @@ -127,7 +125,7 @@ index 9c82d14..5e732e4 100644 } static gboolean -@@ -4506,6 +4583,17 @@ dispose (GObject *object) +@@ -4586,6 +4663,17 @@ g_object_unref (priv->fw_monitor); } @@ -145,7 +143,7 @@ index 9c82d14..5e732e4 100644 g_slist_free (priv->factories); if (priv->timestamp_update_id) { -@@ -4865,6 +4953,22 @@ nm_manager_init (NMManager *manager) +@@ -4945,6 +5033,22 @@ KERNEL_FIRMWARE_DIR); } diff --git a/debian/patches/0004-Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch b/debian/patches/0004-Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch index 3be32612..4b19a331 100644 --- a/debian/patches/0004-Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch +++ b/debian/patches/0004-Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch @@ -17,11 +17,9 @@ Closes: #742933 src/nm-sleep-monitor-systemd.c | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 6f40bad..e14e98c 100644 --- a/configure.ac +++ b/configure.ac -@@ -322,7 +322,8 @@ fi +@@ -327,7 +327,8 @@ case $with_suspend_resume in upower) ;; systemd) @@ -31,19 +29,17 @@ index 6f40bad..e14e98c 100644 ;; *) AC_MSG_ERROR(--with-suspend-resume must be one of [upower, systemd]) -diff --git a/src/Makefile.am b/src/Makefile.am -index 3ca5a7d..c03706e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -300,6 +300,7 @@ NetworkManager_CPPFLAGS = \ +@@ -304,6 +304,7 @@ $(LIBNL_CFLAGS) \ $(POLKIT_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ + $(SYSTEMD_INHIBIT_CFLAGS) \ $(LIBSOUP_CFLAGS) \ + $(AM_CPPFLAGS) \ -DBINDIR=\"$(bindir)\" \ - -DSBINDIR=\"$(sbindir)\" \ -@@ -341,6 +342,7 @@ NetworkManager_LDADD = \ +@@ -346,6 +347,7 @@ $(LIBNL_LIBS) \ $(POLKIT_LIBS) \ $(SYSTEMD_LOGIN_LIBS) \ @@ -51,8 +47,6 @@ index 3ca5a7d..c03706e 100644 $(LIBSOUP_LIBS) \ $(LIBM) \ $(LIBDL) -diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c -index 576cb14..3eb6091 100644 --- a/src/nm-sleep-monitor-systemd.c +++ b/src/nm-sleep-monitor-systemd.c @@ -25,6 +25,7 @@ @@ -63,7 +57,7 @@ index 576cb14..3eb6091 100644 #include "nm-logging.h" #include "nm-dbus-manager.h" -@@ -304,6 +305,10 @@ sleep_setup (NMSleepMonitor *self) +@@ -304,6 +305,10 @@ static void nm_sleep_monitor_init (NMSleepMonitor *self) { |