Merge ~hui.wang/pulseaudio/+git/pulseaudio:ubuntu-xenial into ~ubuntu-audio-dev/pulseaudio:ubuntu-xenial

[Hui Wang]

This merge request will work together with my previous merge request (Cherrypick one upstream commit to support audio on the Dell Dock TB16) to fix the bug #1718824.

The previous merge request has been merged to ubuntu-xenial branch, and the conf file has been added to the source repository, but it forgot to add the conf file to build sys, as a result the conf file will not be installed to target dir (/usr/share/pulseaudio/alsa-mixer/profile-sets).

This new merge request just backporting a very simple patch to add the conf file to build sys, it will not introduce any regression. And this simple patch was already merged to pulseaudio upstream.

For artful, we also need to add a similar patch. but there are 3 branches in git://git.launchpad.net/~ubuntu-audio-dev/pulseaudio (ubuntu, ubuntu-artful and ubuntu-pulse11-wip), I don't know which branch should I send the merge request to, could you please tell me.

thx.
Hui.

[Daniel van Vugt (vanvugt)]

Sorry for the delay, I was on vacation.

It appears during that time someone made a little mess of the pulseaudio packages in ubuntu-xenial. I've fixed that up now, but you'll need to merge my changes from git branch ubuntu-xenial and then resubmit this proposal for ubuntu-xenial.

P.S. The branch for artful is 'ubuntu-artful'.

review: Needs Resubmitting

[Daniel van Vugt (vanvugt)]

Please also mention "LP: #1718824" in your commit message when resubmitting.

[Daniel van Vugt (vanvugt)]

P.P.S. You are a member of ~ubuntu-audio-dev so don't need to do merge proposals. You can commit directly to the launchpad branch. :)

[Hui Wang (hui.wang)]

Got it, thank you.

Unmerged commits

df2f3ed... by Hui Wang on 2017-11-23

Backport one upstream commit to add the conf file of TB16 to build sys

The commit number is 2f1dcea3 of pulseaudio upstream.

Otherwise the conf file will not be installed to:
/usr/share/pulseaudio/alsa-mixer/profile-sets/

diff --git a/debian/changelog b/debian/changelog
index 6083bb3..3864631 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pulseaudio (1:8.0-0ubuntu3.6) UNRELEASED; urgency=medium
+
+  * Backport the fix to add the conf file to build-sys
+    - 2f1dcea3: add the Dell dock TB16 configuration to build-sys (LP: #1718824)
+
+ -- Hui Wang <[e-mail]>  Tue, 28 Nov 2017 08:39:27 +0800
+
 pulseaudio (1:8.0-0ubuntu3.5) UNRELEASED; urgency=medium
 
   * Cherrypick fixes for supporting audio on Dell dock TB16:
diff --git a/debian/patches/0803-build-sys-add-the-Dell-dock-TB16-configuration.patch b/debian/patches/0803-build-sys-add-the-Dell-dock-TB16-configuration.patch
new file mode 100644
index 0000000..2675a9f
--- /dev/null
+++ b/debian/patches/0803-build-sys-add-the-Dell-dock-TB16-configuration.patch
@@ -0,0 +1,27 @@
+From 6bdf74c27d92828f71f7343158460393ba260541 Mon Sep 17 00:00:00 2001
+From: Hui Wang <[e-mail]>
+Date: Thu, 23 Nov 2017 08:47:26 +0800
+Subject: [PATCH] build-sys: add the Dell dock TB16 configuration
+
+Signed-off-by: Hui Wang <[e-mail]>
+---
+ src/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b0ca2bc..7a2d361 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1285,7 +1285,8 @@ dist_alsaprofilesets_DATA = \
+ 		modules/alsa/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf \
+ 		modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf \
+ 		modules/alsa/mixer/profile-sets/kinect-audio.conf \
+-		modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf
++		modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf \
++		modules/alsa/mixer/profile-sets/dell-dock-tb16-usb-audio.conf
+ 
+ if HAVE_UDEV
+ dist_udevrules_DATA = \
+-- 
+2.7.4
+
diff --git a/debian/patches/series b/debian/patches/series
index a36df8b..d7ae0e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -60,3 +60,4 @@
 
 # Adding analogue audio on the Dell usb Dock TB16
 0802-alsa-mixer-Add-support-for-usb-audio-in-the-Dell-doc.patch
+0803-build-sys-add-the-Dell-dock-TB16-configuration.patch