diff -u qemu-kvm-0.14.1+noroms/debian/control qemu-kvm-0.14.1+noroms/debian/control
--- qemu-kvm-0.14.1+noroms/debian/control
+++ qemu-kvm-0.14.1+noroms/debian/control
@@ -33,8 +33,7 @@
 
 Package: qemu-kvm
 Architecture: any
-Depends: bridge-utils,
-         iproute,
+Depends: iproute,
          python,
          qemu-common (>= ${source:Version}),
          ${misc:Depends},
@@ -76,7 +75,7 @@
 
 Package: qemu-common
 Architecture: all
-Depends: seabios, vgabios (>= 0.6c-2ubuntu2), ${misc:Depends}, ${shlibs:Depends}
+Depends: bridge-utils, seabios, vgabios (>= 0.6c-2ubuntu2), ${misc:Depends}, ${shlibs:Depends}
 Recommends: cpu-checker
 Suggests: kvm-pxe,
           mol-drivers-macosx,
diff -u qemu-kvm-0.14.1+noroms/debian/changelog qemu-kvm-0.14.1+noroms/debian/changelog
--- qemu-kvm-0.14.1+noroms/debian/changelog
+++ qemu-kvm-0.14.1+noroms/debian/changelog
@@ -1,3 +1,14 @@
+qemu-kvm (0.14.1+noroms-0ubuntu3) oneiric; urgency=low
+
+  * debian/patches/etc-qemuifscripts-fix-paths.patch: don't hardcode a path
+    to brctl in qemu-ifup.  (LP: #833475)
+  * debian/control: move Depends: on bridge-utils from qemu-kvm to
+    qemu-common.  (LP: #835355)
+  * debian/patches/debian/patches/fix-pa-configure.patch: fix FTBFS.  Fix
+    comes from upstream and will be in 0.15 when merged.  (LP: #829492)
+
+ -- Serge Hallyn <serge.hallyn@ubuntu.com>  Mon, 29 Aug 2011 12:23:12 -0500
+
 qemu-kvm (0.14.1+noroms-0ubuntu2) oneiric; urgency=low
 
   * debian/{control,rules}: build with PIE.
diff -u qemu-kvm-0.14.1+noroms/debian/patches/series qemu-kvm-0.14.1+noroms/debian/patches/series
--- qemu-kvm-0.14.1+noroms/debian/patches/series
+++ qemu-kvm-0.14.1+noroms/debian/patches/series
@@ -7,0 +8,2 @@
+qemuifup-fix-paths.patch
+fix-pa-configure.patch
only in patch2:
unchanged:
--- qemu-kvm-0.14.1+noroms.orig/debian/patches/qemuifup-fix-paths.patch
+++ qemu-kvm-0.14.1+noroms/debian/patches/qemuifup-fix-paths.patch
@@ -0,0 +1,17 @@
+Description: remove absolute paths.
+Author: Serge Hallyn <serge.hallyn@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qemu-kvm/+bug/833475
+
+Index: qemu-kvm-0.14.1+noroms/kvm/scripts/qemu-ifup
+===================================================================
+--- qemu-kvm-0.14.1+noroms.orig/kvm/scripts/qemu-ifup	2011-08-29 12:26:53.081992828 -0500
++++ qemu-kvm-0.14.1+noroms/kvm/scripts/qemu-ifup	2011-08-29 12:29:12.086682113 -0500
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+ 
+-switch=$(/sbin/ip route list | awk '/^default / { print $5 }')
+-/sbin/ifconfig $1 0.0.0.0 up
+-/usr/sbin/brctl addif ${switch} $1
++switch=$(ip route list | awk '/^default / { print $5 }')
++ifconfig $1 0.0.0.0 up
++brctl addif ${switch} $1
only in patch2:
unchanged:
--- qemu-kvm-0.14.1+noroms.orig/debian/patches/fix-pa-configure.patch
+++ qemu-kvm-0.14.1+noroms/debian/patches/fix-pa-configure.patch
@@ -0,0 +1,17 @@
+Description: qemu-kvm: fix pulseaudio detection in configure
+Origin: upstream
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qemu-kvm/+bug/829492
+
+Index: qemu-kvm-0.14.1+noroms/configure
+===================================================================
+--- qemu-kvm-0.14.1+noroms.orig/configure	2011-08-29 13:27:55.184152212 -0500
++++ qemu-kvm-0.14.1+noroms/configure	2011-08-29 13:28:56.608456798 -0500
+@@ -1532,7 +1532,7 @@
+ 
+     pa)
+     audio_drv_probe $drv pulse/simple.h "-lpulse-simple -lpulse" \
+-        "pa_simple *s = NULL; pa_simple_free(s); return 0;"
++        "pa_simple *s = 0; pa_simple_free(s); return 0;"
+     libs_softmmu="-lpulse -lpulse-simple $libs_softmmu"
+     audio_pt_int="yes"
+     ;;