[Pkg-freeipa-devel] [Git][freeipa-team/freeipa][master] 2 commits: Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #1052641)

[Timo Aaltonen (@tjaalton)]

Timo Aaltonen pushed to branch master at FreeIPA packaging / freeipa


Commits:
cd164eb2 by Timo Aaltonen at 2023-09-25T17:44:20+03:00
Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #1052641)

- - - - -
032d79de by Timo Aaltonen at 2023-10-18T12:48:49+03:00
releasing package freeipa version 4.10.2-2

- - - - -


4 changed files:

- debian/changelog
- debian/freeipa-client-epn.install
- debian/freeipa-server.install
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,13 @@
-freeipa (4.10.2-2) UNRELEASED; urgency=medium
+freeipa (4.10.2-2) unstable; urgency=medium
 
+  [ Timo Aaltonen ]
   * control: Bump certmonger dependency.
 
- -- Timo Aaltonen <tjaalton at debian.org>  Thu, 10 Aug 2023 11:50:19 +0300
+  [ Helmut Grohne ]
+  * Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes:
+    #1052641)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Wed, 18 Oct 2023 12:46:48 +0300
 
 freeipa (4.10.2-1) unstable; urgency=medium
 


=====================================
debian/freeipa-client-epn.install
=====================================
@@ -1,7 +1,7 @@
 etc/ipa/epn.conf
 etc/ipa/epn/expire_msg.template
-lib/systemd/system/ipa-epn.service
-lib/systemd/system/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/freeipa-server.install
=====================================
@@ -4,15 +4,15 @@ etc/ipa/html/*
 etc/ipa/kdcproxy
 etc/dbus-1/system.d/org.freeipa.server.conf
 etc/oddjobd.conf.d/ipa-server.conf
-lib/systemd/system/ipa-ccache-sweep.service
-lib/systemd/system/ipa-ccache-sweep.timer
-lib/systemd/system/ipa-custodia.service
-lib/systemd/system/ipa-dnskeysyncd.service
-lib/systemd/system/ipa-ods-exporter.service
-lib/systemd/system/ipa-ods-exporter.socket
-lib/systemd/system/ipa-otpd.socket
-lib/systemd/system/ipa-otpd at .service
-lib/systemd/system/ipa.service
+${env:systemdsystemunitdir}/ipa-ccache-sweep.service
+${env:systemdsystemunitdir}/ipa-ccache-sweep.timer
+${env:systemdsystemunitdir}/ipa-custodia.service
+${env:systemdsystemunitdir}/ipa-dnskeysyncd.service
+${env:systemdsystemunitdir}/ipa-ods-exporter.service
+${env:systemdsystemunitdir}/ipa-ods-exporter.socket
+${env:systemdsystemunitdir}/ipa-otpd.socket
+${env:systemdsystemunitdir}/ipa-otpd at .service
+${env:systemdsystemunitdir}/ipa.service
 usr/lib/*/dirsrv/plugins/libipa_cldap.so
 usr/lib/*/dirsrv/plugins/libipa_dns.so
 usr/lib/*/dirsrv/plugins/libipa_enrollment_extop.so


=====================================
debian/rules
=====================================
@@ -20,6 +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
+export systemdsystemunitdir=$(shell pkgconf --variable=systemdsystemunitdir systemd | sed s,^/,,)
 
 confflags = \
 	--libexecdir=/usr/lib/ \



View it on GitLab: https://salsa.debian.org/freeipa-team/freeipa/-/compare/023a31206a13b62beb8e032a93a9e2a4f8be9272...032d79de5429d5a71d7f8b933bacf4815214c30f

-- 
View it on GitLab: https://salsa.debian.org/freeipa-team/freeipa/-/compare/023a31206a13b62beb8e032a93a9e2a4f8be9272...032d79de5429d5a71d7f8b933bacf4815214c30f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20231018/0a1a0aed/attachment-0001.htm>