* Rebased and updated patches for new release

  - debian/patches/11-man_page_sh_name.patch
  - debian/patches/05-debian_backend.patch

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

2 files changed, 0 insertions, 45 deletions

diff --git a/debian/patches/05-debian_backend.patch b/debian/patches/05-debian_backend.patch
index b8967be7..931a2063 100644
--- a/debian/patches/05-debian_backend.patch
+++ b/debian/patches/05-debian_backend.patch
@@ -211,21 +211,6 @@ diff --git a/src/backends/interface_parser.c b/src/backends/interface_parser.c
 index 53d6487..b3ad300 100644
 --- a/src/backends/interface_parser.c
 +++ b/src/backends/interface_parser.c
-@@ -50,11 +50,13 @@ void add_block(const char *type, const char* name)
- 
- void add_data(const char *key,const char *data)
- {
-+	if_data *ret;
-+
- 	// Check if there is a block where we can attach our data
- 	if (first == NULL)
- 		return;
- 			
--	if_data *ret = (if_data*)calloc(1,sizeof(struct _if_data));
-+	ret = (if_data*) calloc(1,sizeof(struct _if_data));
- 	ret->key = g_strdup(key);
- 	ret->data = g_strdup(data);
- 	
 @@ -71,14 +73,18 @@ void add_data(const char *key,const char *data)
  	//printf("added data '%s' with key '%s'\n",data,key);
  }
diff --git a/debian/patches/11-man_page_sh_name.patch b/debian/patches/11-man_page_sh_name.patch
index 344a3cb1..b363268c 100644
--- a/debian/patches/11-man_page_sh_name.patch
+++ b/debian/patches/11-man_page_sh_name.patch
@@ -1,33 +1,3 @@
-Index: man/NetworkManager.1.in
-===================================================================
-RCS file: /cvs/gnome/NetworkManager/man/NetworkManager.1.in,v
-retrieving revision 1.2
-diff -u -3 -p -r1.2 NetworkManager.1.in
---- man/NetworkManager.1.in	1 Feb 2006 18:14:15 -0000	1.2
-+++ man/NetworkManager.1.in	30 Nov 2006 19:33:39 -0000
-@@ -3,6 +3,7 @@
- .\" Copyright (C) 2005 Robert Love
- .\"
- .TH NETWORKMANAGER "1"
-+.SH NAME
- NetworkManager \- network management daemon
- .SH SYNOPSIS
- .B NetworkManager [\-\-no-daemon] [\-\-enable-test-devices]
-Index: man/NetworkManagerDispatcher.1.in
-===================================================================
-RCS file: /cvs/gnome/NetworkManager/man/NetworkManagerDispatcher.1.in,v
-retrieving revision 1.2
-diff -u -3 -p -r1.2 NetworkManagerDispatcher.1.in
---- man/NetworkManagerDispatcher.1.in	1 Feb 2006 18:14:15 -0000	1.2
-+++ man/NetworkManagerDispatcher.1.in	30 Nov 2006 19:33:39 -0000
-@@ -3,6 +3,7 @@
- .\" Copyright (C) 2005 Robert Love
- .\"
- .TH NETWORKMANAGERDISPATCHER "1"
-+.SH NAME
- NetworkManagerDispatcher \- daemon that runs commands in response to off/online
- .SH SYNOPSIS
- .B NetworkManagerDispatcher [\-\-no-daemon]
 Index: man/nm-tool.1.in
 ===================================================================
 RCS file: /cvs/gnome/NetworkManager/man/nm-tool.1.in,v