From 5a26b01658139d8de10327e3c4afc00305aba9dd Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Tue, 15 Jun 2021 01:46:49 +0200 Subject: data/: Add ayatana-indicators.target (moved from libayatana-indicator). Fixes https://github.com/AyatanaIndicators/libayatana-common/issues/24 --- data/CMakeLists.txt | 13 +++++++++++++ data/ayatana-indicators.target | 7 +++++++ 2 files changed, 20 insertions(+) create mode 100644 data/ayatana-indicators.target diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 7f12337..2949f15 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -4,3 +4,16 @@ find_package(GSettings) set(ENV{LC_ALL} "C") execute_process(COMMAND intltool-merge -quiet --xml-style --utf8 --no-translations "${CMAKE_CURRENT_SOURCE_DIR}/org.ayatana.common.gschema.xml.in" "${CMAKE_CURRENT_BINARY_DIR}/org.ayatana.common.gschema.xml") add_schema("org.ayatana.common.gschema.xml") + +# ayatana-indicators.target + +pkg_check_modules(SYSTEMD systemd) + +if (${SYSTEMD_FOUND}) + if (${SYSTEMD_VERSION} VERSION_LESS 247) + set(SYSTEMD_USER_UNIT_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/systemd/user") + else() + pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemd_user_unit_dir) + endif() + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicators.target" DESTINATION "${SYSTEMD_USER_UNIT_DIR}") +endif() diff --git a/data/ayatana-indicators.target b/data/ayatana-indicators.target new file mode 100644 index 0000000..0dce2e9 --- /dev/null +++ b/data/ayatana-indicators.target @@ -0,0 +1,7 @@ +[Unit] +Description=Target representing the lifecycle of the Ayatana Indicators. Each indicator should be bound to it in its individual service file. +PartOf=graphical-session.target + +[Install] +# Old name for this target, kept for compatibility +Alias=ayatana-indicators-pre.target -- cgit v1.2.3 From 67301a94834376cf49adf4ec6133f89793acfd8a Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Tue, 15 Jun 2021 02:11:44 +0200 Subject: .build.yml: Add systemd dependency --- .build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.build.yml b/.build.yml index 870b03c..ac45e68 100644 --- a/.build.yml +++ b/.build.yml @@ -32,6 +32,7 @@ requires: - libglib2.0-dev - liblomiri-url-dispatcher-dev - libgtest-dev + - systemd debian:stable: # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-ido @@ -46,6 +47,7 @@ requires: - mate-common - libglib2.0-dev - libgtest-dev + - systemd ubuntu: - autopoint @@ -59,6 +61,7 @@ requires: - libglib2.0-dev - liblomiri-url-dispatcher-dev - libgtest-dev + - systemd ubuntu:focal: - autopoint @@ -71,6 +74,7 @@ requires: - mate-common - libglib2.0-dev - libgtest-dev + - systemd variables: - 'CHECKERS=" -- cgit v1.2.3 From 02200d285cfdb062a96288777fdff29f928838c0 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Tue, 15 Jun 2021 01:44:13 +0200 Subject: debian/: Add bin:pkg ayatana-indicator-common (moved from src:pkg libayatana-indicator). - d/ayatana-indicator-common.install: Add file. - d/ayatana-indicator-common.links: Add file. - d/control: + Add bin:pkg ayatana-indicator-common. + Add systemd dependency. --- debian/ayatana-indicator-common.install | 2 ++ debian/ayatana-indicator-common.links | 3 +++ debian/control | 22 ++++++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100755 debian/ayatana-indicator-common.install create mode 100644 debian/ayatana-indicator-common.links diff --git a/debian/ayatana-indicator-common.install b/debian/ayatana-indicator-common.install new file mode 100755 index 0000000..b252da6 --- /dev/null +++ b/debian/ayatana-indicator-common.install @@ -0,0 +1,2 @@ +#! /usr/bin/dh-exec +[linux-any] usr/lib/systemd diff --git a/debian/ayatana-indicator-common.links b/debian/ayatana-indicator-common.links new file mode 100644 index 0000000..636d594 --- /dev/null +++ b/debian/ayatana-indicator-common.links @@ -0,0 +1,3 @@ +# Because dh-systemd does not yet support user units, we manually make the Alias link +# FIXME: drop this once we bump DH compat level to 12 or higher +/usr/lib/systemd/user/ayatana-indicators.target /usr/lib/systemd/user/ayatana-indicators-pre.target diff --git a/debian/control b/debian/control index 8aa32d8..b735448 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: cmake, liblomiri-url-dispatcher-dev | hello, libglib2.0-dev (>= 2.36), pkg-config, + systemd [linux-any], Standards-Version: 4.5.1 Homepage: https://github.com/AyatanaIndicators/libayatana-common Vcs-Git: https://github.com/AyatanaIndicators/libayatana-common.git @@ -38,3 +39,24 @@ Description: Ayatana System Indicators' common API functions (development header Indicators. . This package contains the development headers. + +Package: ayatana-indicator-common +Architecture: all +Depends: ${misc:Depends}, +Multi-Arch: foreign +Breaks: ayatana-indicator-application (<< 0.8.0), + ayatana-indicator-datetime (<< 0.8.0), + ayatana-indicator-display (<< 0.8.0), + ayatana-indicator-keyboard (<< 0.8.0), + ayatana-indicator-messages (<< 0.8.0), + ayatana-indicator-notifications (<< 0.8.0), + ayatana-indicator-printers (<< 0.8.0), + ayatana-indicator-power (<< 2.1.0), + ayatana-indicator-session (<< 0.8.0), + ayatana-indicator-sound (<< 0.8.0), +Description: libayatana-indicator shared files + The Ayatana Indicators library contains information to build indicators + to go into modern desktops' indicator applets. + . + This package has files needed to work with the Ayatana Indicators. This + includes the systemd ayatana-indicators-pre.target. -- cgit v1.2.3