hal: Branch 'master'

[Danny Kukawka]

 policy/Makefile.am                            |    1 +
 policy/hal-dockstation.policy                 |   18 ------------------
 policy/org.freedesktop.hal.dockstation.policy |   18 ++++++++++++++++++
 3 files changed, 19 insertions(+), 18 deletions(-)

New commits:
commit b659dddba0cefe6d70ed297a396bae965e4f9506
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Mar 13 19:52:14 2008 +0100

    fix policy file for org.freedesktop.hal.dockstation.*
    
    Fixed Policy file for org.freedesktop.hal.dockstation.*:
    - renamed from hal-dockstation.policy to org.freedesktop.hal.dockstation.policy
      as the other policy files
    - added file to Makefile.am

diff --git a/policy/Makefile.am b/policy/Makefile.am
index a5a87d7..98e447d 100644
--- a/policy/Makefile.am
+++ b/policy/Makefile.am
@@ -7,6 +7,7 @@ dist_polkit_policy_DATA =    				\
 	org.freedesktop.hal.storage.policy		\
 	org.freedesktop.hal.power-management.policy	\
 	org.freedesktop.hal.killswitch.policy		\
+	org.freedesktop.hal.dockstation.policy		\
 	org.freedesktop.hal.wol.policy
 
 if HAVE_ACLMGMT
diff --git a/policy/hal-dockstation.policy b/policy/hal-dockstation.policy
deleted file mode 100644
index 7d5add7..0000000
--- a/policy/hal-dockstation.policy
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-
-<policyconfig>
-
- <action id="org.freedesktop.hal.dockstation.undock">
-    <description>Undock a docking station</description>
-    <message>System policy prevents undocking</message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>yes</allow_active>
-    </defaults>
-  </action>
-
-</policyconfig>
-
diff --git a/policy/org.freedesktop.hal.dockstation.policy b/policy/org.freedesktop.hal.dockstation.policy
new file mode 100644
index 0000000..7d5add7
--- /dev/null
+++ b/policy/org.freedesktop.hal.dockstation.policy
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
+
+<policyconfig>
+
+ <action id="org.freedesktop.hal.dockstation.undock">
+    <description>Undock a docking station</description>
+    <message>System policy prevents undocking</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+
+</policyconfig>
+