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

[Daniel Manrique]

Gets rid of the last instance of gconfaudiosink :)

[lp:~roadmr/checkbox/remove-gconfaudiosink]

1599. By Daniel Manrique on 2012-08-22

Repushing

[Brendan Donegan (brendan-donegan)]

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

=== modified file 'debian/changelog'
--- debian/changelog	2012-08-21 18:31:16 +0000
+++ debian/changelog	2012-08-22 14:09:32 +0000
@@ -11,6 +11,7 @@
 
   [ Daniel Manrique ]
   * jobs/peripheral.txt.in: Fixed a typo in the DSL job. (LP: #1039192)
+<<<<<<< TREE
   * jobs/resource.txt.in: Added usb resource that indicates which versions of
     the protocol are supported (currently only reports for USB 2.0 and 3.0).
   * scripts/removable_storage_watcher, scripts/removable_storage_test: Added
@@ -34,6 +35,12 @@
     of removable_storage_test
 
  -- Jeff Lane <[e-mail]>  Mon, 20 Aug 2012 19:49:58 -0400
+=======
+  * jobs/audio.txt.in: replaced gconfaudiosink by autoaudiosink (LP: #978895)
+    and added bogus minor change to aid in diff generation
+
+ -- Daniel Manrique <[e-mail]>  Mon, 20 Aug 2012 16:40:45 -0400
+>>>>>>> MERGE-SOURCE
 
 checkbox (0.14.4) quantal; urgency=low
 
 
=== modified file 'jobs/audio.txt.in'
--- jobs/audio.txt.in	2012-08-15 22:22:35 +0000
+++ jobs/audio.txt.in	2012-08-22 14:09:32 +0000
@@ -33,7 +33,7 @@
  package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
  package.name == 'pulseaudio-utils'
 command:
- 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
+ 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
 _description:
  PURPOSE:
     1. HDMI interface verification