[maemo-commits] [maemo-commits] r14629 - in projects/connectivity/bluez-utils-debian/trunk: . patches

[From: subversion at stage.maemo.org]

Author: jh
Date: 2007-10-26 11:41:50 +0300 (Fri, 26 Oct 2007)
New Revision: 14629

Modified:
   projects/connectivity/bluez-utils-debian/trunk/bluez-utils.dirs
   projects/connectivity/bluez-utils-debian/trunk/bluez-utils.install
   projects/connectivity/bluez-utils-debian/trunk/changelog
   projects/connectivity/bluez-utils-debian/trunk/control
   projects/connectivity/bluez-utils-debian/trunk/patches/005_linkkeys.patch
Log:
Prepare for 3.22-0osso1

Modified: projects/connectivity/bluez-utils-debian/trunk/bluez-utils.dirs
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/bluez-utils.dirs	2007-10-26 08:30:43 UTC (rev 14628)
+++ projects/connectivity/bluez-utils-debian/trunk/bluez-utils.dirs	2007-10-26 08:41:50 UTC (rev 14629)
@@ -1,4 +1,5 @@
 usr/bin
 usr/lib/bluetooth
 usr/lib/alsa-lib
+usr/lib/gstreamer-0.10
 etc/bluetooth

Modified: projects/connectivity/bluez-utils-debian/trunk/bluez-utils.install
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/bluez-utils.install	2007-10-26 08:30:43 UTC (rev 14628)
+++ projects/connectivity/bluez-utils-debian/trunk/bluez-utils.install	2007-10-26 08:41:50 UTC (rev 14629)
@@ -10,3 +10,4 @@
 debian/tmp/usr/lib/bluetooth/*-input
 debian/tmp/usr/lib/bluetooth/*-serial
 debian/tmp/usr/lib/alsa-lib/*.so
+debian/tmp/usr/lib/gstreamer-0.10/*

Modified: projects/connectivity/bluez-utils-debian/trunk/changelog
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/changelog	2007-10-26 08:30:43 UTC (rev 14628)
+++ projects/connectivity/bluez-utils-debian/trunk/changelog	2007-10-26 08:41:50 UTC (rev 14629)
@@ -1,21 +1,13 @@
-bluez-utils (3.20-test3) unstable; urgency=low
+bluez-utils (3.22-0osso1) unstable; urgency=low
 
-  * New test package from CVS HEAD 
+  * New upstream relese
+  * input: fix attempt to free uninitialized pointer. Fixes: NB#73051
+  * Removed service identifier parsing patch which is included in upstream
+  * Other relevant changes (for OSSO) since 3.20 from upstream ChangeLog:
+    - Fix handling of service classes length size.
 
- -- Johan Hedberg <johan.hedberg at nokia.com>  Fri, 19 Oct 2007 08:46:38 +0000
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Fri, 26 Oct 2007 08:22:35 +0000
 
-bluez-utils (3.20-test2) unstable; urgency=low
-
-  * Revert SBC optimizations 
-
- -- Johan Hedberg <johan.hedberg at nokia.com>  Mon, 15 Oct 2007 18:27:27 +0000
-
-bluez-utils (3.20-test1) unstable; urgency=low
-
-  * Test version with pcm_bluetooth.c patches
-
- -- Johan Hedberg <johan.hedberg at nokia.com>  Mon, 15 Oct 2007 11:08:59 +0000
-
 bluez-utils (3.20-0osso2) unstable; urgency=low
 
   * Fix parsing of service identifiers. Fixes: NB#72393

Modified: projects/connectivity/bluez-utils-debian/trunk/control
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/control	2007-10-26 08:30:43 UTC (rev 14628)
+++ projects/connectivity/bluez-utils-debian/trunk/control	2007-10-26 08:41:50 UTC (rev 14629)
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: Johan Hedberg <johan.hedberg at nokia.com>
-Build-Depends: bison, debhelper (>> 4.1.0), flex, libbluetooth2-dev (>= 3.20), autotools-dev, cdbs, libdbus-1-dev, libglib2.0-dev, libhal-dev, libasound2-dev
+Build-Depends: bison, debhelper (>> 4.1.0), flex, libbluetooth2-dev (>= 3.22), autotools-dev, cdbs, libdbus-1-dev, libglib2.0-dev, libhal-dev, libasound2-dev, libgstreamer-plugins-base0.10-dev
 Standards-Version: 3.6.1
 
 Package: bluez-utils

Modified: projects/connectivity/bluez-utils-debian/trunk/patches/005_linkkeys.patch
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/patches/005_linkkeys.patch	2007-10-26 08:30:43 UTC (rev 14628)
+++ projects/connectivity/bluez-utils-debian/trunk/patches/005_linkkeys.patch	2007-10-26 08:41:50 UTC (rev 14629)
@@ -1,6 +1,6 @@
---- hcid/storage.c	2007-10-05 12:47:44.000000000 +0000
-+++ hcid/storage.c	2007-10-05 12:48:09.000000000 +0000
-@@ -427,7 +427,7 @@
+--- hcid/storage.c	2007-10-26 08:21:00.000000000 +0000
++++ hcid/storage.c	2007-10-26 08:20:56.000000000 +0000
+@@ -445,7 +445,7 @@
  
  	create_filename(filename, PATH_MAX, local, "linkkeys");