This is an automated email from the git hooks/post-receive script. themuso-guest pushed a commit to branch ubuntu in repository pulseaudio.
commit 2beee482bb1e4eea5b26ded93334cb5caf85b305 Author: Luke Yelavich <[email protected]> Date: Mon Feb 23 09:43:26 2015 +1100 Move config changes from rules file to a patch --- debian/changelog | 10 ++++++++++ debian/patches/0001-volume-config-changes.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 10 ---------- 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8cf6f48..78312c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +pulseaudio (1:6.0-0ubuntu4) UNRELEASED; urgency=medium + + * Move the previously tweaked volume config changes from the rules file + to a patch. We are no longer tweaking settings based on architecture, + so such config changes can now be aplied statically. These settings + were also not being applied since the merge with Debian and updating to + pulse 6. (LP: #1424195) + + -- Luke Yelavich <[email protected]> Mon, 23 Feb 2015 09:41:40 +1100 + pulseaudio (1:6.0-0ubuntu3) vivid; urgency=medium * Adding libwebrtc-audio-processing-dev as build dep again, now in main diff --git a/debian/patches/0001-volume-config-changes.patch b/debian/patches/0001-volume-config-changes.patch new file mode 100644 index 0000000..f19d01f --- /dev/null +++ b/debian/patches/0001-volume-config-changes.patch @@ -0,0 +1,20 @@ +Index: pulseaudio/src/daemon/daemon.conf.in +=================================================================== +--- pulseaudio.orig/src/daemon/daemon.conf.in ++++ pulseaudio/src/daemon/daemon.conf.in +@@ -56,7 +56,7 @@ ifelse(@HAVE_DBUS@, 1, [dnl + ; enable-remixing = yes + ; enable-lfe-remixing = no + +-; flat-volumes = yes ++flat-volumes = no + + ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl + ; rlimit-fsize = -1 +@@ -86,5 +86,5 @@ ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl + ; default-fragment-size-msec = 25 + + ; enable-deferred-volume = yes +-; deferred-volume-safety-margin-usec = 8000 ++deferred-volume-safety-margin-usec = 1 + ; deferred-volume-extra-delay-usec = 0 diff --git a/debian/patches/series b/debian/patches/series index ea7c7c9..d06b361 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,5 @@ # Ubuntu/Debian specific config/fixes +0001-volume-config-changes.patch 0005-dont-load-cork-music-on-phone.patch 0006-load-module-x11-bell.patch 0016-nodisplay-autostart.patch diff --git a/debian/rules b/debian/rules index 8866e47..831e9ac 100755 --- a/debian/rules +++ b/debian/rules @@ -43,20 +43,10 @@ clean:: rm -f debian/pulseaudio.install.kfreebsd-i386 rm -f debian/pulseaudio.install.kfreebsd-amd64 rm -f debian/pulseaudio.install.hurd-i386 - rm -f debian/stamp-post-patches if test -f $(CURDIR)/debian/daemon.conf.in; then \ mv $(CURDIR)/debian/daemon.conf.in $(CURDIR)/src/daemon/daemon.conf.in; \ fi --post-patches:: debian/stamp-post-patches - -debian/stamp-post-patches: - cp $(CURDIR)/src/daemon/daemon.conf.in $(CURDIR)/debian/daemon.conf.in - sed -e 's/; deferred-volume-safety-margin-usec = 8000/deferred-volume-safety-margin-usec = 1/' \ - -e 's/; flat-volumes = yes/flat-volumes = no/' \ - $(CURDIR)/src/daemon/daemon.conf.in - touch debian/stamp-post-patches - # Libs should be in the multi-arch path, but the modules should be in the # normal directory as pulseaudio is foreign DEB_CONFIGURE_EXTRA_FLAGS = --enable-x11 \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git _______________________________________________ pkg-pulseaudio-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-pulseaudio-devel
