summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2009-04-08 05:06:14 +0000
committerMichael Biebl <biebl@debian.org>2009-04-08 05:06:14 +0000
commit9b404b2db4af6ce29156d10a3ff6f0a436b94c8d (patch)
tree37032caef2984dec341274c510c82ad57f964fab
parent3ada820bcaa98d84d88b991e3e2179ca13bdfd8d (diff)
* debian/patches/02-dbus_access_network_manager.patch
  - Remove haldaemon section, obsolete.

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3040 ceb527fc-18e6-0310-9fe2-813c157c29e7
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/02-dbus_access_network_manager.patch6
2 files changed, 3 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 5ca47847..5ab55801 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ network-manager (0.7.0.100-1) UNRELEASED; urgency=low
   * debian/control
     - Bump Standards-Version to 3.8.1. See the changes above wrt the /var/run
       directory.
+  * debian/patches/02-dbus_access_network_manager.patch
+    - Remove haldaemon section, obsolete.
 
  -- Michael Biebl <biebl@debian.org>  Mon, 06 Apr 2009 10:13:04 +0200
 
diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch
index a96c6c0b..c96a0de1 100644
--- a/debian/patches/02-dbus_access_network_manager.patch
+++ b/debian/patches/02-dbus_access_network_manager.patch
@@ -2,14 +2,10 @@ Index: network-manager-0.7.0.97/src/NetworkManager.conf
 ===================================================================
 --- network-manager-0.7.0.97.orig/src/NetworkManager.conf	2009-02-17 16:45:44.000000000 +0100
 +++ network-manager-0.7.0.97/src/NetworkManager.conf	2009-02-22 03:20:14.000000000 +0100
-@@ -9,6 +9,16 @@
+@@ -9,6 +9,12 @@
                  <allow send_destination="org.freedesktop.NetworkManager"
                         send_interface="org.freedesktop.NetworkManager.PPP"/>
          </policy>
-+        <policy user="haldaemon">
-+                <allow send_destination="org.freedesktop.NetworkManager"/>
-+                <allow send_interface="org.freedesktop.NetworkManager"/>
-+        </policy>
 +        <policy group="netdev">
 +                <allow send_destination="org.freedesktop.NetworkManager"/>
 +