diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-03-27 23:38:28 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-03-27 23:38:28 +0000 |
| commit | edd1a509d3cc6d5a14bbbde8a8044e7ef5c8347a (patch) | |
| tree | a84e81220f3a5c315c0adc714174179cc1804867 | |
| parent | 02840a3c9248b9cbe06e7a1cd12f30596a491476 (diff) | |
merge r2130 from trunk
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2173 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/daemon/org.pulseaudio.policy (renamed from src/daemon/PulseAudio.policy) | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 84649c48..b782f150 100644 --- 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 index 507a2cb1..507a2cb1 100644 --- a/src/daemon/PulseAudio.policy +++ b/src/daemon/org.pulseaudio.policy |