diff -u btscanner-2.1/debian/control btscanner-2.1/debian/control
--- btscanner-2.1/debian/control
+++ btscanner-2.1/debian/control
@@ -1,8 +1,9 @@
 Source: btscanner
 Section: net
 Priority: optional
-Maintainer: Uwe Hermann <uwe@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), libncurses5-dev, libbluetooth2-dev, libxml2-dev
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Uwe Hermann <uwe@debian.org>
+Build-Depends: cdbs, debhelper (>= 5), libncurses5-dev, libbluetooth-dev, libxml2-dev
 Standards-Version: 3.8.0
 Homepage: http://www.pentest.co.uk/cgi-bin/viewcat.cgi?cat=downloads&section=01_bluetooth
 
diff -u btscanner-2.1/debian/changelog btscanner-2.1/debian/changelog
--- btscanner-2.1/debian/changelog
+++ btscanner-2.1/debian/changelog
@@ -1,3 +1,10 @@
+btscanner (2.1-4ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Change libbluetooth2-dev Build-Depends to libbluetooth-dev.
+
+ -- Nick Ellery <nick.ellery@ubuntu.com>  Wed, 05 Nov 2008 03:48:57 +0000
+
 btscanner (2.1-4) unstable; urgency=low
 
   * debian/control:
@@ -10,6 +17,13 @@
 
  -- Uwe Hermann <uwe@debian.org>  Sat, 26 Jul 2008 19:41:40 +0200
 
+btscanner (2.1-3ubuntu1) intrepid; urgency=low
+
+  * Rebuild for libbluetooth2 -> libbluetooth3 transistion. (LP: #276343)
+  * Change libbluetooth2-dev Build-Depends to libbluetooth-dev.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Fri, 10 Oct 2008 14:29:57 +1100
+
 btscanner (2.1-3) unstable; urgency=medium
 
   * Transition to libbluetooth2 (Closes: #376974).