[arch-commits] Commit in bluez/repos (10 files)
Andreas Radke
andyrtr at nymeria.archlinux.org
Wed Nov 20 15:33:51 UTC 2013
Date: Wednesday, November 20, 2013 @ 16:33:51
Author: andyrtr
Revision: 199982
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
bluez/repos/testing-i686/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
(from rev 199981, bluez/trunk/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch)
bluez/repos/testing-i686/PKGBUILD
(from rev 199981, bluez/trunk/PKGBUILD)
bluez/repos/testing-i686/bluetooth.modprobe
(from rev 199981, bluez/trunk/bluetooth.modprobe)
bluez/repos/testing-x86_64/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
(from rev 199981, bluez/trunk/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch)
bluez/repos/testing-x86_64/PKGBUILD
(from rev 199981, bluez/trunk/PKGBUILD)
bluez/repos/testing-x86_64/bluetooth.modprobe
(from rev 199981, bluez/trunk/bluetooth.modprobe)
Deleted:
bluez/repos/testing-i686/PKGBUILD
bluez/repos/testing-i686/bluetooth.modprobe
bluez/repos/testing-x86_64/PKGBUILD
bluez/repos/testing-x86_64/bluetooth.modprobe
---------------------------------------------------------------------------------+
/PKGBUILD | 250 ++++++++++
/bluetooth.modprobe | 6
testing-i686/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch | 59 ++
testing-i686/PKGBUILD | 116 ----
testing-i686/bluetooth.modprobe | 3
testing-x86_64/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch | 59 ++
testing-x86_64/PKGBUILD | 116 ----
testing-x86_64/bluetooth.modprobe | 3
8 files changed, 374 insertions(+), 238 deletions(-)
Copied: bluez/repos/testing-i686/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch (from rev 199981, bluez/trunk/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch)
===================================================================
--- testing-i686/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch (rev 0)
+++ testing-i686/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch 2013-11-20 15:33:51 UTC (rev 199982)
@@ -0,0 +1,59 @@
+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
+
+
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2013-11-20 15:33:19 UTC (rev 199981)
+++ testing-i686/PKGBUILD 2013-11-20 15:33:51 UTC (rev 199982)
@@ -1,116 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen <teg at jklm.no>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy at archlinux.org>
-
-pkgbase=bluez
-pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci')
-pkgver=5.11
-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.bz2"
- bluetooth.modprobe)
-md5sums=('c3675ed157a433b6de7391854b907b8c'
- '671c15e99d7154c2df987b71c5851b3d')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- ./configure \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib \
- --enable-library # this is deprecated
-# --enable-experimental \
-
- make all V=1
-}
-
-check() {
- cd $pkgname-$pkgver
- make -k check
-}
-
-
-package_bluez() {
- pkgdesc="Daemons for the bluetooth protocol stack"
- depends=('libical' 'dbus' 'glib2')
- backup=('etc/dbus-1/system.d/bluetooth.conf')
- conflicts=('obexd-client' 'obexd-server')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR=${pkgdir} \
- install-libexecPROGRAMS \
- install-dbussessionbusDATA \
- install-systemdsystemunitDATA \
- install-systemduserunitDATA \
- install-dbussystembusDATA \
- install-dbusDATA \
- install-man8
-
- # add basic documention
- install -dm755 ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis
- cp -a doc/*.txt ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis/
- # fix module loading errors
- install -dm755 ${pkgdir}/usr/lib/modprobe.d
- install -Dm644 ${srcdir}/bluetooth.modprobe ${pkgdir}/usr/lib/modprobe.d/bluetooth-usb.conf
-}
-
-package_bluez-utils() {
- pkgdesc="Development and debugging utilities for the bluetooth protocol stack"
- depends=('dbus' 'systemd')
- conflicts=('bluez-hcidump')
- provides=('bluez-hcidump')
- replaces=('bluez-hcidump' 'bluez<=4.101')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR=${pkgdir} \
- install-binPROGRAMS \
- install-man1
-
- # libbluetooth.so* are part of libLTLIBRARIES and binPROGRAMS targets
- #make DESTDIR=${pkgdir} uninstall-libLTLIBRARIES
- #rmdir ${pkgdir}/usr/lib
- rm -rf ${pkgdir}/usr/lib
-
- # move the hid2hci man page out
- mv ${pkgdir}/usr/share/man/man1/hid2hci.1 ${srcdir}/
-}
-
-package_bluez-libs() {
- pkgdesc="Deprecated libraries for the bluetooth protocol stack"
- depends=('glibc')
- license=('LGPL2.1')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR=${pkgdir} \
- install-includeHEADERS \
- install-libLTLIBRARIES \
- install-pkgconfigDATA
-}
-
-package_bluez-cups() {
- pkgdesc="CUPS printer backend for Bluetooth printers"
- depends=('cups')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR=${pkgdir} install-cupsPROGRAMS
-}
-
-package_bluez-hid2hci() {
- pkgdesc="Put HID proxying bluetooth HCI's into HCI mode"
- depends=('systemd')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR=${pkgdir} \
- install-udevPROGRAMS \
- install-rulesDATA
-
- install -dm755 ${pkgdir}/usr/share/man/man1
- mv ${srcdir}/hid2hci.1 ${pkgdir}/usr/share/man/man1/hid2hci.1
-}
Copied: bluez/repos/testing-i686/PKGBUILD (from rev 199981, bluez/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-11-20 15:33:51 UTC (rev 199982)
@@ -0,0 +1,125 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy at archlinux.org>
+
+pkgbase=bluez
+pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci')
+pkgver=5.11
+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.bz2
+ 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
+ bluetooth.modprobe)
+md5sums=('c3675ed157a433b6de7391854b907b8c'
+ 'ec97f23123456900446e8ab17361d6c2'
+ '671c15e99d7154c2df987b71c5851b3d')
+
+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 \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib \
+ --enable-library # this is deprecated
+# --enable-experimental \
+
+ make all V=1
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make -k check
+}
+
+
+package_bluez() {
+ pkgdesc="Daemons for the bluetooth protocol stack"
+ depends=('libical' 'dbus' 'glib2')
+ backup=('etc/dbus-1/system.d/bluetooth.conf')
+ conflicts=('obexd-client' 'obexd-server')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-libexecPROGRAMS \
+ install-dbussessionbusDATA \
+ install-systemdsystemunitDATA \
+ install-systemduserunitDATA \
+ install-dbussystembusDATA \
+ install-dbusDATA \
+ install-man8
+
+ # add basic documention
+ install -dm755 ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis
+ cp -a doc/*.txt ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis/
+ # fix module loading errors
+ install -dm755 ${pkgdir}/usr/lib/modprobe.d
+ install -Dm644 ${srcdir}/bluetooth.modprobe ${pkgdir}/usr/lib/modprobe.d/bluetooth-usb.conf
+}
+
+package_bluez-utils() {
+ pkgdesc="Development and debugging utilities for the bluetooth protocol stack"
+ depends=('dbus' 'systemd')
+ conflicts=('bluez-hcidump')
+ provides=('bluez-hcidump')
+ replaces=('bluez-hcidump' 'bluez<=4.101')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-binPROGRAMS \
+ install-man1
+
+ # libbluetooth.so* are part of libLTLIBRARIES and binPROGRAMS targets
+ #make DESTDIR=${pkgdir} uninstall-libLTLIBRARIES
+ #rmdir ${pkgdir}/usr/lib
+ rm -rf ${pkgdir}/usr/lib
+
+ # move the hid2hci man page out
+ mv ${pkgdir}/usr/share/man/man1/hid2hci.1 ${srcdir}/
+}
+
+package_bluez-libs() {
+ pkgdesc="Deprecated libraries for the bluetooth protocol stack"
+ depends=('glibc')
+ license=('LGPL2.1')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-includeHEADERS \
+ install-libLTLIBRARIES \
+ install-pkgconfigDATA
+}
+
+package_bluez-cups() {
+ pkgdesc="CUPS printer backend for Bluetooth printers"
+ depends=('cups')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} install-cupsPROGRAMS
+}
+
+package_bluez-hid2hci() {
+ pkgdesc="Put HID proxying bluetooth HCI's into HCI mode"
+ depends=('systemd')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-udevPROGRAMS \
+ install-rulesDATA
+
+ install -dm755 ${pkgdir}/usr/share/man/man1
+ mv ${srcdir}/hid2hci.1 ${pkgdir}/usr/share/man/man1/hid2hci.1
+}
Deleted: testing-i686/bluetooth.modprobe
===================================================================
--- testing-i686/bluetooth.modprobe 2013-11-20 15:33:19 UTC (rev 199981)
+++ testing-i686/bluetooth.modprobe 2013-11-20 15:33:51 UTC (rev 199982)
@@ -1,3 +0,0 @@
-# use "reset=1" as default, since it should be safe for recent devices and
-# solves all kind of problems.
-options btusb reset=1
Copied: bluez/repos/testing-i686/bluetooth.modprobe (from rev 199981, bluez/trunk/bluetooth.modprobe)
===================================================================
--- testing-i686/bluetooth.modprobe (rev 0)
+++ testing-i686/bluetooth.modprobe 2013-11-20 15:33:51 UTC (rev 199982)
@@ -0,0 +1,3 @@
+# use "reset=1" as default, since it should be safe for recent devices and
+# solves all kind of problems.
+options btusb reset=1
Copied: bluez/repos/testing-x86_64/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch (from rev 199981, bluez/trunk/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch)
===================================================================
--- testing-x86_64/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch (rev 0)
+++ testing-x86_64/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch 2013-11-20 15:33:51 UTC (rev 199982)
@@ -0,0 +1,59 @@
+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
+
+
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2013-11-20 15:33:19 UTC (rev 199981)
+++ testing-x86_64/PKGBUILD 2013-11-20 15:33:51 UTC (rev 199982)
@@ -1,116 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen <teg at jklm.no>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy at archlinux.org>
-
-pkgbase=bluez
-pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci')
-pkgver=5.11
-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.bz2"
- bluetooth.modprobe)
-md5sums=('c3675ed157a433b6de7391854b907b8c'
- '671c15e99d7154c2df987b71c5851b3d')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- ./configure \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib \
- --enable-library # this is deprecated
-# --enable-experimental \
-
- make all V=1
-}
-
-check() {
- cd $pkgname-$pkgver
- make -k check
-}
-
-
-package_bluez() {
- pkgdesc="Daemons for the bluetooth protocol stack"
- depends=('libical' 'dbus' 'glib2')
- backup=('etc/dbus-1/system.d/bluetooth.conf')
- conflicts=('obexd-client' 'obexd-server')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR=${pkgdir} \
- install-libexecPROGRAMS \
- install-dbussessionbusDATA \
- install-systemdsystemunitDATA \
- install-systemduserunitDATA \
- install-dbussystembusDATA \
- install-dbusDATA \
- install-man8
-
- # add basic documention
- install -dm755 ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis
- cp -a doc/*.txt ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis/
- # fix module loading errors
- install -dm755 ${pkgdir}/usr/lib/modprobe.d
- install -Dm644 ${srcdir}/bluetooth.modprobe ${pkgdir}/usr/lib/modprobe.d/bluetooth-usb.conf
-}
-
-package_bluez-utils() {
- pkgdesc="Development and debugging utilities for the bluetooth protocol stack"
- depends=('dbus' 'systemd')
- conflicts=('bluez-hcidump')
- provides=('bluez-hcidump')
- replaces=('bluez-hcidump' 'bluez<=4.101')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR=${pkgdir} \
- install-binPROGRAMS \
- install-man1
-
- # libbluetooth.so* are part of libLTLIBRARIES and binPROGRAMS targets
- #make DESTDIR=${pkgdir} uninstall-libLTLIBRARIES
- #rmdir ${pkgdir}/usr/lib
- rm -rf ${pkgdir}/usr/lib
-
- # move the hid2hci man page out
- mv ${pkgdir}/usr/share/man/man1/hid2hci.1 ${srcdir}/
-}
-
-package_bluez-libs() {
- pkgdesc="Deprecated libraries for the bluetooth protocol stack"
- depends=('glibc')
- license=('LGPL2.1')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR=${pkgdir} \
- install-includeHEADERS \
- install-libLTLIBRARIES \
- install-pkgconfigDATA
-}
-
-package_bluez-cups() {
- pkgdesc="CUPS printer backend for Bluetooth printers"
- depends=('cups')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR=${pkgdir} install-cupsPROGRAMS
-}
-
-package_bluez-hid2hci() {
- pkgdesc="Put HID proxying bluetooth HCI's into HCI mode"
- depends=('systemd')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR=${pkgdir} \
- install-udevPROGRAMS \
- install-rulesDATA
-
- install -dm755 ${pkgdir}/usr/share/man/man1
- mv ${srcdir}/hid2hci.1 ${pkgdir}/usr/share/man/man1/hid2hci.1
-}
Copied: bluez/repos/testing-x86_64/PKGBUILD (from rev 199981, bluez/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-11-20 15:33:51 UTC (rev 199982)
@@ -0,0 +1,125 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy at archlinux.org>
+
+pkgbase=bluez
+pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci')
+pkgver=5.11
+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.bz2
+ 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
+ bluetooth.modprobe)
+md5sums=('c3675ed157a433b6de7391854b907b8c'
+ 'ec97f23123456900446e8ab17361d6c2'
+ '671c15e99d7154c2df987b71c5851b3d')
+
+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 \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib \
+ --enable-library # this is deprecated
+# --enable-experimental \
+
+ make all V=1
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make -k check
+}
+
+
+package_bluez() {
+ pkgdesc="Daemons for the bluetooth protocol stack"
+ depends=('libical' 'dbus' 'glib2')
+ backup=('etc/dbus-1/system.d/bluetooth.conf')
+ conflicts=('obexd-client' 'obexd-server')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-libexecPROGRAMS \
+ install-dbussessionbusDATA \
+ install-systemdsystemunitDATA \
+ install-systemduserunitDATA \
+ install-dbussystembusDATA \
+ install-dbusDATA \
+ install-man8
+
+ # add basic documention
+ install -dm755 ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis
+ cp -a doc/*.txt ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis/
+ # fix module loading errors
+ install -dm755 ${pkgdir}/usr/lib/modprobe.d
+ install -Dm644 ${srcdir}/bluetooth.modprobe ${pkgdir}/usr/lib/modprobe.d/bluetooth-usb.conf
+}
+
+package_bluez-utils() {
+ pkgdesc="Development and debugging utilities for the bluetooth protocol stack"
+ depends=('dbus' 'systemd')
+ conflicts=('bluez-hcidump')
+ provides=('bluez-hcidump')
+ replaces=('bluez-hcidump' 'bluez<=4.101')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-binPROGRAMS \
+ install-man1
+
+ # libbluetooth.so* are part of libLTLIBRARIES and binPROGRAMS targets
+ #make DESTDIR=${pkgdir} uninstall-libLTLIBRARIES
+ #rmdir ${pkgdir}/usr/lib
+ rm -rf ${pkgdir}/usr/lib
+
+ # move the hid2hci man page out
+ mv ${pkgdir}/usr/share/man/man1/hid2hci.1 ${srcdir}/
+}
+
+package_bluez-libs() {
+ pkgdesc="Deprecated libraries for the bluetooth protocol stack"
+ depends=('glibc')
+ license=('LGPL2.1')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-includeHEADERS \
+ install-libLTLIBRARIES \
+ install-pkgconfigDATA
+}
+
+package_bluez-cups() {
+ pkgdesc="CUPS printer backend for Bluetooth printers"
+ depends=('cups')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} install-cupsPROGRAMS
+}
+
+package_bluez-hid2hci() {
+ pkgdesc="Put HID proxying bluetooth HCI's into HCI mode"
+ depends=('systemd')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-udevPROGRAMS \
+ install-rulesDATA
+
+ install -dm755 ${pkgdir}/usr/share/man/man1
+ mv ${srcdir}/hid2hci.1 ${pkgdir}/usr/share/man/man1/hid2hci.1
+}
Deleted: testing-x86_64/bluetooth.modprobe
===================================================================
--- testing-x86_64/bluetooth.modprobe 2013-11-20 15:33:19 UTC (rev 199981)
+++ testing-x86_64/bluetooth.modprobe 2013-11-20 15:33:51 UTC (rev 199982)
@@ -1,3 +0,0 @@
-# use "reset=1" as default, since it should be safe for recent devices and
-# solves all kind of problems.
-options btusb reset=1
Copied: bluez/repos/testing-x86_64/bluetooth.modprobe (from rev 199981, bluez/trunk/bluetooth.modprobe)
===================================================================
--- testing-x86_64/bluetooth.modprobe (rev 0)
+++ testing-x86_64/bluetooth.modprobe 2013-11-20 15:33:51 UTC (rev 199982)
@@ -0,0 +1,3 @@
+# use "reset=1" as default, since it should be safe for recent devices and
+# solves all kind of problems.
+options btusb reset=1
More information about the arch-commits
mailing list