[arch-commits] Commit in bluez/trunk (3 files)

[Tom Gundersen]

    Date: Tuesday, June 19, 2012 @ 08:07:00
  Author: tomegun
Revision: 162065

upgpkg: bluez 4.100-1

upstream release

Added:
  bluez/trunk/org.bluez.service
Modified:
  bluez/trunk/PKGBUILD
Deleted:
  bluez/trunk/0001-udev-remove-deprecated-function.patch

--------------------------------------------+
 0001-udev-remove-deprecated-function.patch |   27 ---------------------------
 PKGBUILD                                   |   25 +++++++++++--------------
 org.bluez.service                          |    5 +++++
 3 files changed, 16 insertions(+), 41 deletions(-)

Deleted: 0001-udev-remove-deprecated-function.patch
===================================================================
--- 0001-udev-remove-deprecated-function.patch	2012-06-19 10:51:27 UTC (rev 162064)
+++ 0001-udev-remove-deprecated-function.patch	2012-06-19 12:07:00 UTC (rev 162065)
@@ -1,27 +0,0 @@
-From 9e850650bd98e9d05fc937489692b26a64924d16 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg at jklm.no>
-Date: Sun, 27 May 2012 00:53:36 +0200
-Subject: [PATCH] udev: remove deprecated function
-
-This function has in the past returned "/sys" unconditionally. As of udev-183 it
-is gone, so just replace it with the string.
----
- tools/hid2hci.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/hid2hci.c b/tools/hid2hci.c
-index 45a3a3d..e3a5b2e 100644
---- a/tools/hid2hci.c
-+++ b/tools/hid2hci.c
-@@ -291,7 +291,7 @@ int main(int argc, char *argv[])
- 	if (udev == NULL)
- 		goto exit;
- 
--	snprintf(syspath, sizeof(syspath), "%s/%s", udev_get_sys_path(udev), devpath);
-+	snprintf(syspath, sizeof(syspath), "/sys/%s", devpath);
- 	udev_dev = udev_device_new_from_syspath(udev, syspath);
- 	if (udev_dev == NULL) {
- 		fprintf(stderr, "error: could not find '%s'\n", devpath);
--- 
-1.7.10.2
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-19 10:51:27 UTC (rev 162064)
+++ PKGBUILD	2012-06-19 12:07:00 UTC (rev 162065)
@@ -4,14 +4,14 @@
 # Contributor: Geoffroy Carrier <geoffroy at archlinux.org>
 
 pkgname=bluez
-pkgver=4.99
-pkgrel=6
+pkgver=4.100
+pkgrel=1
 pkgdesc="Libraries and tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64')
 license=('GPL2')
-depends=('dbus-core' 'python2' 'udev')
-makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile')
+depends=('dbus-core' 'python2' 'systemd-tools')
+makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile' 'libusbx')
 optdepends=("gstreamer0.10-base: bluetooth GStreamer support"
             "alsa-lib: Audio bluetooth devices support"
             "dbus-python: to run bluez-simple-agent"
@@ -25,13 +25,15 @@
 backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
         'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf')
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
-	'0001-udev-remove-deprecated-function.patch'
         'bluetooth.conf.d'
-	'rc.bluetooth')
+	'rc.bluetooth'
+	'org.bluez.service')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  cp ../org.bluez.service src/
+
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
@@ -51,8 +53,6 @@
     --disable-test \
     --with-systemdunitdir=/usr/lib/systemd/system
 
-  patch -p1 -i ../0001-udev-remove-deprecated-function.patch
-
   make
 }
 
@@ -80,11 +80,8 @@
     "${pkgdir}"/usr/bin/bluez-simple-agent \
     "${pkgdir}"/usr/bin/bluez-test-device \
     "${pkgdir}"/usr/bin/bluez-test-input
-
-  # fixed upstream in git
-  rm "${pkgdir}"/usr/lib/udev/rules.d/97-bluetooth.rules
 }
-md5sums=('2387053eb5a7b02f37df4871df022a02'
-         '3175155fbaf73f01377f6c35b5c5e468'
+md5sums=('54809d476c52665ff64594b6828016b5'
          '7412982b440f29fa7f76a41a87fef985'
-         '8f9498707f809506928b2e480d3b6789')
+         '8f9498707f809506928b2e480d3b6789'
+         '54c7de598327bf11d56592235d0702f4')

Added: org.bluez.service
===================================================================
--- org.bluez.service	                        (rev 0)
+++ org.bluez.service	2012-06-19 12:07:00 UTC (rev 162065)
@@ -0,0 +1,5 @@
+[D-BUS Service]
+Name=org.bluez
+Exec=/bin/false
+User=root
+SystemdService=dbus-org.bluez.service