* New upstream release. (Closes: #470197)

  - Ensure dbus errors are properly initialised. (Closes: #471317)
* Removed patches
  - debian/patches/04-if_fix.patch (obsolete)
  - debian/patches/11-man_page_sh_name.patch (merged upstream)
  - debian/patches/12_readme_format.patch (merged upstream)
  - debian/patches/20-stable_branch_updates_r2652.patch (merged upstream)
  - debian/patches/21-endianess_fix_r2754.patch (merged upstream)
  - debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch
    (merged upstream)
  - debian/patches/23-rfkill_return_type.patch (fixed upstream)
  - debian/patches/24-get_mode_fix_r3122.patch (merged upstream)
  - debian/patches/25-libnl_unique_pid_r3155.patch (merged upstream)
  - debian/patches/26-libnl_1.0-pre8_r3206.patch (merged upstream)
  - debian/patches/27-dont_repeat_errors.patch (merged upstream)

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2153 ceb527fc-18e6-0310-9fe2-813c157c29e7

1 files changed, 0 insertions, 37 deletions

diff --git a/debian/patches/27-dont_repeat_errors.patch b/debian/patches/27-dont_repeat_errors.patch
deleted file mode 100644
index 64e23223..00000000
--- a/debian/patches/27-dont_repeat_errors.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/src/NetworkManager.c b/src/NetworkManager.c
-index 4f89f63..ddb5a4a 100644
---- a/src/NetworkManager.c
-+++ b/src/NetworkManager.c
-@@ -65,6 +65,8 @@
-  */
- static NMData		*nm_data = NULL;
- 
-+char *ks_err_message = NULL;
-+
- static gboolean sigterm_pipe_handler (GIOChannel *src, GIOCondition condition, gpointer data);
- static void nm_data_free (NMData *data);
- static gboolean nm_poll_killswitches(gpointer user_data);
-@@ -353,13 +355,21 @@ static void nm_killswitch_getpower_reply_cb (DBusPendingCall *pcall, NMData * da
- 	if (message_is_error (reply)) {
- 		dbus_error_init (&err);
- 		dbus_set_error_from_message (&err, reply);
--		nm_info ("Error getting killswitch power: %s - %s", err.name, err.message);
-+		if (!ks_err_message || strcmp (ks_err_message, err.message)) {
-+			nm_info ("Error getting killswitch power: %s - %s", err.name, err.message);
-+			g_free (ks_err_message);
-+			ks_err_message = g_strdup (err.message);
-+		}
- 		dbus_error_free (&err);
- 		goto out;
- 	}
- 
- 	if (!dbus_message_get_args (reply, &err, DBUS_TYPE_INT32, &status, DBUS_TYPE_INVALID)) {
--		nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message);
-+		if (!ks_err_message || strcmp (ks_err_message, err.message)) {
-+			nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message);
-+			g_free (ks_err_message);
-+			ks_err_message = g_strdup (err.message);
-+		}
- 		dbus_error_free (&err);
- 		goto out;
- 	}