diff options
| author | Ted Gould <ted@gould.cx> | 2016-10-23 09:01:58 +0000 |
|---|---|---|
| committer | Bileto Bot <ci-train-bot@canonical.com> | 2016-10-23 09:01:58 +0000 |
| commit | accdf3250ae140a3964ea97683ed23496798b968 (patch) | |
| tree | c1be0ddbc4ec0b6c1f796bdfa1a16e126c8dde85 | |
| parent | 285ce0ffd0aef8f689e943ae638af18f84f8b9a5 (diff) | |
| parent | 2e85ab90f4acdcd548bbe40e3d13731f26f2e3d9 (diff) | |
| download | ayatana-indicator-bluetooth-accdf3250ae140a3964ea97683ed23496798b968.tar.gz ayatana-indicator-bluetooth-accdf3250ae140a3964ea97683ed23496798b968.tar.bz2 ayatana-indicator-bluetooth-accdf3250ae140a3964ea97683ed23496798b968.zip | |
Adding an systemd user session unit
Approved by: Martin Pitt, unity-api-1-bot
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 15 | ||||
| -rw-r--r-- | data/indicator-bluetooth.override | 1 | ||||
| -rw-r--r-- | data/indicator-bluetooth.service.in | 8 | ||||
| -rw-r--r-- | debian/control | 2 |
5 files changed, 28 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 221ddc9..e744e3b 100644 --- a/configure.ac +++ b/configure.ac @@ -22,6 +22,8 @@ PKG_CHECK_MODULES(SERVICE_DEPS, [glib-2.0 >= $GLIB_REQUIRED_VERSION gio-unix-2.0 >= $GIO_REQUIRED_VERSION url-dispatcher-1 >= $URL_DISPATCHER_1_REQUIRED_VERSION]) +SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd` +AC_SUBST(SYSTEMD_USERDIR) dnl ############################## dnl # Custom Junk diff --git a/data/Makefile.am b/data/Makefile.am index 81f4d5e..9dd100b 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -8,6 +8,21 @@ SUBDIRS = upstart indicatorsdir = $(datadir)/unity/indicators dist_indicators_DATA = com.canonical.indicator.bluetooth +# the systemd unit file +systemddir = $(SYSTEMD_USERDIR) +systemd_DATA = indicator-bluetooth.service +systemd_in = $(systemd_DATA:.service=.service.in) +$(systemd_DATA): $(systemd_in) + $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ +BUILT_SOURCES += $(systemd_DATA) +EXTRA_DIST += $(systemd_in) +CLEANFILES += $(systemd_DATA) + +# the systemd upstart override +upstart_overridedir = $(datadir)/upstart/systemd-session/upstart +upstart_override_DATA = indicator-bluetooth.override +EXTRA_DIST += $(upstart_override_DATA) + # the upstart job file upstart_jobsdir = $(datadir)/upstart/sessions upstart_jobs_DATA = indicator-bluetooth.conf diff --git a/data/indicator-bluetooth.override b/data/indicator-bluetooth.override new file mode 100644 index 0000000..2905494 --- /dev/null +++ b/data/indicator-bluetooth.override @@ -0,0 +1 @@ +manual diff --git a/data/indicator-bluetooth.service.in b/data/indicator-bluetooth.service.in new file mode 100644 index 0000000..e99e610 --- /dev/null +++ b/data/indicator-bluetooth.service.in @@ -0,0 +1,8 @@ +[Unit] +Description=Indicator Bluetooth Backend +PartOf=graphical-session.target +After=indicators-pre.target + +[Service] +ExecStart=@pkglibexecdir@/indicator-bluetooth-service +Restart=on-failure diff --git a/debian/control b/debian/control index eba86eb..1a4d509 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 9.0), gnome-common, libglib2.0-dev, liburl-dispatcher1-dev, + systemd, valac (>=0.18), Standards-Version: 3.9.4 Homepage: https://launchpad.net/indicator-bluetooth @@ -24,6 +25,7 @@ Depends: ${misc:Depends}, bluez (>= 5), unity-control-center | gnome-control-center | ubuntu-system-settings, gnome-bluetooth | ubuntu-system-settings, + indicator-common, Replaces: gnome-bluetooth (<< 3.6.1-0ubuntu2) Breaks: gnome-bluetooth (<< 3.6.1-0ubuntu2) Description: System bluetooth indicator. |