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

[Andreas Radke]

    Date: Friday, March 18, 2016 @ 19:24:15
  Author: andyrtr
Revision: 262052

upgpkg: bluez 5.38-1

upstream update 5.38

Modified:
  bluez/trunk/PKGBUILD
Deleted:
  bluez/trunk/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch

------------------------------------------------------------------+
 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch |   59 ----------
 PKGBUILD                                                         |   18 ---
 2 files changed, 4 insertions(+), 73 deletions(-)

Deleted: 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
===================================================================
--- 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch	2016-03-18 18:02:25 UTC (rev 262051)
+++ 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch	2016-03-18 18:24:15 UTC (rev 262052)
@@ -1,59 +0,0 @@
-From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw at public.gmane.org>
-Date: Sat, 12 Oct 2013 17:45:25 +0200
-Subject: [PATCH] Allow using obexd without systemd in the user session
-
-Not all sessions run systemd --user (actually, the majority
-doesn't), so the dbus daemon must be able to spawn obexd
-directly, and to do so it needs the full path of the daemon.
----
- Makefile.obexd                      | 4 ++--
- obexd/src/org.bluez.obex.service    | 4 ----
- obexd/src/org.bluez.obex.service.in | 4 ++++
- 3 files changed, 6 insertions(+), 6 deletions(-)
- delete mode 100644 obexd/src/org.bluez.obex.service
- create mode 100644 obexd/src/org.bluez.obex.service.in
-
-diff --git a/Makefile.obexd b/Makefile.obexd
-index 3760867..142e7c3 100644
---- a/Makefile.obexd
-+++ b/Makefile.obexd
-@@ -2,12 +2,12 @@
- if SYSTEMD
- systemduserunitdir = @SYSTEMD_USERUNITDIR@
- systemduserunit_DATA = obexd/src/obex.service
-+endif
- 
- dbussessionbusdir = @DBUS_SESSIONBUSDIR@
- dbussessionbus_DATA = obexd/src/org.bluez.obex.service
--endif
- 
--EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
-+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
- 
- obex_plugindir = $(libdir)/obex/plugins
- 
-diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
-deleted file mode 100644
-index a538088..0000000
---- a/obexd/src/org.bluez.obex.service
-+++ /dev/null
-@@ -1,4 +0,0 @@
--[D-BUS Service]
--Name=org.bluez.obex
--Exec=/bin/false
--SystemdService=dbus-org.bluez.obex.service
-diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
-new file mode 100644
-index 0000000..9c815f2
---- /dev/null
-+++ b/obexd/src/org.bluez.obex.service.in
-@@ -0,0 +1,4 @@
-+[D-BUS Service]
-+Name=org.bluez.obex
-+Exec=@libexecdir@/obexd
-+SystemdService=dbus-org.bluez.obex.service
--- 
-1.8.3.1
-
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-18 18:02:25 UTC (rev 262051)
+++ PKGBUILD	2016-03-18 18:24:15 UTC (rev 262052)
@@ -5,30 +5,20 @@
 
 pkgbase=bluez
 pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
-pkgver=5.37
-pkgrel=2
+pkgver=5.38
+pkgrel=1
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('dbus' 'libical' 'systemd')
 source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
-        0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
         bluetooth.modprobe)
 # see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
-sha256sums=('c14ba9ddcb0055522073477b8fd8bf1ddf5d219e75fdfd4699b7e0ce5350d6b0'
+sha256sums=('0618c5440be6715805060ab5eea930526f34089c437bf61819447b160254f4df'
             'SKIP'
-            '896a1403d9b7258c4fb0d41f3a6f70fd51eaa1115ab3f4259f3dbbe02b55766b'
             '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4')
 validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
 
-#prepare() {
-#  cd $pkgname-$pkgver
-  # patch not upstreamable for obex file transfer - FS#37773 taken from FC
-  # http://www.hadess.net/2013/11/bluetooth-file-sharing-obexpush-in.html
-#  patch -Np1 -i ${srcdir}/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
-#  autoreconf -vfi
-#}
-
 build() {
   cd ${pkgname}-${pkgver}
   ./configure \
@@ -45,7 +35,7 @@
 
 check() {
   cd $pkgname-$pkgver
-  #make check
+  make check
 }