diff -Nru bochs-2.3.7/debian/changelog bochs-2.3.7/debian/changelog
--- bochs-2.3.7/debian/changelog	2008-07-24 16:07:35.000000000 +0100
+++ bochs-2.3.7/debian/changelog	2008-07-24 16:07:36.000000000 +0100
@@ -1,3 +1,11 @@
+bochs (2.3.7-1ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - 12_no-ssp.patch (formerly 11_no-ssp.patch): Build with -fno-stack-protector
+    - Add Replaces/Conflicts for bochsbios-qemu (<< 2.3.6-2)
+
+ -- David Futcher <bobbocanfly@gmail.com>  Mon, 30 Jun 2008 10:04:21 +0100
+
 bochs (2.3.7-1) unstable; urgency=low
 
   * New upstream release.
@@ -52,6 +60,14 @@
 
  -- Guillem Jover <guillem@debian.org>  Mon, 17 Mar 2008 04:44:33 +0200
 
+bochs (2.3.6-2ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Build BIOS with -fno-stack-protector.
+    - Add Replaces/Conflicts for bochsbios-qemu (<< 2.3.6-2)
+
+ -- Soren Hansen <soren@ubuntu.com>  Tue, 12 Feb 2008 10:57:18 +0100
+
 bochs (2.3.6-2) unstable; urgency=low
 
   * Try to use pkg-config before AC_PATH_XTRA (fixes a FTBFS). Add pkg-config
@@ -80,6 +96,14 @@
 
  -- Guillem Jover <guillem@debian.org>  Wed, 23 Jan 2008 10:10:19 +0200
 
+bochs (2.3.5-1ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Keep qemu specific bios in separate package
+  * Renamed qemu bios image to BIOS-qemu-latest
+
+ -- Soren Hansen <soren@ubuntu.com>  Mon, 10 Dec 2007 12:26:41 +0100
+
 bochs (2.3.5-1) unstable; urgency=low
 
   * New upstream release.
@@ -112,6 +136,18 @@
 
  -- Guillem Jover <guillem@debian.org>  Fri, 07 Dec 2007 09:08:31 +0200
 
+bochs (2.3+20070705-2ubuntu1) hardy; urgency=low
+
+  * debian/patches/06_qemu_bios.patch, debian/control,
+    debian/bochsbios-qemu.{install,dirs}:
+    - Added new binary package bochsbios-qemu containing a special
+      BIOS image for qemu.
+  * Build BIOS images with -fno-stack-protector (LP: #163756)
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Soren Hansen <soren@ubuntu.com>  Fri, 23 Nov 2007 17:45:06 +0100
+
 bochs (2.3+20070705-2) unstable; urgency=low
 
   * Fix differing prototype for tftp_send_optack in eth_vnet.cc affecting
diff -Nru /tmp/DfIpH95a6m/bochs-2.3.7/debian/control /tmp/MukKd5L4XY/bochs-2.3.7/debian/control
--- bochs-2.3.7/debian/control	2008-07-24 16:07:35.000000000 +0100
+++ bochs-2.3.7/debian/control	2008-07-24 16:07:36.000000000 +0100
@@ -1,7 +1,8 @@
 Source: bochs
 Section: misc
 Priority: extra
-Maintainer: Guillem Jover <guillem@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Guillem Jover <guillem@debian.org>
 Build-Depends: debhelper (>= 5), quilt (>= 0.40),
  autoconf, libz-dev, libncurses5-dev, libreadline5-dev | libreadline-dev,
  libaa1-dev, libsvga1-dev [i386 amd64], libx11-dev, libxpm-dev, libice-dev,
@@ -42,7 +43,8 @@
 
 Package: bochsbios
 Architecture: all
-Replaces: bochs (<< 2.0)
+Replaces: bochs (<< 2.0), bochsbios-qemu (<< 2.3.6-2)
+Conflicts: bochsbios-qemu (<< 2.3.6-2)
 Description: BIOS for the Bochs emulator
  Bochs is a highly portable free IA-32 (x86) PC emulator written in C++, that
  runs on most popular platforms. It includes emulation of the Intel x86 CPU,
diff -Nru /tmp/DfIpH95a6m/bochs-2.3.7/debian/patches/12_no-ssp.patch /tmp/MukKd5L4XY/bochs-2.3.7/debian/patches/12_no-ssp.patch
--- bochs-2.3.7/debian/patches/12_no-ssp.patch	1970-01-01 01:00:00.000000000 +0100
+++ bochs-2.3.7/debian/patches/12_no-ssp.patch	2008-07-24 16:07:36.000000000 +0100
@@ -0,0 +1,17 @@
+Index: bochs-2.3.6-2ubuntu1/bios/Makefile.in
+===================================================================
+--- bochs-2.3.6-2ubuntu1.orig/bios/Makefile.in	2008-02-12 10:29:46.342277831 +0100
++++ bochs-2.3.6-2ubuntu1/bios/Makefile.in	2008-02-12 10:30:49.242267525 +0100
+@@ -118,10 +118,10 @@
+ 	ld -o $@ -T rombios32.ld rombios32start.o rombios32-qemu.o
+ 
+ rombios32.o: rombios32.c acpi-dsdt.hex
+-	$(GCC32) -O2 -Wall -c -o $@ $<
++	$(GCC32) -fno-stack-protector -O2 -Wall -c -o $@ $<
+ 
+ rombios32-qemu.o: rombios32.c acpi-dsdt.hex
+-	$(GCC32) -DBX_QEMU -O2 -Wall -c -o $@ $<
++	$(GCC32) -fno-stack-protector -DBX_QEMU -O2 -Wall -c -o $@ $<
+ 
+ acpi-dsdt.hex: acpi-dsdt.dsl
+ 	iasl -tc -p $@ $<
diff -Nru /tmp/DfIpH95a6m/bochs-2.3.7/debian/patches/series /tmp/MukKd5L4XY/bochs-2.3.7/debian/patches/series
--- bochs-2.3.7/debian/patches/series	2008-07-24 16:07:35.000000000 +0100
+++ bochs-2.3.7/debian/patches/series	2008-07-24 16:07:36.000000000 +0100
@@ -6,3 +6,5 @@
 05_bios_delay_loop.patch
 10_enable_iasl.patch
 11_ftbfs_3dnow.patch
+12_no-ssp.patch
+