merge r2130 from trunk

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2173 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-03-27 23:38:28 +00:00
parent 02840a3c92
commit edd1a509d3
2 changed files with 2 additions and 2 deletions

View file

@ -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)