[Pkg-bluetooth-commits] r490 - in /bluez-hcidump/trunk/debian: changelog control patches/001_subrate_FTBFS.patch

[filippo at users.alioth.debian.org]

Author: filippo
Date: Mon Jul 16 09:34:40 2007
New Revision: 490

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=490
Log:
1.37-2 FTBFS fix

Added:
    bluez-hcidump/trunk/debian/patches/001_subrate_FTBFS.patch
Modified:
    bluez-hcidump/trunk/debian/changelog
    bluez-hcidump/trunk/debian/control

Modified: bluez-hcidump/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/bluez-hcidump/trunk/debian/changelog?rev=490&op=diff
==============================================================================
--- bluez-hcidump/trunk/debian/changelog (original)
+++ bluez-hcidump/trunk/debian/changelog Mon Jul 16 09:34:40 2007
@@ -1,3 +1,10 @@
+bluez-hcidump (1.37-2) unstable; urgency=low
+
+  * Bump build-dep libbluetooth-dev >= 3.12
+  * patch to fix FTBFS, thanks to Cyril Brulebois (Closes: #431887)
+
+ -- Filippo Giunchedi <filippo at debian.org>  Mon, 16 Jul 2007 11:09:00 +0200
+
 bluez-hcidump (1.37-1) unstable; urgency=low
 
   * Added myself to the Uploaders field.

Modified: bluez-hcidump/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-bluetooth/bluez-hcidump/trunk/debian/control?rev=490&op=diff
==============================================================================
--- bluez-hcidump/trunk/debian/control (original)
+++ bluez-hcidump/trunk/debian/control Mon Jul 16 09:34:40 2007
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Bluetooth Maintainers <pkg-bluetooth-maintainers at lists.alioth.debian.org> 
 Uploaders: Edd Dumbill <ejad at debian.org>, Filippo Giunchedi <filippo at debian.org>
-Build-Depends: debhelper (>> 5.0), libbluetooth-dev (>= 3.3), docbook-to-man, autotools-dev, cdbs, pkg-config
+Build-Depends: debhelper (>> 5.0), libbluetooth-dev (>= 3.12), docbook-to-man, autotools-dev, cdbs, pkg-config
 Standards-Version: 3.7.2
 
 Package: bluez-hcidump

Added: bluez-hcidump/trunk/debian/patches/001_subrate_FTBFS.patch
URL: http://svn.debian.org/wsvn/pkg-bluetooth/bluez-hcidump/trunk/debian/patches/001_subrate_FTBFS.patch?rev=490&op=file
==============================================================================
--- bluez-hcidump/trunk/debian/patches/001_subrate_FTBFS.patch (added)
+++ bluez-hcidump/trunk/debian/patches/001_subrate_FTBFS.patch Mon Jul 16 09:34:40 2007
@@ -1,0 +1,63 @@
+--- bluez-hcidump-1.35/parser/hci.c	2007-07-15 22:46:26.000000000 +0000
++++ bluez-hcidump-1.35/parser/hci.c	2007-07-15 22:50:45.000000000 +0000
+@@ -775,7 +775,7 @@
+ 
+ static inline void sniff_subrate_dump(int level, struct frame *frm)
+ {
+-	sniff_subrate_cp *cp = frm->ptr;
++	sniff_subrating_cp *cp = frm->ptr;
+ 
+ 	p_indent(level, frm);
+ 	printf("handle %d\n", btohs(cp->handle));
+@@ -1205,7 +1205,7 @@
+ 		case OCF_WRITE_LINK_POLICY:
+ 			write_link_policy_dump(level + 1, frm);
+ 			return;
+-		case OCF_SNIFF_SUBRATE:
++		case OCF_SNIFF_SUBRATING:
+ 			sniff_subrate_dump(level + 1, frm);
+ 			return;
+ 		}
+@@ -1839,7 +1839,7 @@
+ 	case OGF_LINK_POLICY:
+ 		switch (ocf) {
+ 		case OCF_WRITE_LINK_POLICY:
+-		case OCF_SNIFF_SUBRATE:
++		case OCF_SNIFF_SUBRATING:
+ 			generic_response_dump(level, frm);
+ 			return;
+ 		}
+@@ -2446,7 +2446,7 @@
+ 
+ static inline void sniff_subrate_event_dump(int level, struct frame *frm)
+ {
+-	evt_sniff_subrate *evt = frm->ptr;
++	evt_sniff_subrating *evt = frm->ptr;
+ 
+ 	p_indent(level, frm);
+ 	printf("status 0x%2.2x handle %d\n", evt->status, btohs(evt->handle));
+@@ -2492,7 +2492,7 @@
+ 
+ static inline void link_supervision_timeout_change_dump(int level, struct frame *frm)
+ {
+-	evt_link_supervision_timeout_change *evt = frm->ptr;
++	evt_link_supervision_timeout_changed *evt = frm->ptr;
+ 
+ 	p_indent(level, frm);
+ 	printf("handle %d timeout %d\n",
+@@ -2668,13 +2668,13 @@
+ 	case EVT_SYNC_CONN_CHANGED:
+ 		sync_conn_changed_dump(level + 1, frm);
+ 		break;
+-	case EVT_SNIFF_SUBRATE:
++	case EVT_SNIFF_SUBRATING:
+ 		sniff_subrate_event_dump(level + 1, frm);
+ 		break;
+ 	case EVT_EXTENDED_INQUIRY_RESULT:
+ 		extended_inq_result_dump(level + 1, frm);
+ 		break;
+-	case EVT_LINK_SUPERVISION_TIMEOUT_CHANGE:
++	case EVT_LINK_SUPERVISION_TIMEOUT_CHANGED:
+ 		link_supervision_timeout_change_dump(level + 1, frm);
+ 		break;
+ 	default: