Merge branch 'tari01-pr/drop-ayatana-indicators-target'

Attributes GH PR #51: https://github.com/AyatanaIndicators/libayatana-indicator/pull/51

7 files changed, 0 insertions, 54 deletions

diff --git a/.build.yml b/.build.yml
index a0c4c0d..6aca8ad 100644
--- a/.build.yml
+++ b/.build.yml
@@ -42,7 +42,6 @@ requires:
     - libx11-dev
     - libxi-dev
     - valac
-    - systemd
     - dbus-test-runner
     - xauth
     - xvfb
@@ -68,7 +67,6 @@ requires:
     - libx11-dev
     - libxi-dev
     - valac
-    - systemd
 
 variables:
   - 'CHECKERS="
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 74b48e6..72a4f86 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -11,20 +11,3 @@ else()
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-0.${API_VERSION}.pc" @ONLY)
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-0.${API_VERSION}.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig/")
 endif()
-
-# ayatana-indicators.target (only required once, so let's do it with FLAVOUR_GTK3)
-
-if (FLAVOUR_GTK3)
-
-    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()
-
-endif()
diff --git a/data/ayatana-indicators.target b/data/ayatana-indicators.target
deleted file mode 100644
index 0dce2e9..0000000
--- a/data/ayatana-indicators.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[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
diff --git a/debian/ayatana-indicator-common.install b/debian/ayatana-indicator-common.install
deleted file mode 100755
index b252da6..0000000
--- a/debian/ayatana-indicator-common.install
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /usr/bin/dh-exec
-[linux-any] usr/lib/systemd
diff --git a/debian/ayatana-indicator-common.links b/debian/ayatana-indicator-common.links
deleted file mode 100644
index 636d594..0000000
--- a/debian/ayatana-indicator-common.links
+++ /dev/null
@@ -1,3 +0,0 @@
-# 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 3a48cb3..e6b5fe7 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ Build-Depends: at-spi2-core,
                libgtk2.0-dev (>= 2.18),
                libgtk-3-dev (>= 2.91.3),
                libayatana-ido3-dev (>= 0.8.0),
-               systemd [linux-any],
 Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Homepage: https://github.com/AyatanaIndicators/libayatana-indicator
@@ -91,24 +90,3 @@ Description: Tools for libayatana-indicator
  .
  This package contains tools useful for developers of applications using
  indicators.
-
-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.
diff --git a/debian/rules b/debian/rules
index 300730b..e40ad17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,6 @@ override_dh_install:
 	find debian/tmp -name \*.la -delete
 	find debian/tmp -name libdummy-indicator\* -delete
 	rm -f debian/tmp/gtk2/usr/share/libayatana-indicator/80indicator-debugging
-	rm -f debian/tmp/gtk2/usr/lib/systemd/user/ayatana-indicators-pre.target
 	dh_install -plibayatana-indicator7 --sourcedir=debian/tmp/gtk2
 	dh_install -plibayatana-indicator-dev --sourcedir=debian/tmp/gtk2
 	dh_install -plibayatana-indicator3-7 --sourcedir=debian/tmp/gtk3