Update checksums for patch. Add conflicts with bluez-hcitool

2 files changed, 9 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c337c946b1ea..52b49f7cb0f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Jun  9 19:16:28 UTC 2018
+# Wed Jul 11 00:57:01 UTC 2018
 pkgbase = bluez-utils-compat
 	pkgdesc = Development and debugging utilities for the bluetooth protocol stack. Includes deprecated tools.
 	pkgver = 5.50
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.bluez.org/
 	arch = i686
 	arch = x86_64
@@ -23,14 +23,15 @@ pkgbase = bluez-utils-compat
 	provides = bluez-utils
 	conflicts = bluez-hcidump
 	conflicts = bluez-utils
+	conflicts = bluez-hcitool
 	replaces = bluez-hcidump
 	replaces = bluez<=4.101
 	source = https://www.kernel.org/pub/linux/bluetooth/bluez-5.50.tar.xz
 	source = https://www.kernel.org/pub/linux/bluetooth/bluez-5.50.tar.sign
-	source = refresh_adv_manager_for_non-LE_devices.diff::https://git.archlinux.org/svntogit/packages.git/tree/trunk/refresh_adv_manager_for_non-LE_devices.diff?h=packages/bluez
+	source = refresh_adv_manager_for_non-LE_devices.diff::https://git.archlinux.org/svntogit/packages.git/plain/trunk/refresh_adv_manager_for_non-LE_devices.diff?h=packages/bluez
 	sha256sums = 5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911
 	sha256sums = SKIP
-	sha256sums = fa391d4a5a3946413aae99dd196a58db9de75f07526915b70e67f915af3cd268
+	sha256sums = ae195834cdc9d3d1961ae3c49da6381c820883a5af580e61aebed05a3e911d48
 
 pkgname = bluez-utils-compat
 
diff --git a/PKGBUILD b/PKGBUILD
index c1efa94cb327..a8502751bb99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,22 +7,22 @@
 pkgname='bluez-utils-compat'
 _pkgbase='bluez'
 pkgver=5.50
-pkgrel=1
+pkgrel=2
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64' 'mips64el' 'armv6h' 'armv7h' 'arm' 'aarch64')
 license=('GPL2')
 pkgdesc="Development and debugging utilities for the bluetooth protocol stack. Includes deprecated tools."
 depends=('dbus' 'systemd' 'glib2')
-conflicts=('bluez-hcidump' 'bluez-utils')
+conflicts=('bluez-hcidump' 'bluez-utils' 'bluez-hcitool')
 provides=('bluez-hcidump' 'bluez-utils')
 replaces=('bluez-hcidump' 'bluez<=4.101')
 makedepends=('dbus' 'libical' 'systemd')
 source=("https://www.kernel.org/pub/linux/bluetooth/${_pkgbase}-${pkgver}.tar."{xz,sign}
-        'refresh_adv_manager_for_non-LE_devices.diff::https://git.archlinux.org/svntogit/packages.git/tree/trunk/refresh_adv_manager_for_non-LE_devices.diff?h=packages/bluez')
+        'refresh_adv_manager_for_non-LE_devices.diff::https://git.archlinux.org/svntogit/packages.git/plain/trunk/refresh_adv_manager_for_non-LE_devices.diff?h=packages/bluez')
 # see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
 sha256sums=('5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911'
             'SKIP'
-            'fa391d4a5a3946413aae99dd196a58db9de75f07526915b70e67f915af3cd268')
+            'ae195834cdc9d3d1961ae3c49da6381c820883a5af580e61aebed05a3e911d48')
 validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel@holtmann.org>
 
 prepare() {