Merge lp:~roadmr/checkbox/remove-gconfaudiosink into lp:checkbox

Proposed by Daniel Manrique
Status: Merged
Merged at revision: 1602
Proposed branch: lp:~roadmr/checkbox/remove-gconfaudiosink
Merge into: lp:checkbox
Diff against target: 37 lines (+8/-1) (has conflicts)
2 files modified
debian/changelog (+7/-0)
jobs/audio.txt.in (+1/-1)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~roadmr/checkbox/remove-gconfaudiosink
Reviewer Review Type Date Requested Status
Brendan Donegan (community) Approve
Review via email: mp+120467@code.launchpad.net

Description of the change

Gets rid of the last instance of gconfaudiosink :)

To post a comment you must log in.
1599. By Daniel Manrique

Repushing

Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Well, looks like a pretty trivial change - I can't test this because I have no HDMI audio - but I'm going to assume it does, since the other ones do.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-08-21 18:31:16 +0000
3+++ debian/changelog 2012-08-22 14:09:32 +0000
4@@ -11,6 +11,7 @@
5
6 [ Daniel Manrique ]
7 * jobs/peripheral.txt.in: Fixed a typo in the DSL job. (LP: #1039192)
8+<<<<<<< TREE
9 * jobs/resource.txt.in: Added usb resource that indicates which versions of
10 the protocol are supported (currently only reports for USB 2.0 and 3.0).
11 * scripts/removable_storage_watcher, scripts/removable_storage_test: Added
12@@ -34,6 +35,12 @@
13 of removable_storage_test
14
15 -- Jeff Lane <jeff@ubuntu.com> Mon, 20 Aug 2012 19:49:58 -0400
16+=======
17+ * jobs/audio.txt.in: replaced gconfaudiosink by autoaudiosink (LP: #978895)
18+ and added bogus minor change to aid in diff generation
19+
20+ -- Daniel Manrique <roadmr@ubuntu.com> Mon, 20 Aug 2012 16:40:45 -0400
21+>>>>>>> MERGE-SOURCE
22
23 checkbox (0.14.4) quantal; urgency=low
24
25
26=== modified file 'jobs/audio.txt.in'
27--- jobs/audio.txt.in 2012-08-15 22:22:35 +0000
28+++ jobs/audio.txt.in 2012-08-22 14:09:32 +0000
29@@ -33,7 +33,7 @@
30 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
31 package.name == 'pulseaudio-utils'
32 command:
33- audio_settings store --file=$CHECKBOX_SHARE/pulseaudio_settings; audio_settings set --device=hdmi --volume=50; gst_pipeline_test -t 2 --device hdmi 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! gconfaudiosink'; audio_settings restore --file=$CHECKBOX_SHARE/pulseaudio_settings
34+ audio_settings store --file=$CHECKBOX_SHARE/pulseaudio_settings; audio_settings set --device=hdmi --volume=50; gst_pipeline_test -t 2 --device hdmi 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; audio_settings restore --file=$CHECKBOX_SHARE/pulseaudio_settings
35 _description:
36 PURPOSE:
37 1. HDMI interface verification

Subscribers

People subscribed via source and target branches