[Pkg-utopia-commits] r1674 - in /packages/unstable/networkmanager/debian: changelog patches/05-debian_backend.patch patches/11-man_page_sh_name.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Aug 26 18:55:09 2007
New Revision: 1674

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1674
Log:
* Rebased and updated patches for new release
  - debian/patches/11-man_page_sh_name.patch
  - debian/patches/05-debian_backend.patch

Modified:
    packages/unstable/networkmanager/debian/changelog
    packages/unstable/networkmanager/debian/patches/05-debian_backend.patch
    packages/unstable/networkmanager/debian/patches/11-man_page_sh_name.patch

Modified: packages/unstable/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/changelog?rev=1674&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/changelog (original)
+++ packages/unstable/networkmanager/debian/changelog Sun Aug 26 18:55:09 2007
@@ -10,6 +10,9 @@
     - debian/patches/13-wep_capabilities
   * debian/network-manager.preinst
     - Do not parse /var/lib/dpkg/status directly but use dpkg-query instead.
+  * Rebased and updated patches for new release
+    - debian/patches/11-man_page_sh_name.patch
+    - debian/patches/05-debian_backend.patch
 
  -- Michael Biebl <biebl at debian.org>  Sun, 26 Aug 2007 20:46:05 +0200
 

Modified: packages/unstable/networkmanager/debian/patches/05-debian_backend.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/patches/05-debian_backend.patch?rev=1674&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/patches/05-debian_backend.patch (original)
+++ packages/unstable/networkmanager/debian/patches/05-debian_backend.patch Sun Aug 26 18:55:09 2007
@@ -211,21 +211,6 @@
 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);
  }

Modified: packages/unstable/networkmanager/debian/patches/11-man_page_sh_name.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/patches/11-man_page_sh_name.patch?rev=1674&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/patches/11-man_page_sh_name.patch (original)
+++ packages/unstable/networkmanager/debian/patches/11-man_page_sh_name.patch Sun Aug 26 18:55:09 2007
@@ -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