diff -Nru cheese-3.16.1/debian/changelog cheese-3.16.1/debian/changelog
--- cheese-3.16.1/debian/changelog	2015-06-01 23:02:41.000000000 +0000
+++ cheese-3.16.1/debian/changelog	2015-09-30 09:42:37.000000000 +0000
@@ -1,3 +1,10 @@
+cheese (3.16.1-1ubuntu2) wily; urgency=medium
+
+  * debian/source_cheese.py:
+    - rework a bit to fix issues with the current code (lp: #1486011)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 30 Sep 2015 11:42:16 +0200
+
 cheese (3.16.1-1ubuntu1) wily; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
diff -Nru cheese-3.16.1/debian/control cheese-3.16.1/debian/control
--- cheese-3.16.1/debian/control	2015-06-01 23:02:42.000000000 +0000
+++ cheese-3.16.1/debian/control	2015-09-30 09:42:38.000000000 +0000
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
+Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
 Standards-Version: 3.9.6
 Homepage: https://wiki.gnome.org/Apps/Cheese
 Vcs-Browser: https://code.launchpad.net/~ubuntu-desktop/cheese/ubuntu
diff -Nru cheese-3.16.1/debian/source_cheese.py cheese-3.16.1/debian/source_cheese.py
--- cheese-3.16.1/debian/source_cheese.py	2015-06-01 23:02:41.000000000 +0000
+++ cheese-3.16.1/debian/source_cheese.py	2015-09-30 09:42:37.000000000 +0000
@@ -2,6 +2,7 @@
 import subprocess
 import apport.packaging
 import apport.hookutils
+import stat
 
 HOME = os.path.expanduser("~")
 
@@ -10,13 +11,13 @@
 
     response = ui.information("Before continuing, please close Cheese if it is already running!\n\nCheese will now be started in debugging mode.\n\nTry to reproduce the problem you are facing\nand 'Close' Cheese.")
     ## run cheese in debug mode all the bugs need this!
-    os.popen("env GST_DEBUG=*cheese*:3 cheese -v 2>&1 | tee /dev/tty >>~/.cache/CheeseDebug.txt")
+    os.popen("env GST_DEBUG=*cheese*:3 cheese 2>&1 | tee /dev/tty >>~/.cache/CheeseDebug.txt")
 
     report['CheeseDebug.txt'] = ('.cache/CheeseDebug.txt', False)
-    report['lspci'] = command_output(['lspci', '-vvnn'])
-    report['lsusb'] = command_output(['lsusb'])
+    report['lspci'] = apport.hookutils.command_output(['lspci', '-vvnn'])
+    report['lsusb'] = apport.hookutils.command_output(['lsusb'])
 
-    attach_related_packages(report, [
+    apport.hookutils.attach_related_packages(report, [
         "cheese",
         "cheese-common"
         ])
@@ -31,7 +32,7 @@
     if response[0] == 1: ## the image problems are usually due to bad drivers,so we test direct video input from gstreamer to rule out cheese error
         response = ui.information("A video image will now be displayed directly from your webcam.\n\nPlease observe if it has the same image problems\nand 'Close' the window.")
         ## run gstreamer,will auto detect the src and display the webcam input
-        os.popen("gst-launch-0.10 autovideosrc ! ffmpegcolorspace ! autovideosink")
+        os.system("gst-launch-1.0 autovideosrc ! videoconvert ! autovideosink")
 
         response = ui.choice("Did you notice the same image problem in the test video?", ["Yes", "No"], False)
 
@@ -68,7 +69,7 @@
          report['MachineType'] = '%s %s' % (report['dmi.sys.vendor'],
                  report['dmi.product.name'])
 
-    attach_file(report, '/proc/cpuinfo', 'ProcCpuinfo')
+    apport.hookutils.attach_file(report, '/proc/cpuinfo', 'ProcCpuinfo')
 
     if add_tags:
         if 'Tags' in report: