diff -u cwiid-0.6.00/debian/control cwiid-0.6.00/debian/control --- cwiid-0.6.00/debian/control +++ cwiid-0.6.00/debian/control @@ -1,9 +1,10 @@ Source: cwiid Section: utils Priority: extra -Maintainer: Romain Beauxis +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Romain Beauxis XS-Python-Version: all -Build-Depends: debhelper (>= 5), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), python-all-dev, python, python-support, libbluetooth2-dev, libgtk2.0-dev, flex, bison +Build-Depends: debhelper (>= 5), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), python-all-dev, python, python-support, libbluetooth-dev, libgtk2.0-dev, flex, bison Standards-Version: 3.7.3 Package: python-cwiid diff -u cwiid-0.6.00/debian/changelog cwiid-0.6.00/debian/changelog --- cwiid-0.6.00/debian/changelog +++ cwiid-0.6.00/debian/changelog @@ -1,3 +1,12 @@ +cwiid (0.6.00-4ubuntu1) intrepid; urgency=low + + * Add bluez_4_api_changes.patch for FTBFS related to BlueZ 4.x + upgrade (LP: #276343) + * debian/control: + - Build depend on libbluetooth-dev instead. + + -- Mario Limonciello Tue, 30 Sep 2008 16:54:57 -0500 + cwiid (0.6.00-4) unstable; urgency=low * Removed buggy LDFLAGS from debian/rules diff -u cwiid-0.6.00/debian/control.in cwiid-0.6.00/debian/control.in --- cwiid-0.6.00/debian/control.in +++ cwiid-0.6.00/debian/control.in @@ -1,7 +1,8 @@ Source: cwiid Section: utils Priority: extra -Maintainer: Romain Beauxis +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Romain Beauxis XS-Python-Version: all Build-Depends: @cdbs@, python-all-dev, python, python-support, libbluetooth2-dev, libgtk2.0-dev, flex, bison Standards-Version: 3.7.3 diff -u cwiid-0.6.00/debian/patches/series cwiid-0.6.00/debian/patches/series --- cwiid-0.6.00/debian/patches/series +++ cwiid-0.6.00/debian/patches/series @@ -1,0 +2 @@ +bluez_4_api_changes.patch only in patch2: unchanged: --- cwiid-0.6.00.orig/debian/patches/bluez_4_api_changes.patch +++ cwiid-0.6.00/debian/patches/bluez_4_api_changes.patch @@ -0,0 +1,11 @@ +--- cwiid-0.6.00.orig/libcwiid/bluetooth.c.old 2008-09-30 16:52:55.000000000 -0500 ++++ cwiid-0.6.00.orig/libcwiid/bluetooth.c 2008-09-30 16:53:19.000000000 -0500 +@@ -122,7 +122,7 @@ + } + + /* timeout (10000) in milliseconds */ +- if (hci_remote_name(sock, &dev_list[i].bdaddr, BT_NAME_LEN, ++ if (hci_read_remote_name(sock, &dev_list[i].bdaddr, BT_NAME_LEN, + (*bdinfo)[bdinfo_count].name, 10000)) { + cwiid_err(NULL, "Bluetooth name read error"); + err = 1;