[pulseaudio-commits] r2173 - in /branches/prepare-0.9.10/src: Makefile.am daemon/PulseAudio.policy daemon/org.pulseaudio.policy

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Fri Mar 28 00:38:28 2008
New Revision: 2173

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2173&root=pulseaudio&view=rev
Log:
merge r2130 from trunk

Added:
    branches/prepare-0.9.10/src/daemon/org.pulseaudio.policy
      - copied unchanged from r2130, trunk/src/daemon/org.pulseaudio.policy
Removed:
    branches/prepare-0.9.10/src/daemon/PulseAudio.policy
Modified:
    branches/prepare-0.9.10/src/Makefile.am

Modified: branches/prepare-0.9.10/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/prepare-0.9.10/src/Makefile.am?rev=2173&root=pulseaudio&r1=2172&r2=2173&view=diff
==============================================================================
--- branches/prepare-0.9.10/src/Makefile.am (original)
+++ branches/prepare-0.9.10/src/Makefile.am Fri Mar 28 00:38:28 2008
@@ -103,7 +103,7 @@
 		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 @@
 
 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)