diff -Nru arista-0.9.7/debian/changelog arista-0.9.7/debian/changelog
--- arista-0.9.7/debian/changelog	2011-11-05 13:55:53.000000000 +0000
+++ arista-0.9.7/debian/changelog	2012-01-03 22:48:27.000000000 +0000
@@ -1,3 +1,10 @@
+arista (0.9.7-3ubuntu1) precise; urgency=low
+
+  * debian/patches/1002-fix-video-icon-crash.patch: Fixes crash on
+    nonexistant video camera icon (LP: #814911)
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Tue, 03 Jan 2012 17:46:07 -0500
+
 arista (0.9.7-3) unstable; urgency=low
 
   * collab-maint team upload
diff -Nru arista-0.9.7/debian/control arista-0.9.7/debian/control
--- arista-0.9.7/debian/control	2011-11-05 13:55:53.000000000 +0000
+++ arista-0.9.7/debian/control	2012-01-03 22:49:15.000000000 +0000
@@ -1,7 +1,8 @@
 Source: arista
 Section: video
 Priority: optional
-Maintainer: Alessio Treglia <alessio@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Alessio Treglia <alessio@debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
  python-scour,
  python-all (>= 2.6.5)
diff -Nru arista-0.9.7/debian/patches/1002-fix-video-icon-crash.patch arista-0.9.7/debian/patches/1002-fix-video-icon-crash.patch
--- arista-0.9.7/debian/patches/1002-fix-video-icon-crash.patch	1970-01-01 00:00:00.000000000 +0000
+++ arista-0.9.7/debian/patches/1002-fix-video-icon-crash.patch	2012-01-03 22:45:50.000000000 +0000
@@ -0,0 +1,20 @@
+## Description: Fixes crash on nonexistant video camera icon
+## Origin/Author: Steffen Röcker <sroecker@gmail.com>
+## Bug: http://launchpad.net/bugs/814911
+Index: arista-0.9.7/arista-gtk
+===================================================================
+--- arista-0.9.7.orig/arista-gtk	2011-10-24 21:45:17.702477891 +0200
++++ arista-0.9.7/arista-gtk	2011-10-24 21:45:16.758477930 +0200
+@@ -1141,8 +1141,11 @@
+                 
+                 for device, capture in self.finder.capture_devices.items():
+                     iter = model.append()
+-                    model.set_value(iter, 0, theme.load_icon("camera-video",
++                    try:
++                        model.set_value(iter, 0, theme.load_icon("camera-video",
+                                                              size, 0))
++                    except:
++                        pass
+                     model.set_value(iter, 1, capture.nice_label)
+                     if capture.version == '1':
+                         model.set_value(iter, 2, ("v4l://" + device, True))
diff -Nru arista-0.9.7/debian/patches/series arista-0.9.7/debian/patches/series
--- arista-0.9.7/debian/patches/series	2011-11-05 13:55:53.000000000 +0000
+++ arista-0.9.7/debian/patches/series	2012-01-03 22:45:50.000000000 +0000
@@ -1 +1,2 @@
 1001-bytecompile_nautilus_extension.patch
+1002-fix-video-icon-crash.patch