Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-wireless/bluez/files: 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch bluez-4.101-network3.patch bluez-4.101-mgmt-update.patch bluez-4.101-network4.patch bluez-4.101-network1.patch bluez-4.101-network2.patch
Date: Sun, 09 Feb 2014 09:10:33
Message-Id: 20140209091028.E326A2004C@flycatcher.gentoo.org
1 pacho 14/02/09 09:10:28
2
3 Added:
4 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
5 Removed: bluez-4.101-network3.patch
6 bluez-4.101-mgmt-update.patch
7 bluez-4.101-network4.patch
8 bluez-4.101-network1.patch
9 bluez-4.101-network2.patch
10 Log:
11 Version bump, drop old
12
13 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
14
15 Revision Changes Path
16 1.1 net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
17
18 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch?rev=1.1&view=markup
19 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch?rev=1.1&content-type=text/plain
20
21 Index: 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
22 ===================================================================
23 From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
24 From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@××××××××××××.org>
25 Date: Sat, 12 Oct 2013 17:45:25 +0200
26 Subject: [PATCH] Allow using obexd without systemd in the user session
27
28 Not all sessions run systemd --user (actually, the majority
29 doesn't), so the dbus daemon must be able to spawn obexd
30 directly, and to do so it needs the full path of the daemon.
31 ---
32 Makefile.obexd | 4 ++--
33 obexd/src/org.bluez.obex.service | 4 ----
34 obexd/src/org.bluez.obex.service.in | 4 ++++
35 3 files changed, 6 insertions(+), 6 deletions(-)
36 delete mode 100644 obexd/src/org.bluez.obex.service
37 create mode 100644 obexd/src/org.bluez.obex.service.in
38
39 diff --git a/Makefile.obexd b/Makefile.obexd
40 index 3760867..142e7c3 100644
41 --- a/Makefile.obexd
42 +++ b/Makefile.obexd
43 @@ -2,12 +2,12 @@
44 if SYSTEMD
45 systemduserunitdir = @SYSTEMD_USERUNITDIR@
46 systemduserunit_DATA = obexd/src/obex.service
47 +endif
48
49 dbussessionbusdir = @DBUS_SESSIONBUSDIR@
50 dbussessionbus_DATA = obexd/src/org.bluez.obex.service
51 -endif
52
53 -EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
54 +EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
55
56 obex_plugindir = $(libdir)/obex/plugins
57
58 diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
59 deleted file mode 100644
60 index a538088..0000000
61 --- a/obexd/src/org.bluez.obex.service
62 +++ /dev/null
63 @@ -1,4 +0,0 @@
64 -[D-BUS Service]
65 -Name=org.bluez.obex
66 -Exec=/bin/false
67 -SystemdService=dbus-org.bluez.obex.service
68 diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
69 new file mode 100644
70 index 0000000..9c815f2
71 --- /dev/null
72 +++ b/obexd/src/org.bluez.obex.service.in
73 @@ -0,0 +1,4 @@
74 +[D-BUS Service]
75 +Name=org.bluez.obex
76 +Exec=@libexecdir@/obexd
77 +SystemdService=dbus-org.bluez.obex.service
78 --
79 1.8.3.1