Bug#1064572: RFS: lighttpd/1.4.74-1 / usrmerge

2024-02-27 Thread Glenn Strauss
On Tue, Feb 27, 2024 at 08:47:22AM +0100, Alexandre Detiste wrote:
> 9e6532694efb91a5da9d39acee0c9a6ce43eb180
> 
> Hi,
> 
> I uploaded 1.4.74-1 but I noticed just now
> that this would create a UsrMerge regression.
> 
> If the .timer & .service are correctly named (too early in the morning
> for me to think)
> then the two lines in lighttpd.install are not needed at all.
> 
> @Helmut: you can correct us directly on Salsa,
> no need to file a bug.

https://salsa.debian.org/debian/lighttpd/-/merge_requests/46 from Helmut
has been merged.

Would you like me to tag and sign lighttpd-1.4.74-2 with these changes?

I'll do so later today unless I hear otherwise.
Cheers, Glenn



Bug#1064572: RFS: lighttpd/1.4.74-1 / usrmerge

2024-02-26 Thread Alexandre Detiste
9e6532694efb91a5da9d39acee0c9a6ce43eb180

Hi,

I uploaded 1.4.74-1 but I noticed just now
that this would create a UsrMerge regression.

If the .timer & .service are correctly named (too early in the morning
for me to think)
then the two lines in lighttpd.install are not needed at all.

@Helmut: you can correct us directly on Salsa,
no need to file a bug.

Greetings

git diff 
9e6532694efb91a5da9d39acee0c9a6ce43eb180~1..9e6532694efb91a5da9d39acee0c9a6ce43eb180
diff --git a/debian/lighttpd.install b/debian/lighttpd.install
index 4f8d403..21e2134 100644
--- a/debian/lighttpd.install
+++ b/debian/lighttpd.install
@@ -24,4 +24,6 @@ debian/use-ipv6.pl
/usr/share/lighttpd/
 debian/lighty-enable-mod/usr/sbin/
 debian/index.html   /usr/share/lighttpd/
 debian/lighttpd.tmpfile.conf/usr/lib/tmpfiles.d/
+debian/lighttpd-maint.service   /lib/systemd/system/
+debian/lighttpd-maint.timer /lib/systemd/system/
 doc/systemd/lighttpd.service/lib/systemd/system/