merge r2130 from trunk

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2173 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/Makefile.am b/src/Makefile.am
index 84649c48d5a1882337729e4c3793b263802d4d83..b782f1506cef4f1ad8e6f4d82a65295a6a41d754 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -103,7 +103,7 @@ EXTRA_DIST = \
                modules/module-defs.h.m4 \
                daemon/pulseaudio-module-xsmp.desktop \
                map-file \
-               daemon/PulseAudio.policy
+               daemon/org.pulseaudio.policy
 
 pulseconf_DATA = \
                default.pa \
@@ -154,7 +154,7 @@ endif
 
 if HAVE_POLKIT
 
-policy_DATA = daemon/PulseAudio.policy
+policy_DATA = daemon/org.pulseaudio.policy
 
 pulseaudio_SOURCES += daemon/polkit.c daemon/polkit.h
 pulseaudio_CFLAGS += $(POLKIT_CFLAGS)

diff --git a/src/daemon/PulseAudio.policy b/src/daemon/org.pulseaudio.policy
similarity index 100%
rename from src/daemon/PulseAudio.policy
rename to src/daemon/org.pulseaudio.policy