debian/control

@@ -9,7 +9,7 @@ Vcs-Browser: https://salsa.debian.org/freeipa-team/freeipa
 Homepage: http://www.freeipa.org
 Build-Depends:
  check,
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
  dh-python,
  gettext,
  krb5-user,
@@ -18,7 +18,7 @@ Build-Depends:
  libini-config-dev,
  libjansson-dev,
  libkrad-dev,
- libkrb5-dev (>= 1.17),
+ libkrb5-dev (>= 1.18),
  libldap2-dev,
  libnspr4-dev,
  libpopt-dev,
@@ -49,7 +49,7 @@ Build-Depends:
  python3-sss (>= 1.14.0),
  python3-usb (>= 1.0.0~b2),
  python3-yubico,
- systemd-dev | systemd,
+ systemd-dev,
  uuid-dev,
 
 Package: freeipa-common

debian/freeipa-client-epn.install

@@ -1,7 +1,7 @@
 etc/ipa/epn.conf
 etc/ipa/epn/expire_msg.template
-@systemdsystemunitdir@/ipa-epn.service
-@systemdsystemunitdir@/ipa-epn.timer
+${env:systemdsystemunitdir}/ipa-epn.service
+${env:systemdsystemunitdir}/ipa-epn.timer
 usr/sbin/ipa-epn
 usr/share/man/man1/ipa-epn.1
 usr/share/man/man5/epn.conf.5

debian/rules

@@ -20,13 +20,7 @@ DESTDIR=$(CURDIR)/debian/tmp
 export PYTHON=python3
 export am_cv_python_pythondir=/usr/lib/python3/dist-packages
 export am_cv_python_pyexecdir=/usr/lib/python3/dist-packages
-
-# Detect systemd unit dir with fallback
-systemdsystemunitdir := $(shell pkgconf --variable=systemdsystemunitdir systemd 2>/dev/null | sed 's,^/,,')
-ifeq ($(systemdsystemunitdir),)
-systemdsystemunitdir := lib/systemd/system
-endif
-export systemdsystemunitdir
+export systemdsystemunitdir=$(shell pkgconf --variable=systemdsystemunitdir systemd | sed s,^/,,)
 
 confflags = \
 	--libexecdir=/usr/lib/ \
@@ -113,12 +107,6 @@ endif
 override_dh_missing:
 	dh_missing --fail-missing
 
-# Generate .install files from templates with correct systemdsystemunitdir
-override_dh_install:
-	sed "s|@systemdsystemunitdir@|$(systemdsystemunitdir)|g" debian/freeipa-client-epn.install.in > debian/freeipa-client-epn.install
-	dh_install
-
-
 ifneq ($(ONLY_CLIENT), 1)
 override_dh_installsystemd:
 	dh_installsystemd -pfreeipa-server --no-enable ipa.service