[Pkg-utopia-commits] r220 - in packages/networkmanager/trunk/debian: . patches

[Thom May]

Author: thom
Date: 2005-06-10 17:20:56 +0000 (Fri, 10 Jun 2005)
New Revision: 220

Added:
   packages/networkmanager/trunk/debian/network-manager.dbus-conf
Removed:
   packages/networkmanager/trunk/debian/patches/99_fake_config_info.dpatch
Modified:
   packages/networkmanager/trunk/debian/network-manager-gnome.dbus-conf
   packages/networkmanager/trunk/debian/patches/00list
   packages/networkmanager/trunk/debian/rules
Log:
Begin bringing network manager up to date

Modified: packages/networkmanager/trunk/debian/network-manager-gnome.dbus-conf
===================================================================
--- packages/networkmanager/trunk/debian/network-manager-gnome.dbus-conf	2005-06-08 19:15:40 UTC (rev 219)
+++ packages/networkmanager/trunk/debian/network-manager-gnome.dbus-conf	2005-06-10 17:20:56 UTC (rev 220)
@@ -8,11 +8,17 @@
 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
                 <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
 	</policy>
-	<policy context="default">
+	<policy group="plugdev">
 		<allow own="org.freedesktop.NetworkManagerInfo"/>
 
 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
                 <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
 	</policy>
+	<policy context="default">
+		<deny own="org.freedesktop.NetworkManagerInfo"/>
+
+		<deny send_destination="org.freedesktop.NetworkManagerInfo"/>
+		<deny send_interface="org.freedesktop.NetworkManagerInfo"/>
+	</policy>
 </busconfig>
 

Added: packages/networkmanager/trunk/debian/network-manager.dbus-conf
===================================================================
--- packages/networkmanager/trunk/debian/network-manager.dbus-conf	2005-06-08 19:15:40 UTC (rev 219)
+++ packages/networkmanager/trunk/debian/network-manager.dbus-conf	2005-06-10 17:20:56 UTC (rev 220)
@@ -0,0 +1,24 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+        <policy user="root">
+                <allow own="org.freedesktop.NetworkManager"/>
+
+                <allow send_destination="org.freedesktop.NetworkManager"/>
+                <allow send_interface="org.freedesktop.NetworkManager"/>
+        </policy>
+        <policy group="plugdev">
+                <allow own="org.freedesktop.NetworkManager"/>
+
+                <allow send_destination="org.freedesktop.NetworkManager"/>
+                <allow send_interface="org.freedesktop.NetworkManager"/>
+       </policy>
+        <policy context="default">
+                <deny own="org.freedesktop.NetworkManager"/>
+                <deny send_destination="org.freedesktop.NetworkManager"/>
+                <deny send_interface="org.freedesktop.NetworkManager"/>
+        </policy>
+
+</busconfig>
+

Modified: packages/networkmanager/trunk/debian/patches/00list
===================================================================
--- packages/networkmanager/trunk/debian/patches/00list	2005-06-08 19:15:40 UTC (rev 219)
+++ packages/networkmanager/trunk/debian/patches/00list	2005-06-10 17:20:56 UTC (rev 220)
@@ -1 +0,0 @@
-99_fake_config_info

Deleted: packages/networkmanager/trunk/debian/patches/99_fake_config_info.dpatch
===================================================================
--- packages/networkmanager/trunk/debian/patches/99_fake_config_info.dpatch	2005-06-08 19:15:40 UTC (rev 219)
+++ packages/networkmanager/trunk/debian/patches/99_fake_config_info.dpatch	2005-06-10 17:20:56 UTC (rev 220)
@@ -1,25 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99_fake_config_info.dpatch by Thom May <thom@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad network-manager-0.3.1+cvs20041108/src/backends/NetworkManagerDebian.c /tmp/dpep.F0bTtF/network-manager-0.3.1+cvs20041108/src/backends/NetworkManagerDebian.c
---- network-manager-0.3.1+cvs20041108/src/backends/NetworkManagerDebian.c	2004-11-08 14:38:35.318858672 +0000
-+++ /tmp/dpep.F0bTtF/network-manager-0.3.1+cvs20041108/src/backends/NetworkManagerDebian.c	2004-11-08 14:39:52.754086728 +0000
-@@ -289,6 +289,14 @@
-  */
- void nm_system_device_update_config_info (NMDevice *dev)
- {
-+        g_return_if_fail (dev != NULL);
-+
-+        nm_device_config_set_use_dhcp (dev, TRUE);
-+        nm_device_config_set_ip4_address (dev, 0);
-+        nm_device_config_set_ip4_gateway (dev, 0);
-+        nm_device_config_set_ip4_netmask (dev, 0);
-+        nm_device_config_set_ip4_broadcast (dev, 0);
-+
- }
- 
- 

Modified: packages/networkmanager/trunk/debian/rules
===================================================================
--- packages/networkmanager/trunk/debian/rules	2005-06-08 19:15:40 UTC (rev 219)
+++ packages/networkmanager/trunk/debian/rules	2005-06-10 17:20:56 UTC (rev 220)
@@ -35,7 +35,7 @@
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-dbus-sys=/etc/dbus-1/system.d --sysconfdir=/etc --libexecdir=/usr/bin --localstatedir=/var/run 
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-dbus-sys=/etc/dbus-1/system.d --sysconfdir=/etc --libexecdir=/usr/bin --localstatedir=/var/run --with-named=/usr/sbin/named --with-named-user=bind --with-named-dir=/var/lib/NetworkManager
 
 
 #Architecture