Control: tags 1073766 + pending
Dear maintainer,
I've prepared an NMU for syslog-ng (versioned as 4.4.0-1.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru syslog-ng-4.4.0/debian/changelog syslog-ng-4.4.0/debian/changelog
--- syslog-ng-4.4.0/debian/changelog 2024-05-04 17:23:54.000000000 +0200
+++ syslog-ng-4.4.0/debian/changelog 2024-07-25 20:07:06.000000000 +0200
@@ -1,3 +1,13 @@
+syslog-ng (4.4.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Let configure autodetect systemdsystemunitdir, add systemd-dev for
+ systemd.pc.
+ * Use dh_installsystemd to install Debian-specific systemd unit.
+ (Closes: #1073766)
+
+ -- Chris Hofstaedtler <z...@debian.org> Thu, 25 Jul 2024 20:07:06 +0200
+
syslog-ng (4.4.0-1) unstable; urgency=medium
[ Attila Szalay ]
diff -Nru syslog-ng-4.4.0/debian/control syslog-ng-4.4.0/debian/control
--- syslog-ng-4.4.0/debian/control 2024-05-04 17:23:54.000000000 +0200
+++ syslog-ng-4.4.0/debian/control 2024-07-25 20:05:29.000000000 +0200
@@ -26,6 +26,7 @@
libhiredis-dev,
libriemann-client-dev,
librabbitmq-dev,
+ systemd-dev [linux-any],
python3, python3-dev, dh-python,
dh-exec,
python3-ply,
diff -Nru syslog-ng-4.4.0/debian/not-installed syslog-ng-4.4.0/debian/not-installed
--- syslog-ng-4.4.0/debian/not-installed 2024-05-04 17:23:54.000000000 +0200
+++ syslog-ng-4.4.0/debian/not-installed 2024-07-25 20:06:11.000000000 +0200
@@ -1,4 +1,4 @@
-lib/systemd/system/syslog-ng@.service
+usr/lib/systemd/system/syslog-ng@.service
usr/share/syslog-ng/include/scl/hdfs/plugin.conf
usr/share/syslog-ng/include/scl/elasticsearch/elastic-java.conf
usr/lib/syslog-ng/syslog-ng/libtest/libsyslog-ng-test.a
diff -Nru syslog-ng-4.4.0/debian/rules syslog-ng-4.4.0/debian/rules
--- syslog-ng-4.4.0/debian/rules 2024-05-04 17:23:54.000000000 +0200
+++ syslog-ng-4.4.0/debian/rules 2024-07-25 20:05:56.000000000 +0200
@@ -113,7 +113,6 @@
--with-librabbitmq-client=system \
\
--with-module-dir='$${exec_prefix}/lib/syslog-ng/${UMAJOR}' \
- --with-systemdsystemunitdir="/lib/systemd/system" \
\
--with-python-packages=none \
\
diff -Nru syslog-ng-4.4.0/debian/syslog-ng-core.install syslog-ng-4.4.0/debian/syslog-ng-core.install
--- syslog-ng-4.4.0/debian/syslog-ng-core.install 2024-05-04 17:23:54.000000000 +0200
+++ syslog-ng-4.4.0/debian/syslog-ng-core.install 2024-07-25 20:06:47.000000000 +0200
@@ -44,9 +44,6 @@
[linux-any] usr/lib/syslog-ng/*/libsdjournal.so
[linux-any] usr/lib/syslog-ng/*/libpacctformat.so
-#[!kfreebsd-any] lib/systemd/system/*
-[!kfreebsd-any] debian/syslog-ng.systemd => lib/systemd/system/syslog-ng.service
-
debian/syslog-ng.conf /etc/syslog-ng/
debian/tty10.plugin => /usr/share/syslog-ng/include/scl/getvirtconsole/plugin.conf
diff -Nru syslog-ng-4.4.0/debian/syslog-ng-core.syslog-ng.service syslog-ng-4.4.0/debian/syslog-ng-core.syslog-ng.service
--- syslog-ng-4.4.0/debian/syslog-ng-core.syslog-ng.service 1970-01-01 01:00:00.000000000 +0100
+++ syslog-ng-4.4.0/debian/syslog-ng-core.syslog-ng.service 2024-05-04 17:23:54.000000000 +0200
@@ -0,0 +1,18 @@
+[Unit]
+Description=System Logger Daemon
+Documentation=man:syslog-ng(8)
+Wants=network.target network-online.target
+After=network.target network-online.target
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/syslog-ng -F $SYSLOGNG_OPTS
+ExecReload=/bin/kill -HUP $MAINPID
+EnvironmentFile=-/etc/default/syslog-ng
+EnvironmentFile=-/etc/sysconfig/syslog-ng
+StandardOutput=journal
+StandardError=journal
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff -Nru syslog-ng-4.4.0/debian/syslog-ng.systemd syslog-ng-4.4.0/debian/syslog-ng.systemd
--- syslog-ng-4.4.0/debian/syslog-ng.systemd 2024-05-04 17:23:54.000000000 +0200
+++ syslog-ng-4.4.0/debian/syslog-ng.systemd 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-[Unit]
-Description=System Logger Daemon
-Documentation=man:syslog-ng(8)
-Wants=network.target network-online.target
-After=network.target network-online.target
-
-[Service]
-Type=notify
-ExecStart=/usr/sbin/syslog-ng -F $SYSLOGNG_OPTS
-ExecReload=/bin/kill -HUP $MAINPID
-EnvironmentFile=-/etc/default/syslog-ng
-EnvironmentFile=-/etc/sysconfig/syslog-ng
-StandardOutput=journal
-StandardError=journal
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
