diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-08-10 08:59:23 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-08-10 08:59:23 +0200 |
commit | 1f17333ef7730fe77187a637786ddd24f5e7850b (patch) | |
tree | b7088b61531b8137aa8d0d61113e9eae18e0022c | |
parent | 803dd51c1404d44e9088d6acbb68f22e54919309 (diff) | |
parent | f084bca48ea7633aa43bfb63832cc710766c13c3 (diff) | |
download | ayatana-indicator-datetime-1f17333ef7730fe77187a637786ddd24f5e7850b.tar.gz ayatana-indicator-datetime-1f17333ef7730fe77187a637786ddd24f5e7850b.tar.bz2 ayatana-indicator-datetime-1f17333ef7730fe77187a637786ddd24f5e7850b.zip |
Merge branch 'ubports-fix-systemd'
Attributes GH PR #9: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/9
-rw-r--r-- | data/ayatana-indicator-datetime.service.in | 5 | ||||
-rw-r--r-- | debian/ayatana-indicator-datetime.links | 2 | ||||
-rw-r--r-- | debian/control | 1 | ||||
-rwxr-xr-x | debian/rules | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/data/ayatana-indicator-datetime.service.in b/data/ayatana-indicator-datetime.service.in index 3c1ce6a..da1cd54 100644 --- a/data/ayatana-indicator-datetime.service.in +++ b/data/ayatana-indicator-datetime.service.in @@ -1,8 +1,11 @@ [Unit] Description=Ayatana Indicator DateTime Service PartOf=graphical-session.target -After=ayatana-indicators-pre.target +PartOf=ayatana-indicators.target [Service] ExecStart=@pkglibexecdir@/ayatana-indicator-datetime-service Restart=on-failure + +[Install] +WantedBy=ayatana-indicators.target diff --git a/debian/ayatana-indicator-datetime.links b/debian/ayatana-indicator-datetime.links new file mode 100644 index 0000000..ba57b5b --- /dev/null +++ b/debian/ayatana-indicator-datetime.links @@ -0,0 +1,2 @@ +# Because dh-systemd does not yet support user units, we manually make the WantedBy link +/usr/lib/systemd/user/ayatana-indicator-datetime.service /usr/lib/systemd/user/ayatana-indicators.target.wants/ayatana-indicator-datetime.service diff --git a/debian/control b/debian/control index e91fd9c..d2a27e5 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Build-Depends: cmake, cmake-extras (>= 0.10), dbus, debhelper (>= 9), + dh-systemd, intltool, libaccounts-glib-dev (>= 1.18), libglib2.0-dev (>= 2.35.4), diff --git a/debian/rules b/debian/rules index 7b52e8c..37eb8b7 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ LDFLAGS += -Wl,-z,defs -Wl,--as-needed %: - dh $@ + dh $@ --with systemd override_dh_auto_configure: dh_auto_configure -- -Denable_tests=OFF |