Здравствуйте
___ pkg-pulseaudio-devel mailing list pkg-pulseaudio-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-pulseaudio-devel
[pulseaudio] 01/01: Add upstream patches for config.d
This is an automated email from the git hooks/post-receive script. diwic-guest pushed a commit to branch ubuntu in repository pulseaudio. commit 8b6ec105ec542991ea5d3f41d865a693d587b8e5 Author: David HenningssonDate: Thu Dec 17 09:07:17 2015 +0100 Add upstream patches for config.d Signed-off-by: David Henningsson --- debian/changelog | 2 + ...onf-parser-add-support-for-.d-directories.patch | 184 + ...nt-conf-daemon-conf-enable-.d-directories.patch | 127 ++ debian/patches/series | 4 + 4 files changed, 317 insertions(+) diff --git a/debian/changelog b/debian/changelog index 83f6f19..0abb266 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ pulseaudio (1:7.1-1ubuntu3) UNRELEASED; urgency=medium * trust-store: Update translation string + * Cherrypick upstream patches to allow client.conf.d +and daemon.conf.d -- David Henningsson Mon, 30 Nov 2015 16:43:53 +0100 diff --git a/debian/patches/0101-conf-parser-add-support-for-.d-directories.patch b/debian/patches/0101-conf-parser-add-support-for-.d-directories.patch new file mode 100644 index 000..d3bb73e --- /dev/null +++ b/debian/patches/0101-conf-parser-add-support-for-.d-directories.patch @@ -0,0 +1,184 @@ +From 1d7ce901398b4e65bfac991aa7a351ac15c4910e Mon Sep 17 00:00:00 2001 +From: Tanu Kaskinen +Date: Mon, 7 Dec 2015 23:22:41 +0200 +Subject: [PATCH 2/2] conf-parser: add support for .d directories + +This allows a configuration scheme where after loading configuration +from "somefile", the parser loads configuration from files in +directory "somefile.d". This feature needs to be enabled on a per-file +basis, though, and this patch doesn't yet enable the feature for any +files. +--- + src/daemon/daemon-conf.c| 2 +- + src/modules/alsa/alsa-mixer.c | 4 ++-- + src/modules/module-augment-properties.c | 2 +- + src/pulse/client-conf.c | 2 +- + src/pulsecore/conf-parser.c | 42 +++-- + src/pulsecore/conf-parser.h | 8 ++- + 6 files changed, 52 insertions(+), 8 deletions(-) + +diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c +index f94cdeb..306c8cb 100644 +--- a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c +@@ -617,7 +617,7 @@ int pa_daemon_conf_load(pa_daemon_conf *c, const char *filename) { + ci.default_channel_map_set = ci.default_sample_spec_set = false; + ci.conf = c; + +-r = f ? pa_config_parse(c->config_file, f, table, NULL, NULL) : 0; ++r = f ? pa_config_parse(c->config_file, f, table, NULL, false, NULL) : 0; + + if (r >= 0) { + +diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c +index 515b285..1fe2a02 100644 +--- a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c +@@ -2594,7 +2594,7 @@ pa_alsa_path* pa_alsa_path_new(const char *paths_dir, const char *fname, pa_alsa + + fn = pa_maybe_prefix_path(fname, paths_dir); + +-r = pa_config_parse(fn, NULL, items, p->proplist, p); ++r = pa_config_parse(fn, NULL, items, p->proplist, false, p); + pa_xfree(fn); + + if (r < 0) +@@ -4411,7 +4411,7 @@ pa_alsa_profile_set* pa_alsa_profile_set_new(const char *fname, const pa_channel + pa_run_from_build_tree() ? PA_SRCDIR "/modules/alsa/mixer/profile-sets/" : + PA_ALSA_PROFILE_SETS_DIR); + +-r = pa_config_parse(fn, NULL, items, NULL, ps); ++r = pa_config_parse(fn, NULL, items, NULL, false, ps); + pa_xfree(fn); + + if (r < 0) +diff --git a/src/modules/module-augment-properties.c b/src/modules/module-augment-properties.c +index 42b6fd9..541f0e7 100644 +--- a/src/modules/module-augment-properties.c b/src/modules/module-augment-properties.c +@@ -204,7 +204,7 @@ static void update_rule(struct rule *r) { + table[0].data = >application_name; + table[1].data = >icon_name; + +-if (pa_config_parse(fn, NULL, table, NULL, r) < 0) ++if (pa_config_parse(fn, NULL, table, NULL, false, r) < 0) + pa_log_warn("Failed to parse .desktop file %s.", fn); + + pa_xfree(fn); +diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c +index 47fe183..c2ece90 100644 +--- a/src/pulse/client-conf.c b/src/pulse/client-conf.c +@@ -149,7 +149,7 @@ void pa_client_conf_load(pa_client_conf *c, bool load_from_x11, bool load_from_e + + f = pa_open_config_file(DEFAULT_CLIENT_CONFIG_FILE, DEFAULT_CLIENT_CONFIG_FILE_USER, ENV_CLIENT_CONFIG_FILE, ); + if (f) { +-pa_config_parse(fn, f, table, NULL, NULL); ++pa_config_parse(fn, f, table, NULL, false, NULL); + pa_xfree(fn); + fclose(f); + } +diff --git a/src/pulsecore/conf-parser.c
[pulseaudio] branch ubuntu updated (d51f9f3 -> 8b6ec10)
This is an automated email from the git hooks/post-receive script. diwic-guest pushed a change to branch ubuntu in repository pulseaudio. from d51f9f3 trust-store: Update translation string new 8b6ec10 Add upstream patches for config.d The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 + ...onf-parser-add-support-for-.d-directories.patch | 184 + ...nt-conf-daemon-conf-enable-.d-directories.patch | 127 ++ debian/patches/series | 4 + 4 files changed, 317 insertions(+) create mode 100644 debian/patches/0101-conf-parser-add-support-for-.d-directories.patch create mode 100644 debian/patches/0102-client-conf-daemon-conf-enable-.d-directories.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git ___ pkg-pulseaudio-devel mailing list pkg-pulseaudio-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-pulseaudio-devel
[pulseaudio] 02/02: Actually install some files in pulseaudio-module-trust-store
This is an automated email from the git hooks/post-receive script. diwic-guest pushed a commit to branch ubuntu in repository pulseaudio. commit 972dcc2d17bdf547279790f28845f689b571e673 Author: David HenningssonDate: Thu Dec 17 10:26:10 2015 +0100 Actually install some files in pulseaudio-module-trust-store Signed-off-by: David Henningsson --- debian/changelog | 3 ++- debian/pulseaudio-module-trust-store.install | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b55389a..59d738d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ pulseaudio (1:7.1-1ubuntu3) UNRELEASED; urgency=medium * trust-store: Update translation string +Actually ship the .so files in the correct package * Cherrypick upstream patches to allow client.conf.d and daemon.conf.d * debian/patches/0508/0509/0510*.patches -- More patches for bluez5 + ofono + HFP support +- More patches for bluez5 + ofono + HFP support -- David Henningsson Mon, 30 Nov 2015 16:43:53 +0100 diff --git a/debian/pulseaudio-module-trust-store.install b/debian/pulseaudio-module-trust-store.install new file mode 100644 index 000..6c4cf3d --- /dev/null +++ b/debian/pulseaudio-module-trust-store.install @@ -0,0 +1,2 @@ +usr/lib/pulse-*/modules/libtruststore-util.so +usr/lib/pulse-*/modules/module-trust-store.so -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git ___ pkg-pulseaudio-devel mailing list pkg-pulseaudio-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-pulseaudio-devel
[pulseaudio] branch ubuntu updated (8b6ec10 -> 972dcc2)
This is an automated email from the git hooks/post-receive script. diwic-guest pushed a change to branch ubuntu in repository pulseaudio. from 8b6ec10 Add upstream patches for config.d new fae6655 Add more bluez5 + ofono + HFP patches new 972dcc2 Actually install some files in pulseaudio-module-trust-store The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 3 + ...luez5-add-guards-to-prevent-HFP-and-HSP-c.patch | 49 +++ ...luez5-don-t-reactivate-default-profile-wh.patch | 29 ...Further-fixes-for-HFP-A2DP-with-BlueZ-5.x.patch | 156 + debian/patches/series | 3 + debian/pulseaudio-module-trust-store.install | 2 + 6 files changed, 242 insertions(+) create mode 100644 debian/patches/0508-bluetooth-bluez5-add-guards-to-prevent-HFP-and-HSP-c.patch create mode 100644 debian/patches/0509-bluetooth-bluez5-don-t-reactivate-default-profile-wh.patch create mode 100644 debian/patches/0510-Further-fixes-for-HFP-A2DP-with-BlueZ-5.x.patch create mode 100644 debian/pulseaudio-module-trust-store.install -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git ___ pkg-pulseaudio-devel mailing list pkg-pulseaudio-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-pulseaudio-devel
[pulseaudio] 01/01: Release 1:7.1-1ubuntu3
This is an automated email from the git hooks/post-receive script. diwic-guest pushed a commit to branch ubuntu in repository pulseaudio. commit cd60081d26f24d46e059a8975251d422926554b5 Author: David HenningssonDate: Thu Dec 17 12:39:01 2015 +0100 Release 1:7.1-1ubuntu3 Signed-off-by: David Henningsson --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 59d738d..a416e85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pulseaudio (1:7.1-1ubuntu3) UNRELEASED; urgency=medium +pulseaudio (1:7.1-1ubuntu3) xenial; urgency=medium * trust-store: Update translation string Actually ship the .so files in the correct package @@ -7,7 +7,7 @@ pulseaudio (1:7.1-1ubuntu3) UNRELEASED; urgency=medium * debian/patches/0508/0509/0510*.patches - More patches for bluez5 + ofono + HFP support - -- David Henningsson Mon, 30 Nov 2015 16:43:53 +0100 + -- David Henningsson Thu, 17 Dec 2015 12:36:42 +0100 pulseaudio (1:7.1-1ubuntu2) xenial; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git ___ pkg-pulseaudio-devel mailing list pkg-pulseaudio-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-pulseaudio-devel
[pulseaudio] branch ubuntu updated (972dcc2 -> cd60081)
This is an automated email from the git hooks/post-receive script. diwic-guest pushed a change to branch ubuntu in repository pulseaudio. from 972dcc2 Actually install some files in pulseaudio-module-trust-store new cd60081 Release 1:7.1-1ubuntu3 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git ___ pkg-pulseaudio-devel mailing list pkg-pulseaudio-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-pulseaudio-devel
[pulseaudio] annotated tag ubuntu/7.1-1ubuntu3 created (now 2eca57b)
This is an automated email from the git hooks/post-receive script. diwic-guest pushed a change to annotated tag ubuntu/7.1-1ubuntu3 in repository pulseaudio. at 2eca57b (tag) tagging cd60081d26f24d46e059a8975251d422926554b5 (commit) replaces ubuntu/7.1-1ubuntu1 tagged by David Henningsson on Thu Dec 17 12:40:26 2015 +0100 - Log - Ubuntu version 1:1:7.1-1ubuntu3 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQEcBAABAgAGBQJWcp83AAoJEJpJPf6bGjRWyvkH+wZRJSUhphQRv34CCcMvFCc4 CkAA1p+B/Ki4d6mik+1b7T2yozvWHCGR4g7GUK+uH3wmgqhYIMYmnCaNbMAiC52s 8QBsuCHc7GZGMkFHt+TKHjSLC2RLsVuc8jj0O0I4ymlol6zT+pb2RyBbigi9X+YI kHZm3l4+w1R+GyVfVB3ukTKeyQHm78Uc54Z+wVFiJHGvU1IaDE3gm+X0yYfX2ts9 IZgICL4F2dl4qhlgBtk5nlExu6h5S1Uoe4cUarvlziVNrYJdX9mrIdbeu5hiHQVq yZs664yZNoOiP6bdhtAsHlSpaTzfRdJBkHCdgnzD/7Yl269nPGCLVQLdR4ZPlbE= =AR0o -END PGP SIGNATURE- David Henningsson (7): Add bluez5 + ofono + HFP patch set Release 1:7.1-1ubuntu2 trust-store: Update translation string Add upstream patches for config.d Add more bluez5 + ofono + HFP patches Actually install some files in pulseaudio-module-trust-store Release 1:7.1-1ubuntu3 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git ___ pkg-pulseaudio-devel mailing list pkg-pulseaudio-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-pulseaudio-devel