mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-10 13:29:58 -05:00
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:
parent
02840a3c92
commit
edd1a509d3
2 changed files with 2 additions and 2 deletions
|
|
@ -103,7 +103,7 @@ EXTRA_DIST = \
|
||||||
modules/module-defs.h.m4 \
|
modules/module-defs.h.m4 \
|
||||||
daemon/pulseaudio-module-xsmp.desktop \
|
daemon/pulseaudio-module-xsmp.desktop \
|
||||||
map-file \
|
map-file \
|
||||||
daemon/PulseAudio.policy
|
daemon/org.pulseaudio.policy
|
||||||
|
|
||||||
pulseconf_DATA = \
|
pulseconf_DATA = \
|
||||||
default.pa \
|
default.pa \
|
||||||
|
|
@ -154,7 +154,7 @@ endif
|
||||||
|
|
||||||
if HAVE_POLKIT
|
if HAVE_POLKIT
|
||||||
|
|
||||||
policy_DATA = daemon/PulseAudio.policy
|
policy_DATA = daemon/org.pulseaudio.policy
|
||||||
|
|
||||||
pulseaudio_SOURCES += daemon/polkit.c daemon/polkit.h
|
pulseaudio_SOURCES += daemon/polkit.c daemon/polkit.h
|
||||||
pulseaudio_CFLAGS += $(POLKIT_CFLAGS)
|
pulseaudio_CFLAGS += $(POLKIT_CFLAGS)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue