Control: tag -1 patch pending Hi,
Andreas Henriksson <andr...@fatal.se> (2023-04-11): > The culprit seems to be the hard-coded path at: > https://sources.debian.org/src/wsdd2/1.8.7%2Bdfsg-1/Makefile/#L31 > > As this path will change again in the future, please consider > finding out the path from the proper source via: > pkg-config --variable=systemdsystemunitdir systemd > > (Note: you'll need to build-dep on pkg-config and systemd, for > systemd.pc) Or just patch it out now, and drop the patch later, as we're in hard freeze. Building with the attached patch leads to the following changes on the binary side, as expected: Files in second .deb but not in first ------------------------------------- -rw-r--r-- root/root /lib/systemd/system/wsdd2.service -rwxr-xr-x root/root DEBIAN/postinst -rwxr-xr-x root/root DEBIAN/postrm -rwxr-xr-x root/root DEBIAN/prerm Files in first .deb but not in second ------------------------------------- -rw-r--r-- root/root /usr/lib/systemd/system/wsdd2.service Maintainer: I'm uploading to DELAYED/5, it can be either rescheduled to DELAYED/0 if you're happy with the changes right now, or be superseded by an upload of yours if that happens before the delay is over. Cheers, -- Cyril Brulebois (k...@debian.org) <https://debamax.com/> D-I release manager -- Release team member -- Freelance Consultant
diff -Nru wsdd2-1.8.7+dfsg/debian/changelog wsdd2-1.8.7+dfsg/debian/changelog --- wsdd2-1.8.7+dfsg/debian/changelog 2022-07-13 21:24:12.000000000 +0000 +++ wsdd2-1.8.7+dfsg/debian/changelog 2023-04-25 15:40:11.000000000 +0000 @@ -1,3 +1,11 @@ +wsdd2 (1.8.7+dfsg-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Ship systemd unit under /lib/systemd/system so that it can get picked + up by dh_installsystemd (Closes: #1034229) + + -- Cyril Brulebois <k...@debian.org> Tue, 25 Apr 2023 15:40:11 +0000 + wsdd2 (1.8.7+dfsg-1) unstable; urgency=medium * New upstream release diff -Nru wsdd2-1.8.7+dfsg/debian/patches/0002-Fix-systemd-unit-directory.patch wsdd2-1.8.7+dfsg/debian/patches/0002-Fix-systemd-unit-directory.patch --- wsdd2-1.8.7+dfsg/debian/patches/0002-Fix-systemd-unit-directory.patch 1970-01-01 00:00:00.000000000 +0000 +++ wsdd2-1.8.7+dfsg/debian/patches/0002-Fix-systemd-unit-directory.patch 2023-04-25 15:39:54.000000000 +0000 @@ -0,0 +1,22 @@ +From: Cyril Brulebois <k...@debian.org> +Date: Tue, 25 Apr 2023 15:37:40 +0000 +Subject: Fix systemd unit directory +Forwarded: not-needed +Bug-Debian: https://bugs.debian.org/1034229 + +For Bookworm, dh_installsystemd only looks at /lib/systemd/system (and +doesn't look at /usr/lib/systemd/system). + +--- a/Makefile ++++ b/Makefile +@@ -28,8 +28,8 @@ install: wsdd2 + install wsdd2 $(DESTDIR)$(SBINDIR) + install -d $(DESTDIR)$(MANDIR)/man8 + install -m 0644 wsdd2.8 $(DESTDIR)$(MANDIR)/man8 +- install -d $(DESTDIR)$(LIBDIR)/systemd/system +- install -m 0644 wsdd2.service $(DESTDIR)$(LIBDIR)/systemd/system ++ install -d $(DESTDIR)/lib/systemd/system ++ install -m 0644 wsdd2.service $(DESTDIR)/lib/systemd/system + + clean: + rm -f wsdd2 nl_debug $(OBJFILES) diff -Nru wsdd2-1.8.7+dfsg/debian/patches/series wsdd2-1.8.7+dfsg/debian/patches/series --- wsdd2-1.8.7+dfsg/debian/patches/series 2021-10-23 18:58:25.000000000 +0000 +++ wsdd2-1.8.7+dfsg/debian/patches/series 2023-04-25 15:36:45.000000000 +0000 @@ -1 +1,2 @@ 0001-Additional_parameters_in_unit_file.patch +0002-Fix-systemd-unit-directory.patch
signature.asc
Description: PGP signature
