Bug#1034240: pass-extension-tomb: dh_installsystemd doesn't handle files in /usr/lib/systemd/system

2023-04-25 Thread Cyril Brulebois
Hi Laurent,

bi...@debian.org  (2023-04-11):
> It seems that your package pass-extension-tomb is shipping files
> (.service, .socket or .timer) in /usr/lib/systemd/system.

That's pass-close@.service

> As a result, could you please move these files to /lib/systemd/system
> instead so they are properly detected by debhelper?

Once the attached patch is applied, there are absolutely no changes in
the resulting binary package besides the moved package (no extra code
in maintainer scripts). To be on the safe side, I've tried overriding
dh_installsystemd to list the unit directly, and that doesn't change
anything.

What do you think should happen here? Close this as not-a-bug? Or upload
anyway, so that we have all packages aligned, shipping units under /lib
rather than /usr/lib? I don't have any opinion on this at the moment.


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant
diff -Nru pass-tomb-1.3/debian/changelog pass-tomb-1.3/debian/changelog
--- pass-tomb-1.3/debian/changelog	2022-01-19 06:49:30.0 +
+++ pass-tomb-1.3/debian/changelog	2023-04-25 15:04:51.0 +
@@ -1,3 +1,11 @@
+pass-tomb (1.3-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Ship pass-close@.service under /lib/systemd/system so that it can
+be considered by dh_installsystemd (Closes: #1034240).
+
+ -- Cyril Brulebois   Tue, 25 Apr 2023 15:04:51 +
+
 pass-tomb (1.3-2) unstable; urgency=medium
 
   * Change path from /lib to /usr (Closes: #1003996).
diff -Nru pass-tomb-1.3/debian/rules pass-tomb-1.3/debian/rules
--- pass-tomb-1.3/debian/rules	2022-01-19 06:49:30.0 +
+++ pass-tomb-1.3/debian/rules	2023-04-25 15:04:51.0 +
@@ -5,3 +5,5 @@
 
 override_dh_auto_install:
 	dh_auto_install -- PREFIX=/usr BASHCOMPDIR=/usr/share/bash-completion/completions
+	mkdir -p debian/pass-extension-tomb/lib/systemd/system
+	mv debian/pass-extension-tomb/usr/lib/systemd/system/pass-close@.service debian/pass-extension-tomb/lib/systemd/system/pass-close@.service


signature.asc
Description: PGP signature


Bug#1034240: pass-extension-tomb: dh_installsystemd doesn't handle files in /usr/lib/systemd/system

2023-04-11 Thread Andreas Henriksson
On Tue, Apr 11, 2023 at 10:00:16AM +0200, bi...@debian.org wrote:
> Package: pass-extension-tomb
> Version: 1.3-2
> Severity: serious
> Tags: sid bookworm
> User: debhel...@packages.debian.org
> Usertags: systemd-files-in-usr-bookworm
> 
> Dear Maintainer,
> 
> It seems that your package pass-extension-tomb is shipping files (.service, 
> .socket or
> .timer) in /usr/lib/systemd/system.
[...]

The culprit seems to be here:
https://sources.debian.org/src/pass-tomb/1.3-2/Makefile/#L21

(and also line 36)


```
@install -Dm0644 pass-close@.service 
"$(DESTDIR)$(LIBDIR)/systemd/system/pass-close@.service"
```

To get the correct path you could use:
```
pkg-config  --variable=systemdsystemunitdir systemd
```

(Note: do not forget to also build-dep on the package containing systemd.pc as 
well as pkg-config itself.)

Regards,
Andreas Henriksson