aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@ubuntu.com>2017-05-15 11:03:55 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-05-15 11:04:26 +0200
commit0f686054a7e049e0ba2f33faf779ce308f185128 (patch)
tree1d1316a2ce3c1fb3b97e77d3db47f3e70b503334
parent4ab9812912087fb2530a8b8d6c6d7156fb37dde7 (diff)
downloadlibayatana-indicator-0f686054a7e049e0ba2f33faf779ce308f185128.tar.gz
libayatana-indicator-0f686054a7e049e0ba2f33faf779ce308f185128.tar.bz2
libayatana-indicator-0f686054a7e049e0ba2f33faf779ce308f185128.zip
ayatana-indicator-common: Add a package to hold shared systemd targets for systemd user session.
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac4
-rw-r--r--data/Makefile.am3
-rw-r--r--data/ayatana-indicators-pre.target2
-rw-r--r--debian/ayatana-indicator-common.install1
-rw-r--r--debian/control7
-rwxr-xr-xdebian/rules2
7 files changed, 20 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 1d05fac..6d0fe8d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = \
+ data \
libayatana-indicator \
tools
diff --git a/configure.ac b/configure.ac
index 3aac789..7c1f13d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,6 +71,9 @@ AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
LT_LIB_M
AC_SUBST(LIBM)
+SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd`
+AC_SUBST(SYSTEMD_USERDIR)
+
##############################
# Custom Junk
##############################
@@ -153,6 +156,7 @@ AC_SUBST(COVERAGE_LDFLAGS)
AC_CONFIG_FILES([
Makefile
+data/Makefile
libayatana-indicator/Makefile
libayatana-indicator/ayatana-indicator-0.4.pc.in
libayatana-indicator/ayatana-indicator3-0.4.pc.in
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..5a0f26e
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,3 @@
+systemd_DATA = ayatana-indicators-pre.target
+systemddir = $(SYSTEMD_USERDIR)
+EXTRA_DIST = $(systemd_DATA)
diff --git a/data/ayatana-indicators-pre.target b/data/ayatana-indicators-pre.target
new file mode 100644
index 0000000..6ce241f
--- /dev/null
+++ b/data/ayatana-indicators-pre.target
@@ -0,0 +1,2 @@
+[Unit]
+Description=Target representing the lifecycle of the Ayatana Indicators. Each indicator should be bound to it in its individual service file.
diff --git a/debian/ayatana-indicator-common.install b/debian/ayatana-indicator-common.install
new file mode 100644
index 0000000..512607a
--- /dev/null
+++ b/debian/ayatana-indicator-common.install
@@ -0,0 +1 @@
+usr/lib/systemd
diff --git a/debian/control b/debian/control
index 4327802..3f89298 100644
--- a/debian/control
+++ b/debian/control
@@ -81,3 +81,10 @@ Description: Tools for libayatana-indicator
Tools useful for developers of applications using indicators.
.
This package contains files that are needed to build applications.
+
+Package: ayatana-indicator-common
+Section: libs
+Architecture: all
+Description: libayatana-indicator shared files
+ A package that 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 a76c590..5a13009 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,12 +37,14 @@ 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 --fail-missing --sourcedir=debian/tmp/gtk2
dh_install -plibayatana-indicator-dev --fail-missing --sourcedir=debian/tmp/gtk2
dh_install -plibayatana-indicator-tools --fail-missing --sourcedir=debian/tmp/gtk2
dh_install -plibayatana-indicator3-7 --fail-missing --sourcedir=debian/tmp/gtk3
dh_install -plibayatana-indicator3-dev --fail-missing --sourcedir=debian/tmp/gtk3
dh_install -plibayatana-indicator3-tools --fail-missing --sourcedir=debian/tmp/gtk3
+ dh_install -payatana-indicator-common --fail-missing --sourcedir=debian/tmp/gtk3
override_dh_makeshlibs:
dh_makeshlibs -plibayatana-indicator7 -V 'libayatana-indicator7 (>= 0.6.0)'