You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

61 lines
1.9 KiB

  1. Submitted By: Armin K. <krejzi at email dot com>
  2. Date: 2013-04-29
  3. Initial Package Version: 5.17
  4. Upstream Status: unknown
  5. Origin: Arch Linux (Giovanni Campagna)
  6. Description: Allow using obexd without systemd in the user session
  7. Not all sessions run systemd --user (actually, the majority
  8. doesn't), so the dbus daemon must be able to spawn obexd
  9. directly, and to do so it needs the full path of the daemon.
  10. ---
  11. Makefile.obexd | 4 ++--
  12. obexd/src/org.bluez.obex.service | 4 ----
  13. obexd/src/org.bluez.obex.service.in | 4 ++++
  14. 3 files changed, 6 insertions(+), 6 deletions(-)
  15. delete mode 100644 obexd/src/org.bluez.obex.service
  16. create mode 100644 obexd/src/org.bluez.obex.service.in
  17. diff --git a/Makefile.obexd b/Makefile.obexd
  18. index 3760867..142e7c3 100644
  19. --- a/Makefile.obexd
  20. +++ b/Makefile.obexd
  21. @@ -2,12 +2,12 @@
  22. if SYSTEMD
  23. systemduserunitdir = @SYSTEMD_USERUNITDIR@
  24. systemduserunit_DATA = obexd/src/obex.service
  25. +endif
  26. dbussessionbusdir = @DBUS_SESSIONBUSDIR@
  27. dbussessionbus_DATA = obexd/src/org.bluez.obex.service
  28. -endif
  29. -EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
  30. +EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
  31. obex_plugindir = $(libdir)/obex/plugins
  32. diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
  33. deleted file mode 100644
  34. index a538088..0000000
  35. --- a/obexd/src/org.bluez.obex.service
  36. +++ /dev/null
  37. @@ -1,4 +0,0 @@
  38. -[D-BUS Service]
  39. -Name=org.bluez.obex
  40. -Exec=/bin/false
  41. -SystemdService=dbus-org.bluez.obex.service
  42. diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
  43. new file mode 100644
  44. index 0000000..9c815f2
  45. --- /dev/null
  46. +++ b/obexd/src/org.bluez.obex.service.in
  47. @@ -0,0 +1,4 @@
  48. +[D-BUS Service]
  49. +Name=org.bluez.obex
  50. +Exec=@libexecdir@/obexd
  51. +SystemdService=dbus-org.bluez.obex.service
  52. --
  53. 1.8.3.1