Date: Thursday, April 17, 2014 @ 15:28:11 Author: andyrtr Revision: 211145
archrelease: copy trunk to extra-i686, extra-x86_64 Added: bluez/repos/extra-i686/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch (from rev 211144, bluez/trunk/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch) bluez/repos/extra-i686/PKGBUILD (from rev 211144, bluez/trunk/PKGBUILD) bluez/repos/extra-i686/bluetooth.modprobe (from rev 211144, bluez/trunk/bluetooth.modprobe) bluez/repos/extra-x86_64/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch (from rev 211144, bluez/trunk/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch) bluez/repos/extra-x86_64/PKGBUILD (from rev 211144, bluez/trunk/PKGBUILD) bluez/repos/extra-x86_64/bluetooth.modprobe (from rev 211144, bluez/trunk/bluetooth.modprobe) Deleted: bluez/repos/extra-i686/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch bluez/repos/extra-i686/PKGBUILD bluez/repos/extra-i686/bluetooth.modprobe bluez/repos/extra-x86_64/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch bluez/repos/extra-x86_64/PKGBUILD bluez/repos/extra-x86_64/bluetooth.modprobe -------------------------------------------------------------------------------+ /0001-Allow-using-obexd-without-systemd-in-the-user-session.patch | 118 ++++ /PKGBUILD | 288 ++++++++++ /bluetooth.modprobe | 6 extra-i686/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch | 59 -- extra-i686/PKGBUILD | 144 ----- extra-i686/bluetooth.modprobe | 3 extra-x86_64/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch | 59 -- extra-x86_64/PKGBUILD | 144 ----- extra-x86_64/bluetooth.modprobe | 3 9 files changed, 412 insertions(+), 412 deletions(-) Deleted: extra-i686/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch =================================================================== --- extra-i686/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch 2014-04-17 13:27:45 UTC (rev 211144) +++ extra-i686/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch 2014-04-17 13:28:11 UTC (rev 211145) @@ -1,59 +0,0 @@ -From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna <gcampagna-cnudlrotfmnnlxjtenl...@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 - - Copied: bluez/repos/extra-i686/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch (from rev 211144, bluez/trunk/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch) =================================================================== --- extra-i686/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch (rev 0) +++ extra-i686/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch 2014-04-17 13:28:11 UTC (rev 211145) @@ -0,0 +1,59 @@ +From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna <gcampagna-cnudlrotfmnnlxjtenl...@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: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2014-04-17 13:27:45 UTC (rev 211144) +++ extra-i686/PKGBUILD 2014-04-17 13:28:11 UTC (rev 211145) @@ -1,144 +0,0 @@ -# $Id$ -# Maintainer: Tom Gundersen <t...@jklm.no> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Geoffroy Carrier <geoff...@archlinux.org> - -pkgbase=bluez -pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins') -pkgver=5.17 -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 - 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch - bluetooth.modprobe) -# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc -sha256sums=('0bd7f009225fff83ba4b3697a6b04d04454ef2cd15d6bb2bd62591c44cfe973a' - '896a1403d9b7258c4fb0d41f3a6f70fd51eaa1115ab3f4259f3dbbe02b55766b' - '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4') - -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-sixaxis \ - --enable-library # this is deprecated -# --enable-experimental \ - - make all V=1 -} - -check() { - cd $pkgname-$pkgver - make check -} - - -package_bluez() { - pkgdesc="Daemons for the bluetooth protocol stack" - depends=('libical' 'dbus' 'glib2') - backup=('etc/dbus-1/system.d/bluetooth.conf' - 'etc/bluetooth/main.conf') - conflicts=('obexd-client' 'obexd-server') - - cd ${pkgbase}-${pkgver} - #make DESTDIR=${pkgdir} install - #return 1 - - make DESTDIR=${pkgdir} \ - install-libexecPROGRAMS \ - install-dbussessionbusDATA \ - install-systemdsystemunitDATA \ - install-systemduserunitDATA \ - install-dbussystembusDATA \ - install-dbusDATA \ - install-man8 - - # ship upstream main config file - install -dm755 ${pkgdir}/etc/bluetooth - install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/src/main.conf ${pkgdir}/etc/bluetooth/main.conf - - # 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 -} - -package_bluez-plugins() { - pkgdesc="bluez plugins (PS3 Sixaxis controller)" - depends=('systemd') - - cd ${pkgbase}-${pkgver} - make DESTDIR=${pkgdir} \ - install-pluginLTLIBRARIES -} Copied: bluez/repos/extra-i686/PKGBUILD (from rev 211144, bluez/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2014-04-17 13:28:11 UTC (rev 211145) @@ -0,0 +1,144 @@ +# $Id$ +# Maintainer: Tom Gundersen <t...@jklm.no> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Geoffroy Carrier <geoff...@archlinux.org> + +pkgbase=bluez +pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins') +pkgver=5.18 +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 + 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch + bluetooth.modprobe) +# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc +sha256sums=('8c8bb13db83d0de6c85def2da8dfa0a758aff595405fb57a00719ed94d558340' + '896a1403d9b7258c4fb0d41f3a6f70fd51eaa1115ab3f4259f3dbbe02b55766b' + '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4') + +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-sixaxis \ + --enable-library # this is deprecated +# --enable-experimental \ + + make all V=1 +} + +check() { + cd $pkgname-$pkgver + #make check +} + + +package_bluez() { + pkgdesc="Daemons for the bluetooth protocol stack" + depends=('libical' 'dbus' 'glib2') + backup=('etc/dbus-1/system.d/bluetooth.conf' + 'etc/bluetooth/main.conf') + conflicts=('obexd-client' 'obexd-server') + + cd ${pkgbase}-${pkgver} + #make DESTDIR=${pkgdir} install + #return 1 + + make DESTDIR=${pkgdir} \ + install-libexecPROGRAMS \ + install-dbussessionbusDATA \ + install-systemdsystemunitDATA \ + install-systemduserunitDATA \ + install-dbussystembusDATA \ + install-dbusDATA \ + install-man8 + + # ship upstream main config file + install -dm755 ${pkgdir}/etc/bluetooth + install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/src/main.conf ${pkgdir}/etc/bluetooth/main.conf + + # 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 +} + +package_bluez-plugins() { + pkgdesc="bluez plugins (PS3 Sixaxis controller)" + depends=('systemd') + + cd ${pkgbase}-${pkgver} + make DESTDIR=${pkgdir} \ + install-pluginLTLIBRARIES +} Deleted: extra-i686/bluetooth.modprobe =================================================================== --- extra-i686/bluetooth.modprobe 2014-04-17 13:27:45 UTC (rev 211144) +++ extra-i686/bluetooth.modprobe 2014-04-17 13:28:11 UTC (rev 211145) @@ -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/extra-i686/bluetooth.modprobe (from rev 211144, bluez/trunk/bluetooth.modprobe) =================================================================== --- extra-i686/bluetooth.modprobe (rev 0) +++ extra-i686/bluetooth.modprobe 2014-04-17 13:28:11 UTC (rev 211145) @@ -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 Deleted: extra-x86_64/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch =================================================================== --- extra-x86_64/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch 2014-04-17 13:27:45 UTC (rev 211144) +++ extra-x86_64/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch 2014-04-17 13:28:11 UTC (rev 211145) @@ -1,59 +0,0 @@ -From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna <gcampagna-cnudlrotfmnnlxjtenl...@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 - - Copied: bluez/repos/extra-x86_64/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch (from rev 211144, bluez/trunk/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch) =================================================================== --- extra-x86_64/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch (rev 0) +++ extra-x86_64/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch 2014-04-17 13:28:11 UTC (rev 211145) @@ -0,0 +1,59 @@ +From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna <gcampagna-cnudlrotfmnnlxjtenl...@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: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2014-04-17 13:27:45 UTC (rev 211144) +++ extra-x86_64/PKGBUILD 2014-04-17 13:28:11 UTC (rev 211145) @@ -1,144 +0,0 @@ -# $Id$ -# Maintainer: Tom Gundersen <t...@jklm.no> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Geoffroy Carrier <geoff...@archlinux.org> - -pkgbase=bluez -pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins') -pkgver=5.17 -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 - 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch - bluetooth.modprobe) -# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc -sha256sums=('0bd7f009225fff83ba4b3697a6b04d04454ef2cd15d6bb2bd62591c44cfe973a' - '896a1403d9b7258c4fb0d41f3a6f70fd51eaa1115ab3f4259f3dbbe02b55766b' - '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4') - -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-sixaxis \ - --enable-library # this is deprecated -# --enable-experimental \ - - make all V=1 -} - -check() { - cd $pkgname-$pkgver - make check -} - - -package_bluez() { - pkgdesc="Daemons for the bluetooth protocol stack" - depends=('libical' 'dbus' 'glib2') - backup=('etc/dbus-1/system.d/bluetooth.conf' - 'etc/bluetooth/main.conf') - conflicts=('obexd-client' 'obexd-server') - - cd ${pkgbase}-${pkgver} - #make DESTDIR=${pkgdir} install - #return 1 - - make DESTDIR=${pkgdir} \ - install-libexecPROGRAMS \ - install-dbussessionbusDATA \ - install-systemdsystemunitDATA \ - install-systemduserunitDATA \ - install-dbussystembusDATA \ - install-dbusDATA \ - install-man8 - - # ship upstream main config file - install -dm755 ${pkgdir}/etc/bluetooth - install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/src/main.conf ${pkgdir}/etc/bluetooth/main.conf - - # 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 -} - -package_bluez-plugins() { - pkgdesc="bluez plugins (PS3 Sixaxis controller)" - depends=('systemd') - - cd ${pkgbase}-${pkgver} - make DESTDIR=${pkgdir} \ - install-pluginLTLIBRARIES -} Copied: bluez/repos/extra-x86_64/PKGBUILD (from rev 211144, bluez/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2014-04-17 13:28:11 UTC (rev 211145) @@ -0,0 +1,144 @@ +# $Id$ +# Maintainer: Tom Gundersen <t...@jklm.no> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Geoffroy Carrier <geoff...@archlinux.org> + +pkgbase=bluez +pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins') +pkgver=5.18 +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 + 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch + bluetooth.modprobe) +# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc +sha256sums=('8c8bb13db83d0de6c85def2da8dfa0a758aff595405fb57a00719ed94d558340' + '896a1403d9b7258c4fb0d41f3a6f70fd51eaa1115ab3f4259f3dbbe02b55766b' + '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4') + +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-sixaxis \ + --enable-library # this is deprecated +# --enable-experimental \ + + make all V=1 +} + +check() { + cd $pkgname-$pkgver + #make check +} + + +package_bluez() { + pkgdesc="Daemons for the bluetooth protocol stack" + depends=('libical' 'dbus' 'glib2') + backup=('etc/dbus-1/system.d/bluetooth.conf' + 'etc/bluetooth/main.conf') + conflicts=('obexd-client' 'obexd-server') + + cd ${pkgbase}-${pkgver} + #make DESTDIR=${pkgdir} install + #return 1 + + make DESTDIR=${pkgdir} \ + install-libexecPROGRAMS \ + install-dbussessionbusDATA \ + install-systemdsystemunitDATA \ + install-systemduserunitDATA \ + install-dbussystembusDATA \ + install-dbusDATA \ + install-man8 + + # ship upstream main config file + install -dm755 ${pkgdir}/etc/bluetooth + install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/src/main.conf ${pkgdir}/etc/bluetooth/main.conf + + # 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 +} + +package_bluez-plugins() { + pkgdesc="bluez plugins (PS3 Sixaxis controller)" + depends=('systemd') + + cd ${pkgbase}-${pkgver} + make DESTDIR=${pkgdir} \ + install-pluginLTLIBRARIES +} Deleted: extra-x86_64/bluetooth.modprobe =================================================================== --- extra-x86_64/bluetooth.modprobe 2014-04-17 13:27:45 UTC (rev 211144) +++ extra-x86_64/bluetooth.modprobe 2014-04-17 13:28:11 UTC (rev 211145) @@ -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/extra-x86_64/bluetooth.modprobe (from rev 211144, bluez/trunk/bluetooth.modprobe) =================================================================== --- extra-x86_64/bluetooth.modprobe (rev 0) +++ extra-x86_64/bluetooth.modprobe 2014-04-17 13:28:11 UTC (rev 211145) @@ -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