Merge lp:~roadmr/ubuntu/precise/checkbox/0.13.9 into lp:ubuntu/precise-proposed/checkbox

[Daniel Manrique]

Hello! This is an update of the checkbox 0.13.8 SRU, taking care of two 0.13.8 bugs that failed verification (one was missing code, so I added it; the code for the other didn't fix the bug and needs more work and a closer look, so I removed it). I also updated the changelog to bump the version to 0.13.9.

Merge requested on -proposed directly, with just the changes that need to be applied on top of 0.13.8. Let me know if this is OK, also I didn't request a "candidate revision" bug as per previous SRU uploads I've requested, but if this needs to be done, also please let me know.

Thanks!

[Didier Roche-Tolomelli (didrocks)]

Everything is perfect Daniel procedure-wise. Thanks, merging it and uploading to -proposed :)

review: Approve

=== modified file 'checkbox/user_interface.py'
--- checkbox/user_interface.py	2012-10-02 17:18:22 +0000
+++ checkbox/user_interface.py	2012-11-20 22:17:32 +0000
@@ -176,7 +176,7 @@
                             subprocess.Popen(sudo_prefix + [browser.group(0), "--new-window", url])
                             return
                         
-                        browser = re.match("(chromium-browser[^\s]*)", preferred_browser)
+                        browser = re.match(".*(chromium-browser[^\s]*)", preferred_browser)
                         if browser:
                             subprocess.Popen(sudo_prefix + [browser.group(0), "--allow-file-access-from-files", url])
                             return

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-02 17:18:22 +0000
+++ debian/changelog	2012-11-20 22:17:32 +0000
@@ -1,3 +1,10 @@
+checkbox (0.13.9) precise-proposed; urgency=low
+
+  * Updated fix for bug #1026614 which was missing some code.
+  * Removed bad fix for bug 990133.
+
+ -- Daniel Manrique <[e-mail]>  Tue, 20 Nov 2012 16:31:02 -0500
+
 checkbox (0.13.8) precise-proposed; urgency=low
 
   * New upstream release (LP: #1061198)

=== modified file 'scripts/camera_test'
--- scripts/camera_test	2012-10-02 17:18:22 +0000
+++ scripts/camera_test	2012-11-20 22:17:32 +0000
@@ -89,11 +89,7 @@
                 self._pipeline.set_state(gst.STATE_PLAYING)
                 time.sleep(3)
                 self._pipeline.set_state(gst.STATE_READY)
-                try:
-                    call(["timeout", "-k", "11", "10", "eog", filename])
-                except CalledProcessError:
-                    pass
-
+                call(["eog", file.name])
 
 def parse_arguments(argv):
     """