Package: pulseaudio
Version: 0.9.22-1
Severity: wishlist
Please find attached a patch to add a new module, named
module-gnome-session, which will pass an ALSA_CONFIG_PATH variable to
the GNOME session.
This way applications still using ALSA will automatically use PulseAudio
without the need to configure ALSA by hand.
This change makes it *much* easier for our users seeing GNOME migrating
to PulseAudio by default, without breaking the behavior with PA
disabled.
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.38-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages pulseaudio depends on:
ii adduser 3.112+nmu2 add and remove users and groups
ii consolekit 0.4.4-1 framework for defining and trackin
ii libasound2 1.0.23-2.1 shared library for ALSA applicatio
ii libasyncns0 0.8-1 Asyncronous name service query lib
ii libc6 2.11.2-13 Embedded GNU C Library: Shared lib
ii libcap2 1:2.20-1 support for getting/setting POSIX.
ii libdbus-1-3 1.4.6-1 simple interprocess messaging syst
ii libgdbm3 1.8.3-9 GNU dbm database routines (runtime
ii libice6 2:1.0.7-1 X11 Inter-Client Exchange library
ii libltdl7 2.4-1 A system independent dlopen wrappe
ii libpulse0 0.9.22-1.1 PulseAudio client libraries
ii libsamplerate0 0.1.7-3 Audio sample rate conversion libra
ii libsm6 2:1.2.0-1 X11 Session Management library
ii libsndfile1 1.0.24-1 Library for reading/writing audio
ii libspeexdsp1 1.2~rc1-1 The Speex extended runtime library
ii libudev0 167-1 libudev shared library
ii libwrap0 7.6.q-19 Wietse Venema's TCP wrappers libra
ii libx11-6 2:1.4.2-1 X11 client-side library
ii libx11-xcb1 2:1.4.2-1 Xlib/XCB interface library
ii libxcb-atom1 0.3.6-1 utility libraries for X C Binding
ii libxcb1 1.7-2 X C Binding
ii libxtst6 2:1.2.0-1 X11 Testing -- Record extension li
ii lsb-base 3.2-27 Linux Standard Base 3.2 init scrip
ii udev 167-1 /dev/ and hotplug management daemo
Versions of packages pulseaudio recommends:
ii gstreamer0.10-pulseaudio 0.10.28-3 GStreamer plugin for PulseAudio
ii libasound2-plugins 1.0.23-1+b1 ALSA library additional plugins
ii pulseaudio-esound-compat 0.9.22-1.1 PulseAudio ESD compatibility layer
ii pulseaudio-module-x11 0.9.22-1.1 X11 module for PulseAudio sound se
Versions of packages pulseaudio suggests:
pn paman <none> (no description available)
pn paprefs <none> (no description available)
pn pavucontrol <none> (no description available)
pn pavumeter <none> (no description available)
ii pulseaudio-utils 0.9.22-1.1 Command line tools for the PulseAu
pn rtkit <none> (no description available)
-- no debconf information
--
.''`. Josselin Mouette
: :' :
`. `' “If you behave this way because you are blackmailed by someone,
`- […] I will see what I can do for you.” -- Jörg Schilling
diff -u pulseaudio-0.9.22/debian/pulseaudio.install pulseaudio-0.9.22/debian/pulseaudio.install
--- pulseaudio-0.9.22/debian/pulseaudio.install
+++ pulseaudio-0.9.22/debian/pulseaudio.install
@@ -28,6 +28,7 @@
usr/lib/pulse-*/modules/module-default-device-restore.so
usr/lib/pulse-*/modules/module-detect.so
usr/lib/pulse-*/modules/module-esound-sink.so
+usr/lib/pulse-*/modules/module-gnome-session.so
usr/lib/pulse-*/modules/module-http-protocol-tcp.so
usr/lib/pulse-*/modules/module-http-protocol-unix.so
usr/lib/pulse-*/modules/module-intended-roles.so
diff -u pulseaudio-0.9.22/debian/changelog pulseaudio-0.9.22/debian/changelog
--- pulseaudio-0.9.22/debian/changelog
+++ pulseaudio-0.9.22/debian/changelog
@@ -1,3 +1,17 @@
+pulseaudio (0.9.22-1.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/0003_Set-ALSA-config-for-GNOME.patch: new patch.
+ + Include a new module that sets an ALSA config through the GNOME
+ Setenv mechanism, avoiding the need for a custom .asoundrc file.
+ + Load it at startup.
+ + Move pulseaudio to Initialization phase for GNOME, so that Setenv
+ actually works.
+ * debian/pulseaudio.install: install the module.
+ * autoreconf.patch: as the name says.
+
+ -- Josselin Mouette <j...@debian.org> Sat, 16 Apr 2011 16:10:52 +0200
+
pulseaudio (0.9.22-1) experimental; urgency=low
* New upstream release
diff -u pulseaudio-0.9.22/debian/patches/series pulseaudio-0.9.22/debian/patches/series
--- pulseaudio-0.9.22/debian/patches/series
+++ pulseaudio-0.9.22/debian/patches/series
@@ -2,0 +3,2 @@
+0003_Set-ALSA-config-for-GNOME.patch
+autoreconf.patch
only in patch2:
unchanged:
--- pulseaudio-0.9.22.orig/debian/patches/0003_Set-ALSA-config-for-GNOME.patch
+++ pulseaudio-0.9.22/debian/patches/0003_Set-ALSA-config-for-GNOME.patch
@@ -0,0 +1,234 @@
+Index: pulseaudio-0.9.22/src/Makefile.am
+===================================================================
+--- pulseaudio-0.9.22.orig/src/Makefile.am 2011-04-16 16:09:34.983195668 +0200
++++ pulseaudio-0.9.22/src/Makefile.am 2011-04-16 16:15:51.217034854 +0200
+@@ -31,6 +31,7 @@ pulselibexecdir=$(libexecdir)/pulse
+ xdgautostartdir=$(sysconfdir)/xdg/autostart
+ alsaprofilesetsdir=$(datadir)/pulseaudio/alsa-mixer/profile-sets
+ alsapathsdir=$(datadir)/pulseaudio/alsa-mixer/paths
++asoundrcdir=$(datadir)/pulseaudio
+ dbuspolicydir=$(sysconfdir)/dbus-1/system.d
+
+ ###################################
+@@ -84,7 +85,8 @@ AM_CFLAGS = \
+ -DPULSE_LOCALEDIR=\"$(pulselocaledir)\" \
+ -DPA_MACHINE_ID=\"$(localstatedir)/lib/dbus/machine-id\" \
+ -DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \
+- -DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\"
++ -DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\" \
++ -DPA_ASOUNDRC_DIR=\"$(asoundrcdir)\"
+
+ AM_LIBADD = $(PTHREAD_LIBS) $(INTLLIBS)
+ AM_LDADD = $(PTHREAD_LIBS) $(INTLLIBS)
+@@ -996,7 +998,8 @@ libavahi_wrap_la_LIBADD = $(AM_LIBADD) $
+ if HAVE_DBUS
+ # Serveral module (e.g. libalsa-util.la)
+ modlibexec_LTLIBRARIES += \
+- module-console-kit.la
++ module-console-kit.la \
++ module-gnome-session.la
+ endif
+
+ modlibexec_LTLIBRARIES += \
+@@ -1248,6 +1251,7 @@ SYMDEF_FILES = \
+ modules/raop/module-raop-sink-symdef.h \
+ modules/raop/module-raop-discover-symdef.h \
+ modules/gconf/module-gconf-symdef.h \
++ modules/gnome/module-gnome-session-symdef.h \
+ modules/module-position-event-sounds-symdef.h \
+ modules/module-augment-properties-symdef.h \
+ modules/module-cork-music-on-phone-symdef.h \
+@@ -1704,6 +1708,17 @@ module_rygel_media_server_la_LDFLAGS = $
+ module_rygel_media_server_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la libprotocol-http.la
+ module_rygel_media_server_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+
++# GNOME
++module_gnome_session_la_SOURCES = modules/gnome/module-gnome-session.c
++module_gnome_session_la_LDFLAGS = $(MODULE_LDFLAGS)
++module_gnome_session_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
++module_gnome_session_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
++
++if HAVE_DBUS
++asoundrc_DATA = modules/gnome/asoundrc
++endif
++
++
+ ###################################
+ # Some minor stuff #
+ ###################################
+Index: pulseaudio-0.9.22/src/daemon/pulseaudio.desktop.in
+===================================================================
+--- pulseaudio-0.9.22.orig/src/daemon/pulseaudio.desktop.in 2011-04-16 16:09:35.055196026 +0200
++++ pulseaudio-0.9.22/src/daemon/pulseaudio.desktop.in 2011-04-16 16:13:53.240458241 +0200
+@@ -9,3 +9,4 @@ Type=Application
+ NotShowIn=KDE;
+ Categories=
+ GenericName=
++X-GNOME-Autostart-Phase=Initialization
+Index: pulseaudio-0.9.22/src/daemon/start-pulseaudio-x11.in
+===================================================================
+--- pulseaudio-0.9.22.orig/src/daemon/start-pulseaudio-x11.in 2011-04-16 16:09:35.015195831 +0200
++++ pulseaudio-0.9.22/src/daemon/start-pulseaudio-x11.in 2011-04-16 16:13:53.240458241 +0200
+@@ -31,4 +31,7 @@ if [ x"$DISPLAY" != x ] ; then
+ if [ x"$SESSION_MANAGER" != x ] ; then
+ @PACTL_BINARY@ load-module module-x11-xsmp "display=$DISPLAY session_manager=$SESSION_MANAGER" > /dev/null
+ fi
++ if [ x"$GNOME_DESKTOP_SESSION_ID" != x ]; then
++ @PACTL_BINARY@ load-module module-gnome-session > /dev/null
++ fi
+ fi
+Index: pulseaudio-0.9.22/src/modules/gnome/asoundrc
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ pulseaudio-0.9.22/src/modules/gnome/asoundrc 2011-04-16 16:13:53.240458241 +0200
+@@ -0,0 +1,8 @@
++pcm.!default {
++ type pulse
++ hint.description "PulseAudio output"
++}
++
++ctl.!default {
++ type pulse
++}
+Index: pulseaudio-0.9.22/src/modules/gnome/module-gnome-session.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ pulseaudio-0.9.22/src/modules/gnome/module-gnome-session.c 2011-04-16 16:13:53.240458241 +0200
+@@ -0,0 +1,103 @@
++/***
++ This file is part of PulseAudio.
++
++ Copyright 2011 Josselin Mouette
++
++ PulseAudio is free software; you can redistribute it and/or modify
++ it under the terms of the GNU Lesser General Public License as published
++ by the Free Software Foundation; either version 2.1 of the License,
++ or (at your option) any later version.
++
++ PulseAudio is distributed in the hope that it will be useful, but
++ WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public License
++ along with PulseAudio; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
++ USA.
++***/
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include <pulsecore/core-error.h>
++#include <pulsecore/module.h>
++#include <pulsecore/log.h>
++#include <pulsecore/modargs.h>
++#include <pulsecore/dbus-shared.h>
++
++#include "module-gnome-session-symdef.h"
++
++PA_MODULE_AUTHOR("Josselin Mouette");
++PA_MODULE_DESCRIPTION("Pass the ALSA configuration to the GNOME session manager");
++PA_MODULE_VERSION(PACKAGE_VERSION);
++PA_MODULE_LOAD_ONCE(TRUE);
++
++static const char* const valid_modargs[] = {
++ NULL
++};
++
++int pa__init(pa_module*m) {
++ DBusError error;
++ pa_dbus_connection *connection;
++ pa_modargs *ma;
++ int ret = -1;
++ const char *variable = "ALSA_CONFIG_PATH";
++ const char *value = PA_ASOUNDRC_DIR "/asoundrc";
++ DBusMessage *msg = NULL, *reply = NULL;
++
++ pa_assert(m);
++
++ dbus_error_init(&error);
++
++ if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
++ pa_log("Failed to parse module arguments");
++ goto fail;
++ }
++
++ if (!(connection = pa_dbus_bus_get(m->core, DBUS_BUS_SESSION, &error)) || dbus_error_is_set(&error)) {
++ pa_log_error("Unable to contact D-Bus session bus: %s: %s", error.name, error.message);
++ goto fail;
++ }
++
++ if (!(msg = dbus_message_new_method_call("org.gnome.SessionManager", "/org/gnome/SessionManager", "org.gnome.SessionManager", "Setenv"))) {
++ pa_log("Failed to allocate Setenv() method call.");
++ goto fail;
++ }
++
++ if (!(dbus_message_append_args(msg, DBUS_TYPE_STRING, &variable, DBUS_TYPE_STRING, &value, DBUS_TYPE_INVALID))) {
++ pa_log("Failed to append arguments to Setenv() method call.");
++ goto fail;
++ }
++
++ if (!(reply = dbus_connection_send_with_reply_and_block(pa_dbus_connection_get(connection), msg, -1, &error))) {
++ pa_log("Setenv() call failed: %s: %s", error.name, error.message);
++ goto fail;
++ }
++
++ if (dbus_set_error_from_message (&error, reply)) {
++ pa_log("Setenv() call replied with an error: %s: %s", error.name, error.message);
++ }
++
++ ret = 0;
++
++fail:
++ if (msg)
++ dbus_message_unref(msg);
++
++ if (reply)
++ dbus_message_unref(reply);
++
++ if (ma)
++ pa_modargs_free(ma);
++
++ if (connection)
++ pa_dbus_connection_unref(connection);
++
++ dbus_error_free(&error);
++
++ return ret;
++}
+Index: pulseaudio-0.9.22/src/modules/gnome/module-gnome-session-symdef.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ pulseaudio-0.9.22/src/modules/gnome/module-gnome-session-symdef.h 2011-04-16 16:22:18.102926350 +0200
+@@ -0,0 +1,29 @@
++#ifndef foomodulegnomesessionsymdeffoo
++#define foomodulegnomesessionsymdeffoo
++
++#include <pulsecore/core.h>
++#include <pulsecore/module.h>
++#include <pulsecore/macro.h>
++
++#define pa__init module_gnome_session_LTX_pa__init
++#define pa__done module_gnome_session_LTX_pa__done
++#define pa__get_author module_gnome_session_LTX_pa__get_author
++#define pa__get_description module_gnome_session_LTX_pa__get_description
++#define pa__get_usage module_gnome_session_LTX_pa__get_usage
++#define pa__get_version module_gnome_session_LTX_pa__get_version
++#define pa__get_deprecated module_gnome_session_LTX_pa__get_deprecated
++#define pa__load_once module_gnome_session_LTX_pa__load_once
++#define pa__get_n_used module_gnome_session_LTX_pa__get_n_used
++
++int pa__init(pa_module*m);
++void pa__done(pa_module*m);
++int pa__get_n_used(pa_module*m);
++
++const char* pa__get_author(void);
++const char* pa__get_description(void);
++const char* pa__get_usage(void);
++const char* pa__get_version(void);
++const char* pa__get_deprecated(void);
++pa_bool_t pa__load_once(void);
++
++#endif
only in patch2:
unchanged:
--- pulseaudio-0.9.22.orig/debian/patches/autoreconf.patch
+++ pulseaudio-0.9.22/debian/patches/autoreconf.patch
@@ -0,0 +1,856 @@
+Index: pulseaudio-0.9.22/aclocal.m4
+===================================================================
+--- pulseaudio-0.9.22.orig/aclocal.m4 2011-04-16 16:18:40.041860334 +0200
++++ pulseaudio-0.9.22/aclocal.m4 2011-04-16 16:17:27.637506360 +0200
+@@ -13,8 +13,8 @@
+
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
+-[m4_warning([this file was generated for autoconf 2.66.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
++[m4_warning([this file was generated for autoconf 2.67.
+ You have another version of autoconf. It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+@@ -589,7 +589,7 @@ $$1_PKG_ERRORS
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-_PKG_TEXT])
++_PKG_TEXT])[]dnl
+ ])
+ elif test $pkg_failed = untried; then
+ AC_MSG_RESULT([no])
+@@ -600,7 +600,7 @@ path to pkg-config.
+
+ _PKG_TEXT
+
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+ ])
+ else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+Index: pulseaudio-0.9.22/configure
+===================================================================
+--- pulseaudio-0.9.22.orig/configure 2011-04-16 16:18:39.933859796 +0200
++++ pulseaudio-0.9.22/configure 2011-04-16 16:17:30.693521297 +0200
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.66 for pulseaudio 0.9.22.
++# Generated by GNU Autoconf 2.67 for pulseaudio 0.9.22.
+ #
+ # Report bugs to <mzchyfrnhqvb (at) 0pointer (dot) net>.
+ #
+@@ -938,7 +938,6 @@ enable_fast_install
+ with_gnu_ld
+ enable_libtool_lock
+ enable_largefile
+-with_gnu_ld
+ enable_rpath
+ with_libiconv_prefix
+ enable_nls
+@@ -986,7 +985,6 @@ LDFLAGS
+ LIBS
+ CPPFLAGS
+ CPP
+-CPPFLAGS
+ PKG_CONFIG
+ PKG_CONFIG_PATH
+ PKG_CONFIG_LIBDIR
+@@ -1086,8 +1084,9 @@ do
+ fi
+
+ case $ac_option in
+- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+- *) ac_optarg=yes ;;
++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++ *=) ac_optarg= ;;
++ *) ac_optarg=yes ;;
+ esac
+
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+@@ -1853,7 +1852,7 @@ test -n "$ac_init_help" && exit $ac_stat
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ pulseaudio configure 0.9.22
+-generated by GNU Autoconf 2.66
++generated by GNU Autoconf 2.67
+
+ Copyright (C) 2010 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+@@ -1925,7 +1924,7 @@ $as_echo "$ac_try_echo"; } >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } >/dev/null && {
++ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+@@ -1988,7 +1987,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+ ac_header_preproc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+ $as_echo "$ac_header_preproc" >&6; }
+
+@@ -2322,7 +2321,7 @@ This file contains any messages produced
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by pulseaudio $as_me 0.9.22, which was
+-generated by GNU Autoconf 2.66. Invocation command line was
++generated by GNU Autoconf 2.67. Invocation command line was
+
+ $ $0 $@
+
+@@ -2580,7 +2579,7 @@ $as_echo "$as_me: loading site script $a
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "failed to load site script $ac_site_file
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ done
+
+@@ -2886,11 +2885,11 @@ am_lf='
+ '
+ case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+ esac
+ case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+ esac
+
+ # Do `set' in a subshell so we don't clobber the current shell's
+@@ -3416,7 +3415,7 @@ fi
+ $as_echo "$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+ esac
+ build=$ac_cv_build
+ ac_save_IFS=$IFS; IFS='-'
+@@ -3449,7 +3448,7 @@ fi
+ $as_echo "$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+ esac
+ host=$ac_cv_host
+ ac_save_IFS=$IFS; IFS='-'
+@@ -3820,7 +3819,7 @@ fi
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -3935,7 +3934,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error 77 "C compiler cannot create executables
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+@@ -3978,7 +3977,7 @@ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+@@ -4037,7 +4036,7 @@ $as_echo "$ac_try_echo"; } >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ fi
+ fi
+@@ -4089,7 +4088,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+@@ -4844,7 +4843,7 @@ else
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -4860,11 +4859,11 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+ break
+ fi
+@@ -4903,7 +4902,7 @@ else
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -4919,18 +4918,18 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+
+ ac_ext=c
+@@ -5561,7 +5560,7 @@ if test "${enable_atomic_arm_linux_helpe
+ case "${enableval}" in
+ yes) atomic_arm_linux_helpers=yes ;;
+ no) atomic_arm_linux_helpers=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-atomic-arm-linux-helpers" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-atomic-arm-linux-helpers" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -5579,7 +5578,7 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ ;;
+ no) ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-atomic-arm-linux-helpers" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-atomic-arm-linux-helpers" "$LINENO" 5 ;;
+ esac
+
+ fi
+@@ -5591,7 +5590,7 @@ if test "${enable_netbsd_atomic_ops+set}
+ case "${enableval}" in
+ yes) atomic_netbsd_helpers=yes ;;
+ no) atomic_netbsd_helpers=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --enable-netbsd-atomic-ops" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --enable-netbsd-atomic-ops" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -13219,7 +13218,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUI
+ ;; #(
+ *)
+ as_fn_error $? "unknown endianness
+- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
++ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
+
+ ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+@@ -17885,7 +17884,7 @@ if test "${enable_x11+set}" = set; then
+ case "${enableval}" in
+ yes) x11=yes ;;
+ no) x11=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-x11" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-x11" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -18162,7 +18161,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables LIBSNDFILE_CFLAGS
+ and LIBSNDFILE_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -18177,8 +18175,7 @@ and LIBSNDFILE_LIBS to avoid the need to
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ LIBSNDFILE_CFLAGS=$pkg_cv_LIBSNDFILE_CFLAGS
+ LIBSNDFILE_LIBS=$pkg_cv_LIBSNDFILE_LIBS
+@@ -18256,7 +18253,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables LIBSPEEX_CFLAGS
+ and LIBSPEEX_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -18271,8 +18267,7 @@ and LIBSPEEX_LIBS to avoid the need to c
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ LIBSPEEX_CFLAGS=$pkg_cv_LIBSPEEX_CFLAGS
+ LIBSPEEX_LIBS=$pkg_cv_LIBSPEEX_LIBS
+@@ -18324,7 +18319,7 @@ if test "${enable_samplerate+set}" = set
+ case "${enableval}" in
+ yes) samplerate=yes ;;
+ no) samplerate=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-samplerate" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-samplerate" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -18676,7 +18671,7 @@ if test "${enable_oss_output+set}" = set
+ case "${enableval}" in
+ yes) oss_output=yes ;;
+ no) oss_output=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-oss-output" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-oss-output" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -18690,7 +18685,7 @@ if test "${enable_oss_wrapper+set}" = se
+ case "${enableval}" in
+ yes) oss_wrapper=yes ;;
+ no) oss_wrapper=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-oss-wrapper" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-oss-wrapper" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -18760,7 +18755,7 @@ if test "${enable_alsa+set}" = set; then
+ case "${enableval}" in
+ yes) alsa=yes ;;
+ no) alsa=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-alsa" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-alsa" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -18877,7 +18872,7 @@ if test "${enable_solaris+set}" = set; t
+ case "${enableval}" in
+ yes) solaris=yes ;;
+ no) solaris=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-solaris" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-solaris" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -18932,7 +18927,7 @@ if test "${enable_glib2+set}" = set; the
+ case "${enableval}" in
+ yes) glib2=yes ;;
+ no) glib2=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-glib2" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-glib2" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -19050,7 +19045,7 @@ if test "${enable_gtk2+set}" = set; then
+ case "${enableval}" in
+ yes) gtk2=yes ;;
+ no) gtk2=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-gtk2" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-gtk2" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -19168,7 +19163,7 @@ if test "${enable_gconf+set}" = set; the
+ case "${enableval}" in
+ yes) gconf=yes ;;
+ no) gconf=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-gconf" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-gconf" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -19280,7 +19275,7 @@ if test "${enable_avahi+set}" = set; the
+ case "${enableval}" in
+ yes) avahi=yes ;;
+ no) avahi=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-avahi" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-avahi" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -19392,7 +19387,7 @@ if test "${enable_jack+set}" = set; then
+ case "${enableval}" in
+ yes) jack=yes ;;
+ no) jack=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-jack" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-jack" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -19504,7 +19499,7 @@ if test "${enable_asyncns+set}" = set; t
+ case "${enableval}" in
+ yes) asyncns=yes ;;
+ no) asyncns=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-asyncns" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-asyncns" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -19622,7 +19617,7 @@ if test "${enable_tcpwrap+set}" = set; t
+ case "${enableval}" in
+ yes) tcpwrap=yes ;;
+ no) tcpwrap=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-tcpwrap" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-tcpwrap" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -19684,7 +19679,7 @@ if test "${enable_lirc+set}" = set; then
+ case "${enableval}" in
+ yes) lirc=yes ;;
+ no) lirc=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-lirc" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-lirc" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -19773,7 +19768,7 @@ if test "${enable_hal+set}" = set; then
+ case "${enableval}" in
+ yes) hal=yes ;;
+ no) hal=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-hal" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-hal" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -19889,7 +19884,7 @@ if test "${enable_udev+set}" = set; then
+ case "${enableval}" in
+ yes) udev=yes ;;
+ no) udev=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-udev" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-udev" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -20005,7 +20000,7 @@ if test "${enable_hal_compat+set}" = set
+ case "${enableval}" in
+ yes) halcompat=yes ;;
+ no) halcompat=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-hal-compat" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-hal-compat" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -20039,7 +20034,7 @@ if test "${enable_bluez+set}" = set; the
+ case "${enableval}" in
+ yes) bluez=yes ;;
+ no) bluez=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-bluez" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-bluez" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -20150,7 +20145,7 @@ if test "${enable_dbus+set}" = set; then
+ case "${enableval}" in
+ yes) dbus=yes ;;
+ no) dbus=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-dbus" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-dbus" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -20286,7 +20281,7 @@ if test "${enable_ipv6+set}" = set; then
+ case "${enableval}" in
+ yes) ipv6=yes ;;
+ no) ipv6=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-ipv6" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-ipv6" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -20311,7 +20306,7 @@ if test "${enable_openssl+set}" = set; t
+ case "${enableval}" in
+ yes) openssl=yes ;;
+ no) openssl=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-openssl" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-openssl" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -20427,7 +20422,7 @@ if test "${enable_manpages+set}" = set;
+ enableval=$enable_manpages; case "${enableval}" in
+ yes) manpages=yes ;;
+ no) manpages=no ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-manpages" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-manpages" "$LINENO" 5 ;;
+ esac
+ else
+ manpages=yes
+@@ -20505,7 +20500,7 @@ if test "${enable_per_user_esound_socket
+ case "${enableval}" in
+ yes) per_user_esound_socket=1 ;;
+ no) per_user_esound_socket=0 ;;
+- *) as_fn_error $? "bad value ${enableval} for --disable-per-user-esound-socket" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-per-user-esound-socket" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -21284,7 +21279,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+ # values after options handling.
+ ac_log="
+ This file was extended by pulseaudio $as_me 0.9.22, which was
+-generated by GNU Autoconf 2.66. Invocation command line was
++generated by GNU Autoconf 2.67. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -21350,7 +21345,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ pulseaudio config.status 0.9.22
+-configured by $0, generated by GNU Autoconf 2.66,
++configured by $0, generated by GNU Autoconf 2.67,
+ with options \\"\$ac_cs_config\\"
+
+ Copyright (C) 2010 Free Software Foundation, Inc.
+@@ -21371,11 +21366,16 @@ ac_need_defaults=:
+ while test $# != 0
+ do
+ case $1 in
+- --*=*)
++ --*=?*)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+ ac_shift=:
+ ;;
++ --*=)
++ ac_option=`expr "X$1" : 'X\([^=]*\)='`
++ ac_optarg=
++ ac_shift=:
++ ;;
+ *)
+ ac_option=$1
+ ac_optarg=$2
+@@ -21397,6 +21397,7 @@ do
+ $ac_shift
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++ '') as_fn_error $? "missing file argument" ;;
+ esac
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
+ ac_need_defaults=false;;
+@@ -21754,7 +21755,7 @@ do
+ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+ "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
+
+- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+ esac
+ done
+
+@@ -22070,7 +22071,7 @@ do
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
+@@ -22098,7 +22099,7 @@ do
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+ esac
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append ac_file_inputs " '$ac_f'"
+@@ -22125,7 +22126,7 @@ $as_echo "$as_me: creating $ac_file" >&6
+
+ case $ac_tag in
+ *:-:* | *:-) cat >"$tmp/stdin" \
+- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ esac
+ ;;
+ esac
+Index: pulseaudio-0.9.22/src/Makefile.in
+===================================================================
+--- pulseaudio-0.9.22.orig/src/Makefile.in 2011-04-16 16:18:40.257861392 +0200
++++ pulseaudio-0.9.22/src/Makefile.in 2011-04-16 16:17:35.401544320 +0200
+@@ -176,7 +176,8 @@ TESTS = mainloop-test$(EXEEXT) strlist-t
+
+ # Serveral module (e.g. libalsa-util.la)
+ @HAVE_DBUS_TRUE@am__append_45 = \
+-@HAVE_DBUS_TRUE@ module-console-kit.la
++@HAVE_DBUS_TRUE@ module-console-kit.la \
++@HAVE_DBUS_TRUE@ module-gnome-session.la
+
+
+ # See comment at librtp.la above
+@@ -330,9 +331,10 @@ am__base_list = \
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(modlibexecdir)" \
+ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pulselibexecdir)" \
+ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(alsapathsdir)" \
+- "$(DESTDIR)$(alsaprofilesetsdir)" "$(DESTDIR)$(dbuspolicydir)" \
+- "$(DESTDIR)$(pulseconfdir)" "$(DESTDIR)$(udevrulesdir)" \
+- "$(DESTDIR)$(xdgautostartdir)" "$(DESTDIR)$(pulseincludedir)"
++ "$(DESTDIR)$(alsaprofilesetsdir)" "$(DESTDIR)$(asoundrcdir)" \
++ "$(DESTDIR)$(dbuspolicydir)" "$(DESTDIR)$(pulseconfdir)" \
++ "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(xdgautostartdir)" \
++ "$(DESTDIR)$(pulseincludedir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES) $(modlibexec_LTLIBRARIES) \
+ $(noinst_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -1117,6 +1119,19 @@ module_gconf_la_LINK = $(LIBTOOL) $(AM_V
+ $(module_gconf_la_CFLAGS) $(CFLAGS) $(module_gconf_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
+ @HAVE_GCONF_TRUE@am_module_gconf_la_rpath = -rpath $(modlibexecdir)
++module_gnome_session_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
++ $(am__DEPENDENCIES_1) libpulsecore-@PA_MAJORMINORMICRO@.la \
++ libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
++am_module_gnome_session_la_OBJECTS = \
++ module_gnome_session_la-module-gnome-session.lo
++module_gnome_session_la_OBJECTS = \
++ $(am_module_gnome_session_la_OBJECTS)
++module_gnome_session_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
++ $(module_gnome_session_la_CFLAGS) $(CFLAGS) \
++ $(module_gnome_session_la_LDFLAGS) $(LDFLAGS) -o $@
++@HAVE_DBUS_TRUE@am_module_gnome_session_la_rpath = -rpath \
++@HAVE_DBUS_TRUE@ $(modlibexecdir)
+ @HAVE_HAL_COMPAT_FALSE@module_hal_detect_la_DEPENDENCIES = \
+ @HAVE_HAL_COMPAT_FALSE@ $(am__DEPENDENCIES_2) \
+ @HAVE_HAL_COMPAT_FALSE@ $(am__DEPENDENCIES_1) \
+@@ -2106,6 +2121,7 @@ SOURCES = $(libalsa_util_la_SOURCES) $(l
+ $(module_esound_protocol_tcp_la_SOURCES) \
+ $(module_esound_protocol_unix_la_SOURCES) \
+ $(module_esound_sink_la_SOURCES) $(module_gconf_la_SOURCES) \
++ $(module_gnome_session_la_SOURCES) \
+ $(module_hal_detect_la_SOURCES) \
+ $(module_http_protocol_tcp_la_SOURCES) \
+ $(module_http_protocol_unix_la_SOURCES) \
+@@ -2202,6 +2218,7 @@ DIST_SOURCES = $(am__libalsa_util_la_SOU
+ $(module_esound_protocol_tcp_la_SOURCES) \
+ $(module_esound_protocol_unix_la_SOURCES) \
+ $(module_esound_sink_la_SOURCES) $(module_gconf_la_SOURCES) \
++ $(module_gnome_session_la_SOURCES) \
+ $(am__module_hal_detect_la_SOURCES_DIST) \
+ $(module_http_protocol_tcp_la_SOURCES) \
+ $(module_http_protocol_unix_la_SOURCES) \
+@@ -2262,8 +2279,9 @@ DIST_SOURCES = $(am__libalsa_util_la_SOU
+ $(sync_playback_SOURCES) $(thread_mainloop_test_SOURCES) \
+ $(thread_test_SOURCES) $(usergroup_test_SOURCES) \
+ $(utf8_test_SOURCES) $(vector_test_SOURCES) $(voltest_SOURCES)
+-DATA = $(alsapaths_DATA) $(alsaprofilesets_DATA) $(dbuspolicy_DATA) \
+- $(pulseconf_DATA) $(udevrules_DATA) $(xdgautostart_DATA)
++DATA = $(alsapaths_DATA) $(alsaprofilesets_DATA) $(asoundrc_DATA) \
++ $(dbuspolicy_DATA) $(pulseconf_DATA) $(udevrules_DATA) \
++ $(xdgautostart_DATA)
+ am__pulseinclude_HEADERS_DIST = pulse/cdecl.h pulse/channelmap.h \
+ pulse/context.h pulse/def.h pulse/error.h \
+ pulse/ext-device-manager.h pulse/ext-stream-restore.h \
+@@ -2519,6 +2537,7 @@ pulselibexecdir = $(libexecdir)/pulse
+ xdgautostartdir = $(sysconfdir)/xdg/autostart
+ alsaprofilesetsdir = $(datadir)/pulseaudio/alsa-mixer/profile-sets
+ alsapathsdir = $(datadir)/pulseaudio/alsa-mixer/paths
++asoundrcdir = $(datadir)/pulseaudio
+ dbuspolicydir = $(sysconfdir)/dbus-1/system.d
+
+ ###################################
+@@ -2567,7 +2586,8 @@ AM_CFLAGS = \
+ -DPULSE_LOCALEDIR=\"$(pulselocaledir)\" \
+ -DPA_MACHINE_ID=\"$(localstatedir)/lib/dbus/machine-id\" \
+ -DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \
+- -DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\"
++ -DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\" \
++ -DPA_ASOUNDRC_DIR=\"$(asoundrcdir)\"
+
+ AM_LIBADD = $(PTHREAD_LIBS) $(INTLLIBS)
+ AM_LDADD = $(PTHREAD_LIBS) $(INTLLIBS)
+@@ -3184,6 +3204,7 @@ SYMDEF_FILES = \
+ modules/raop/module-raop-sink-symdef.h \
+ modules/raop/module-raop-discover-symdef.h \
+ modules/gconf/module-gconf-symdef.h \
++ modules/gnome/module-gnome-session-symdef.h \
+ modules/module-position-event-sounds-symdef.h \
+ modules/module-augment-properties-symdef.h \
+ modules/module-cork-music-on-phone-symdef.h \
+@@ -3568,6 +3589,13 @@ module_rygel_media_server_la_LDFLAGS = $
+ module_rygel_media_server_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la libprotocol-http.la
+ module_rygel_media_server_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+
++# GNOME
++module_gnome_session_la_SOURCES = modules/gnome/module-gnome-session.c
++module_gnome_session_la_LDFLAGS = $(MODULE_LDFLAGS)
++module_gnome_session_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
++module_gnome_session_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
++@HAVE_DBUS_TRUE@asoundrc_DATA = modules/gnome/asoundrc
++
+ ###################################
+ # Some minor stuff #
+ ###################################
+@@ -3772,6 +3800,8 @@ module-esound-sink.la: $(module_esound_s
+ $(AM_V_CCLD)$(module_esound_sink_la_LINK) -rpath $(modlibexecdir) $(module_esound_sink_la_OBJECTS) $(module_esound_sink_la_LIBADD) $(LIBS)
+ module-gconf.la: $(module_gconf_la_OBJECTS) $(module_gconf_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(module_gconf_la_LINK) $(am_module_gconf_la_rpath) $(module_gconf_la_OBJECTS) $(module_gconf_la_LIBADD) $(LIBS)
++module-gnome-session.la: $(module_gnome_session_la_OBJECTS) $(module_gnome_session_la_DEPENDENCIES)
++ $(AM_V_CCLD)$(module_gnome_session_la_LINK) $(am_module_gnome_session_la_rpath) $(module_gnome_session_la_OBJECTS) $(module_gnome_session_la_LIBADD) $(LIBS)
+ module-hal-detect.la: $(module_hal_detect_la_OBJECTS) $(module_hal_detect_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(module_hal_detect_la_LINK) $(am_module_hal_detect_la_rpath) $(module_hal_detect_la_OBJECTS) $(module_hal_detect_la_LIBADD) $(LIBS)
+ module-http-protocol-tcp.la: $(module_http_protocol_tcp_la_OBJECTS) $(module_http_protocol_tcp_la_DEPENDENCIES)
+@@ -4384,6 +4414,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_esound_protocol_tcp_la-module-protocol-stub.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_esound_protocol_unix_la-module-protocol-stub.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_gconf_la-module-gconf.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_gnome_session_la-module-gnome-session.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_hal_detect_la-module-hal-detect-compat.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_hal_detect_la-module-hal-detect.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_http_protocol_tcp_la-module-protocol-stub.Plo@am__quote@
+@@ -6102,6 +6133,14 @@ module_gconf_la-module-gconf.lo: modules
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_gconf_la_CFLAGS) $(CFLAGS) -c -o module_gconf_la-module-gconf.lo `test -f 'modules/gconf/module-gconf.c' || echo '$(srcdir)/'`modules/gconf/module-gconf.c
+
++module_gnome_session_la-module-gnome-session.lo: modules/gnome/module-gnome-session.c
++@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_gnome_session_la_CFLAGS) $(CFLAGS) -MT module_gnome_session_la-module-gnome-session.lo -MD -MP -MF $(DEPDIR)/module_gnome_session_la-module-gnome-session.Tpo -c -o module_gnome_session_la-module-gnome-session.lo `test -f 'modules/gnome/module-gnome-session.c' || echo '$(srcdir)/'`modules/gnome/module-gnome-session.c
++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/module_gnome_session_la-module-gnome-session.Tpo $(DEPDIR)/module_gnome_session_la-module-gnome-session.Plo
++@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='modules/gnome/module-gnome-session.c' object='module_gnome_session_la-module-gnome-session.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_gnome_session_la_CFLAGS) $(CFLAGS) -c -o module_gnome_session_la-module-gnome-session.lo `test -f 'modules/gnome/module-gnome-session.c' || echo '$(srcdir)/'`modules/gnome/module-gnome-session.c
++
+ module_hal_detect_la-module-hal-detect.lo: modules/module-hal-detect.c
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_hal_detect_la_CFLAGS) $(CFLAGS) -MT module_hal_detect_la-module-hal-detect.lo -MD -MP -MF $(DEPDIR)/module_hal_detect_la-module-hal-detect.Tpo -c -o module_hal_detect_la-module-hal-detect.lo `test -f 'modules/module-hal-detect.c' || echo '$(srcdir)/'`modules/module-hal-detect.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/module_hal_detect_la-module-hal-detect.Tpo $(DEPDIR)/module_hal_detect_la-module-hal-detect.Plo
+@@ -7443,6 +7482,26 @@ uninstall-alsaprofilesetsDATA:
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(alsaprofilesetsdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(alsaprofilesetsdir)" && rm -f $$files
++install-asoundrcDATA: $(asoundrc_DATA)
++ @$(NORMAL_INSTALL)
++ test -z "$(asoundrcdir)" || $(MKDIR_P) "$(DESTDIR)$(asoundrcdir)"
++ @list='$(asoundrc_DATA)'; test -n "$(asoundrcdir)" || list=; \
++ for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; \
++ done | $(am__base_list) | \
++ while read files; do \
++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(asoundrcdir)'"; \
++ $(INSTALL_DATA) $$files "$(DESTDIR)$(asoundrcdir)" || exit $$?; \
++ done
++
++uninstall-asoundrcDATA:
++ @$(NORMAL_UNINSTALL)
++ @list='$(asoundrc_DATA)'; test -n "$(asoundrcdir)" || list=; \
++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++ test -n "$$files" || exit 0; \
++ echo " ( cd '$(DESTDIR)$(asoundrcdir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(asoundrcdir)" && rm -f $$files
+ install-dbuspolicyDATA: $(dbuspolicy_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(dbuspolicydir)" || $(MKDIR_P) "$(DESTDIR)$(dbuspolicydir)"
+@@ -7728,7 +7787,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRA
+ install-binPROGRAMS: install-libLTLIBRARIES
+
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(modlibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pulselibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(alsapathsdir)" "$(DESTDIR)$(alsaprofilesetsdir)" "$(DESTDIR)$(dbuspolicydir)" "$(DESTDIR)$(pulseconfdir)" "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(xdgautostartdir)" "$(DESTDIR)$(pulseincludedir)"; do \
++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(modlibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pulselibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(alsapathsdir)" "$(DESTDIR)$(alsaprofilesetsdir)" "$(DESTDIR)$(asoundrcdir)" "$(DESTDIR)$(dbuspolicydir)" "$(DESTDIR)$(pulseconfdir)" "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(xdgautostartdir)" "$(DESTDIR)$(pulseincludedir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: $(BUILT_SOURCES)
+@@ -7785,9 +7844,9 @@ info: info-am
+ info-am:
+
+ install-data-am: install-alsapathsDATA install-alsaprofilesetsDATA \
+- install-dbuspolicyDATA install-pulseconfDATA \
+- install-pulseincludeHEADERS install-udevrulesDATA \
+- install-xdgautostartDATA
++ install-asoundrcDATA install-dbuspolicyDATA \
++ install-pulseconfDATA install-pulseincludeHEADERS \
++ install-udevrulesDATA install-xdgautostartDATA
+
+ install-dvi: install-dvi-am
+
+@@ -7837,11 +7896,12 @@ ps: ps-am
+ ps-am:
+
+ uninstall-am: uninstall-alsapathsDATA uninstall-alsaprofilesetsDATA \
+- uninstall-binPROGRAMS uninstall-binSCRIPTS \
+- uninstall-dbuspolicyDATA uninstall-libLTLIBRARIES \
+- uninstall-modlibexecLTLIBRARIES uninstall-pulseconfDATA \
+- uninstall-pulseincludeHEADERS uninstall-pulselibexecPROGRAMS \
+- uninstall-udevrulesDATA uninstall-xdgautostartDATA
++ uninstall-asoundrcDATA uninstall-binPROGRAMS \
++ uninstall-binSCRIPTS uninstall-dbuspolicyDATA \
++ uninstall-libLTLIBRARIES uninstall-modlibexecLTLIBRARIES \
++ uninstall-pulseconfDATA uninstall-pulseincludeHEADERS \
++ uninstall-pulselibexecPROGRAMS uninstall-udevrulesDATA \
++ uninstall-xdgautostartDATA
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+ .MAKE: all check check-am install install-am install-exec-am \
+@@ -7854,13 +7914,14 @@ uninstall-am: uninstall-alsapathsDATA un
+ clean-pulselibexecPROGRAMS ctags distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-alsapathsDATA \
+- install-alsaprofilesetsDATA install-am install-binPROGRAMS \
+- install-binSCRIPTS install-data install-data-am \
+- install-dbuspolicyDATA install-dvi install-dvi-am install-exec \
+- install-exec-am install-exec-hook install-html install-html-am \
+- install-info install-info-am install-libLTLIBRARIES \
+- install-man install-modlibexecLTLIBRARIES install-pdf \
+- install-pdf-am install-ps install-ps-am install-pulseconfDATA \
++ install-alsaprofilesetsDATA install-am install-asoundrcDATA \
++ install-binPROGRAMS install-binSCRIPTS install-data \
++ install-data-am install-dbuspolicyDATA install-dvi \
++ install-dvi-am install-exec install-exec-am install-exec-hook \
++ install-html install-html-am install-info install-info-am \
++ install-libLTLIBRARIES install-man \
++ install-modlibexecLTLIBRARIES install-pdf install-pdf-am \
++ install-ps install-ps-am install-pulseconfDATA \
+ install-pulseincludeHEADERS install-pulselibexecPROGRAMS \
+ install-strip install-udevrulesDATA install-xdgautostartDATA \
+ installcheck installcheck-am installdirs maintainer-clean \
+@@ -7868,8 +7929,8 @@ uninstall-am: uninstall-alsapathsDATA un
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-alsapathsDATA \
+ uninstall-alsaprofilesetsDATA uninstall-am \
+- uninstall-binPROGRAMS uninstall-binSCRIPTS \
+- uninstall-dbuspolicyDATA uninstall-hook \
++ uninstall-asoundrcDATA uninstall-binPROGRAMS \
++ uninstall-binSCRIPTS uninstall-dbuspolicyDATA uninstall-hook \
+ uninstall-libLTLIBRARIES uninstall-modlibexecLTLIBRARIES \
+ uninstall-pulseconfDATA uninstall-pulseincludeHEADERS \
+ uninstall-pulselibexecPROGRAMS uninstall-udevrulesDATA \
