Merge lp:~seb128/bluez/update-to-5.36 into lp:~bluetooth/bluez/ubuntu

[Sebastien Bacher]

Update to 5.36

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-09 12:56:55 +0000
+++ debian/changelog	2015-11-09 15:04:02 +0000
@@ -1,3 +1,11 @@
+bluez (5.36-0ubuntu1) xenial; urgency=medium
+
+  * New upstream version
+  * 0001-systemd-Check-if-bluetooth-is-supported-in-the-kerne.patch:
+   - the change is in the new version
+
+ -- Sebastien Bacher <[e-mail]>  Mon, 09 Nov 2015 13:57:48 +0100
+
 bluez (5.35-0ubuntu2) wily; urgency=medium
 
   * Add 0001-systemd-Check-if-bluetooth-is-supported-in-the-kerne.patch:

=== removed file 'debian/patches/0001-systemd-Check-if-bluetooth-is-supported-in-the-kerne.patch'
--- debian/patches/0001-systemd-Check-if-bluetooth-is-supported-in-the-kerne.patch	2015-11-09 12:56:55 +0000
+++ debian/patches/0001-systemd-Check-if-bluetooth-is-supported-in-the-kerne.patch	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-From 0a26dbbeda85ac93d9e0d44ca647054d5b86c29f Mon Sep 17 00:00:00 2001
-From: Martin Pitt <[e-mail]>
-Date: Tue, 20 Oct 2015 12:12:25 +0200
-Subject: [PATCH] systemd: Check if bluetooth is supported in the kernel
-
-When running a kernel without bluetooth support, bluetooth.service fails to
-start with
-
-    bluetoothd[1640]: Failed to access management interface
-    bluetoothd[1640]: Adapter handling initialization failed
-    systemd[1]: bluetooth.service: Main process exited, code=exited, status=1/FAILURE
-    systemd[1]: Failed to start Bluetooth service.
-
-This causes an unnecessary "degraded" state and more importantly breaks package
-installation when the bluez package auto-starts the daemon.
-
-Add a condition to only start the service if /sys/class/bluetooth exists.
-
-https://launchpad.net/bugs/1506774
----
- src/bluetooth.service.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/bluetooth.service.in b/src/bluetooth.service.in
-index 35e9457..83e4732 100644
---- a/src/bluetooth.service.in
-+++ b/src/bluetooth.service.in
-@@ -1,6 +1,7 @@
- [Unit]
- Description=Bluetooth service
- Documentation=man:bluetoothd(8)
-+ConditionPathIsDirectory=/sys/class/bluetooth
- 
- [Service]
- Type=dbus
--- 
-2.5.0
-

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-11-09 12:56:55 +0000
+++ debian/patches/series	2015-11-09 15:04:02 +0000
@@ -2,6 +2,5 @@
 bluetooth.conf.patch
 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-0001-systemd-Check-if-bluetooth-is-supported-in-the-kerne.patch
 change_path_of_hogsuspend.patch
 migrate_scripts_python3.patch