[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1054014: ladvd: defer location of systemd unit to systemd.pc



Source: ladvd
Version: 1.1.2-2
Tags: patch
User: helmutg@debian.org
Usertags: dep17m2

We want to move aliased files from / to /usr to finalize the /usr-merge
transition via DEP17. ladvd is affected, because it ships a systemd unit
below /lib. Rather than moving it to /usr, I recommend deferring the
placement to systemd.pc. If ladvd gets backported to bookworm, it'll
automatically revert to the old /lib placement thus honouring the file
move moratorium that still affects bookworm. I'm attaching a patch for
your convenience.

Helmut
diff -Nru ladvd-1.1.2/debian/changelog ladvd-1.1.2/debian/changelog
--- ladvd-1.1.2/debian/changelog	2022-10-23 08:10:08.000000000 +0200
+++ ladvd-1.1.2/debian/changelog	2023-10-15 22:06:55.000000000 +0200
@@ -1,3 +1,9 @@
+ladvd (1.1.2-3) UNRELEASED; urgency=medium
+
+  * Defer location of systemd unit to systemd.pc. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Sun, 15 Oct 2023 22:06:55 +0200
+
 ladvd (1.1.2-2) unstable; urgency=medium
 
   * QA upload.
diff -Nru ladvd-1.1.2/debian/control ladvd-1.1.2/debian/control
--- ladvd-1.1.2/debian/control	2022-10-23 08:10:08.000000000 +0200
+++ ladvd-1.1.2/debian/control	2023-10-15 22:00:17.000000000 +0200
@@ -5,7 +5,8 @@
 Build-Depends: debhelper-compat (= 13),
   autoconf, automake, libtool, pkg-config,
   libbsd-dev (>= 0.6.0),
-  libpcap-dev, libcap-ng-dev, libevent-dev, libpci-dev, libmnl-dev, libteam-dev
+  libpcap-dev, libcap-ng-dev, libevent-dev, libpci-dev, libmnl-dev, libteam-dev,
+  systemd-dev,
 Standards-Version: 4.6.1
 Rules-Requires-Root: no
 Homepage: https://github.com/sspans/ladvd/
diff -Nru ladvd-1.1.2/debian/rules ladvd-1.1.2/debian/rules
--- ladvd-1.1.2/debian/rules	2022-10-23 08:10:08.000000000 +0200
+++ ladvd-1.1.2/debian/rules	2023-10-15 22:00:38.000000000 +0200
@@ -39,7 +39,7 @@
 	../configure $(CONFFLAGS) \
 		--disable-silent-rules \
 		--prefix=/usr --mandir=\$${prefix}/share/man \
-		--with-systemdsystemunitdir=/lib/systemd/system \
+		--with-systemdsystemunitdir=$(shell pkg-config --variable=systemdsystemunitdir systemd) \
 		--with-pid-dir=/run/ladvd
 
 build: build-stamp

Reply to: