Merge lp:~kzapalowicz/bluez/autoenable-bt-adapters into lp:~bluetooth/bluez/ubuntu

[Konrad Zapałowicz]

Enable autoEnable parameter of bluez.

Fix #1510570

[Simon Fels (morphis)]

LGTM. @Konrad: we should go and land this together with an upgrade to Bluez 3.40 also for Touch.

[Simon Fels (morphis)]

review: Approve

[Simon Fels (morphis)]

review: Needs Fixing

[lp:~kzapalowicz/bluez/autoenable-bt-adapters]

22. By Konrad Zapałowicz on 2017-01-10

Fix formatting in changelog

[Simon Fels (morphis)]

LGTM

review: Approve

=== removed file 'debian/50-bluetooth-hci-auto-poweron.rules'
--- debian/50-bluetooth-hci-auto-poweron.rules	2015-08-14 10:04:55 +0000
+++ debian/50-bluetooth-hci-auto-poweron.rules	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-# Set bluetooth power up
-ACTION=="add", SUBSYSTEM=="bluetooth", KERNEL=="hci[0-9]*", RUN+="/bin/hciconfig %k up"

=== modified file 'debian/bluez.install'
--- debian/bluez.install	2016-02-02 17:16:14 +0000
+++ debian/bluez.install	2017-01-10 13:05:15 +0000
@@ -25,7 +25,6 @@
 lib/udev/hid2hci
 lib/udev/rules.d/97-hid2hci.rules
 attrib/gatttool usr/bin
-debian/50-bluetooth-hci-auto-poweron.rules lib/udev/rules.d
 #-- for systemd
 lib/systemd/system/bluetooth.service
 etc/dbus-1/system.d/bluetooth.conf

=== modified file 'debian/changelog'
--- debian/changelog	2016-03-01 15:19:16 +0000
+++ debian/changelog	2017-01-10 13:05:15 +0000
@@ -1,6 +1,14 @@
+bluez (5.37-0ubuntu6) UNRELEASED; urgency=medium
+
+  [ Guilhem Lettron ]
+  * Add debian/patches/use-autoenable-parameter-for-adapters.patch
+    - Fix pairing with BLE when adapter is initialized by hcitool
+
+ -- Konrad Zapałowicz <[e-mail]>  Tue, 10 Jan 2017 13:06:26 +0100
+
 bluez (5.37-0ubuntu5) xenial; urgency=medium
 
-  [Tony Espy ]
+  [ Tony Espy ]
   * debian/control: fixup 'Architecture:' and 'Depends:' for bluez-
     tests, as it now includes binary commands and thus can no
     longer be 'Architecture: all'.

=== modified file 'debian/patches/series'
--- debian/patches/series	2016-02-11 13:46:45 +0000
+++ debian/patches/series	2017-01-10 13:05:15 +0000
@@ -1,3 +1,4 @@
+use-autoenable-parameter-for-adapters.patch
 0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
 bluetooth.conf.patch
 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch

=== added file 'debian/patches/use-autoenable-parameter-for-adapters.patch'
--- debian/patches/use-autoenable-parameter-for-adapters.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/use-autoenable-parameter-for-adapters.patch	2017-01-10 13:05:15 +0000
@@ -0,0 +1,24 @@
+Description: Use 'AutoEnable' option for discovered BT adapters
+Forwarded: not-needed
+Origin: community
+Author: Guilhem Lettron <[e-mail]>
+
+Index: bluez/src/main.conf
+===================================================================
+--- bluez.orig/src/main.conf
++++ bluez/src/main.conf
+@@ -64,7 +64,7 @@
+ # 'false'.
+ #FastConnectable = false
+ 
+-#[Policy]
++[Policy]
+ #
+ # The ReconnectUUIDs defines the set of remote services that should try
+ # to be reconnected to in case of a link loss (link supervision
+@@ -86,4 +86,4 @@
+ # AutoEnable defines option to enable all controllers when they are found.
+ # This includes adapters present on start as well as adapters that are plugged
+ # in later on. Defaults to 'false'.
+-#AutoEnable=false
++AutoEnable=true