Control: tags 1058773 + patch
Control: tags 1058773 + pending
Dear maintainer,
I've prepared an NMU for caddy (versioned as 2.6.2-6.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.
Chris
diff -Nru caddy-2.6.2/debian/caddy.install caddy-2.6.2/debian/caddy.install
--- caddy-2.6.2/debian/caddy.install 2023-08-23 13:28:40.000000000 +0200
+++ caddy-2.6.2/debian/caddy.install 2024-04-22 03:13:07.000000000 +0200
@@ -1,6 +1,6 @@
dist/config/Caddyfile etc/caddy/
-dist/init/caddy.service lib/systemd/system
-dist/init/caddy-api.service lib/systemd/system
+dist/init/caddy.service ${env:deb_systemdsystemunitdir}/
+dist/init/caddy-api.service ${env:deb_systemdsystemunitdir}/
debian/missing-sources/caddy/welcome/index.html usr/share/caddy/
debian/generated/completions/caddy usr/share/bash-completion/completions/
debian/generated/completions/_caddy usr/share/zsh/vendor-completions/
diff -Nru caddy-2.6.2/debian/changelog caddy-2.6.2/debian/changelog
--- caddy-2.6.2/debian/changelog 2023-08-23 13:28:40.000000000 +0200
+++ caddy-2.6.2/debian/changelog 2024-04-22 03:13:10.000000000 +0200
@@ -1,3 +1,10 @@
+caddy (2.6.2-6.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Use systemd.pc to place systemd units. (Closes: #1058773)
+
+ -- Chris Hofstaedtler <z...@debian.org> Mon, 22 Apr 2024 03:13:10 +0200
+
caddy (2.6.2-6) unstable; urgency=medium
* Team upload
diff -Nru caddy-2.6.2/debian/control caddy-2.6.2/debian/control
--- caddy-2.6.2/debian/control 2023-08-23 13:28:40.000000000 +0200
+++ caddy-2.6.2/debian/control 2024-04-22 03:13:07.000000000 +0200
@@ -39,6 +39,8 @@
golang-glog-dev,
golang-golang-x-text-dev,
golang-github-stoewer-go-strcase-dev,
+ pkgconf,
+ systemd-dev,
Standards-Version: 4.6.1.0
Vcs-Browser: https://salsa.debian.org/go-team/packages/caddy
Vcs-Git: https://salsa.debian.org/go-team/packages/caddy.git
diff -Nru caddy-2.6.2/debian/rules caddy-2.6.2/debian/rules
--- caddy-2.6.2/debian/rules 2023-08-23 13:28:40.000000000 +0200
+++ caddy-2.6.2/debian/rules 2024-04-22 03:13:07.000000000 +0200
@@ -7,6 +7,8 @@
export DH_GOLANG_EXCLUDES := integration tracing
export BUILDDIR := build
+export deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,)
+
include /usr/share/dpkg/pkg-info.mk
LDFLAGS := -ldflags '-X $(DH_GOPKG).CustomVersion=$(DEB_VERSION_UPSTREAM) -X $(DH_GOPKG)/cmd.CustomDate="$(SOURCE_DATE_EPOCH)"'
