[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-test3-8-g116b38c

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  798e39a5b686da5b5f0b0335cb21fc14c715f9e4 (commit)

- Log -----------------------------------------------------------------
116b38c... Merge commit 'coling/master'
07f9842... bluetooth: Fix under linked module-bluetooth-device
dd3c96d... Fix a very strange 'file not found' error in module-alsa-card.
-----------------------------------------------------------------------

Summary of changes:
 src/Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------

commit dd3c96dede6439ee5dec9e3b22bce9cf7b53d2ff
Author: Colin Guthrie <cguthrie at mandriva.org>
Date:   Thu Feb 26 00:54:37 2009 +0000

    Fix a very strange 'file not found' error in module-alsa-card.
    
    This fixes a regression introduced by commit c341010304064c9a6ae13fab15c7fa7883acaeeb

diff --git a/src/Makefile.am b/src/Makefile.am
index 1fc8735..9f9cf4c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1315,7 +1315,7 @@ endif
 
 if HAVE_DBUS
 libalsa_util_la_SOURCES += modules/reserve.h modules/reserve.c modules/reserve-wrap.c modules/reserve-wrap.h
-libalsa_util_la_LIBADD += $(DBUS_LIBS)
+libalsa_util_la_LIBADD += $(DBUS_LIBS) libdbus-util.la
 libalsa_util_la_CFLAGS += $(DBUS_CFLAGS)
 endif
 

commit 07f98425baa93549d58df42e42dc6f242e4b050b
Author: Colin Guthrie <cguthrie at mandriva.org>
Date:   Thu Feb 26 09:02:15 2009 +0000

    bluetooth: Fix under linked module-bluetooth-device

diff --git a/src/Makefile.am b/src/Makefile.am
index 9f9cf4c..f5a1feb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1532,7 +1532,7 @@ libbluetooth_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 
 module_bluetooth_device_la_SOURCES = modules/bluetooth/module-bluetooth-device.c modules/bluetooth/rtp.h
 module_bluetooth_device_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_bluetooth_device_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore- at PA_MAJORMINORMICRO@.la libdbus-util.la libbluetooth-ipc.la libbluetooth-sbc.la libpulsecommon- at PA_MAJORMINORMICRO@.la libpulse.la
+module_bluetooth_device_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore- at PA_MAJORMINORMICRO@.la libdbus-util.la libbluetooth-util.la libbluetooth-ipc.la libbluetooth-sbc.la libpulsecommon- at PA_MAJORMINORMICRO@.la libpulse.la
 module_bluetooth_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 
 # Apple Airtunes/RAOP

commit 116b38c972942ccbbb8dae5dc0181da98096a0ce
Merge: 798e39a... 07f9842...
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Feb 27 01:18:04 2009 +0100

    Merge commit 'coling/master'


-- 
hooks/post-receive
PulseAudio Sound Server