Merge lp:~sil2100/ubuntu-seeds/ubuntu-touch.wily-pulseaudio-trust into lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.wily

Proposed by Łukasz Zemczak on 2015-08-18
Status: Merged
Merged at revision: 319
Proposed branch: lp:~sil2100/ubuntu-seeds/ubuntu-touch.wily-pulseaudio-trust
Merge into: lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.wily
Diff against target: 19 lines (+1/-2)
1 file modified
touch-core (+1/-2)
To merge this branch: bzr merge lp:~sil2100/ubuntu-seeds/ubuntu-touch.wily-pulseaudio-trust
Reviewer Review Type Date Requested Status
Martin Pitt 2015-08-18 Approve on 2015-09-18
Review via email: mp+268381@code.launchpad.net

Commit Message

Add pulseaudio-module-trust-store to the seeds for pulseaudio trust-store integration, remove qml-module-qtbluetooth from touch-core as we need to place it in a different place - it's not used anywhere right now anyway.

Description of the Change

Add pulseaudio-module-trust-store to the seeds for pulseaudio trust-store integration, remove qml-module-qtbluetooth from touch-core as we need to place it in a different place - it's not used anywhere right now anyway.

The pulseaudio-module-trust-store binary package is now in wily.

To post a comment you must log in.
Łukasz Zemczak (sil2100) wrote :

This change is already in the vivid overlay-ppa seeds. Now we need to sync it to wily.

Martin Pitt (pitti) wrote :

Merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'touch-core'
2--- touch-core 2015-08-13 05:38:07 +0000
3+++ touch-core 2015-08-18 19:54:11 +0000
4@@ -48,6 +48,7 @@
5 #* ubuntu-touch-customization-hooks
6 * pulseaudio
7 * pulseaudio-module-bluetooth
8+ * pulseaudio-module-trust-store
9 * rtkit
10 * content-hub
11 * ubuntu-location-service-bin
12@@ -71,8 +72,6 @@
13 * udisks2
14 * ciborium
15 * openvpn
16-# For bluetooth file transfer support
17- * qml-module-qtbluetooth
18
19 == Multimedia ==
20

Subscribers

People subscribed via source and target branches