From 0ef63b77db31f41895c4335e4c54d6684d7aa1ac Mon Sep 17 00:00:00 2001
From: Riccardo Setti <giskard@autistici.org>
Date: Thu, 9 Feb 2006 20:16:17 +0000
Subject: - removed debian/network-manager.dbus-conf debian/nm-applet.conf

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@575 ceb527fc-18e6-0310-9fe2-813c157c29e7
---
 debian/changelog                                 |  1 +
 debian/network-manager.dbus-conf                 | 24 ------------------------
 debian/nm-applet.conf                            | 24 ------------------------
 debian/patches/dbus_access_network_manager.patch | 11 +++++++++++
 debian/patches/dbus_access_nm_applet.patch       | 11 +++++++++++
 5 files changed, 23 insertions(+), 48 deletions(-)
 delete mode 100644 debian/network-manager.dbus-conf
 delete mode 100644 debian/nm-applet.conf
 create mode 100644 debian/patches/dbus_access_network_manager.patch
 create mode 100644 debian/patches/dbus_access_nm_applet.patch

diff --git a/debian/changelog b/debian/changelog
index f1e3703c..f3a58002 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ network-manager (0.5.1-2) unstable; urgency=low
   * added dbus_access_network_manager and dbus_access_nm_applet patches:
   - switched to group netdev
   - updated the dep on dhcdbd
+  - removed debian/network-manager.dbus-conf debian/nm-applet.conf
   * removed network-manager.doc as it was empty. 
   * uploaded to unstable.
 
diff --git a/debian/network-manager.dbus-conf b/debian/network-manager.dbus-conf
deleted file mode 100644
index bdf362ff..00000000
--- a/debian/network-manager.dbus-conf
+++ /dev/null
@@ -1,24 +0,0 @@
-<!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>
-
diff --git a/debian/nm-applet.conf b/debian/nm-applet.conf
deleted file mode 100644
index 69bc7aee..00000000
--- a/debian/nm-applet.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-<!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.NetworkManagerInfo"/>
-
-		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
-                <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
-	</policy>
-	<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>
-
diff --git a/debian/patches/dbus_access_network_manager.patch b/debian/patches/dbus_access_network_manager.patch
new file mode 100644
index 00000000..06886be3
--- /dev/null
+++ b/debian/patches/dbus_access_network_manager.patch
@@ -0,0 +1,11 @@
+--- src/NetworkManager.conf.orig	2006-02-07 04:24:38.000000000 +0100
++++ src/NetworkManager.conf	2006-02-07 04:25:00.000000000 +0100
+@@ -8,7 +8,7 @@
+                 <allow send_destination="org.freedesktop.NetworkManager"/>
+                 <allow send_interface="org.freedesktop.NetworkManager"/>
+         </policy>
+-        <policy at_console="true">
++        <policy group="netdev">
+                 <allow send_destination="org.freedesktop.NetworkManager"/>
+                 <allow send_interface="org.freedesktop.NetworkManager"/>
+         </policy>
diff --git a/debian/patches/dbus_access_nm_applet.patch b/debian/patches/dbus_access_nm_applet.patch
new file mode 100644
index 00000000..94053ea2
--- /dev/null
+++ b/debian/patches/dbus_access_nm_applet.patch
@@ -0,0 +1,11 @@
+--- gnome/applet/nm-applet.conf.orig	2006-02-07 04:22:39.000000000 +0100
++++ gnome/applet/nm-applet.conf	2006-02-07 04:23:00.000000000 +0100
+@@ -8,7 +8,7 @@
+ 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
+                 <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
+ 	</policy>
+-	<policy at_console="true">
++	<policy group="netdev">
+ 		<allow own="org.freedesktop.NetworkManagerInfo"/>
+ 
+ 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
-- 
cgit 1.3.0-6-gf8a5