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

[Timo Aaltonen (@tjaalton)]

Timo Aaltonen pushed to branch master at FreeIPA packaging / oddjob


Commits:
4fa4ae5e by Timo Aaltonen at 2023-11-16T13:29:30+02:00
Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #1052994)

- - - - -
f883382f by Timo Aaltonen at 2023-11-16T13:29:43+02:00
releasing package oddjob version 0.34.7-2

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/oddjob.install
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,13 @@
-oddjob (0.34.7-2) UNRELEASED; urgency=medium
+oddjob (0.34.7-2) unstable; urgency=medium
 
+  [ Debian Janitor ]
   * Update watch file format version to 4.
   * Update standards version to 4.6.1, no changes needed.
 
- -- Debian Janitor <janitor at jelmer.uk>  Fri, 14 Oct 2022 16:52:27 -0000
+  [ Helmut Grohne ]
+  * Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #1052994)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Thu, 16 Nov 2023 13:29:36 +0200
 
 oddjob (0.34.7-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -14,6 +14,7 @@ Build-Depends:
  libxml2-dev,
  pkg-config,
  systemd,
+ systemd-dev,
  xmlto,
 Standards-Version: 4.6.1
 Homepage: https://pagure.io/oddjob/


=====================================
debian/oddjob.install
=====================================
@@ -1,7 +1,7 @@
 etc/dbus-1/system.d/oddjob.conf
 etc/oddjobd.conf
 etc/oddjobd.conf.d/oddjobd-introspection.conf
-lib/systemd/system/oddjobd.service
+${env:deb_systemdsystemunitdir}/oddjobd.service
 usr/bin/oddjob_request
 usr/libexec/oddjob/sanity.sh
 usr/sbin/oddjobd


=====================================
debian/rules
=====================================
@@ -3,6 +3,7 @@
 # see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
+export deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,)
 
 %:
 	dh $@
@@ -25,7 +26,7 @@ override_dh_install:
 	# purge .la files
 	find $(CURDIR)/debian/tmp -name "*.la" -type f -exec rm -f "{}" \;
 	# move pam module to correct location
-	mkdir $(CURDIR)/debian/tmp/lib/${DEB_HOST_MULTIARCH}
+	mkdir -p $(CURDIR)/debian/tmp/lib/${DEB_HOST_MULTIARCH}
 	mv $(CURDIR)/debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/security \
 		$(CURDIR)/debian/tmp/lib/${DEB_HOST_MULTIARCH}/
 



View it on GitLab: https://salsa.debian.org/freeipa-team/oddjob/-/compare/d081d9cffcfe05ea8cfbd50291021e32fd8db61d...f883382f3f66d171cb0162e74e543ee3fdb2585e

-- 
View it on GitLab: https://salsa.debian.org/freeipa-team/oddjob/-/compare/d081d9cffcfe05ea8cfbd50291021e32fd8db61d...f883382f3f66d171cb0162e74e543ee3fdb2585e
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/20231116/665a6986/attachment-0001.htm>