From 81581f9719bc56f01d5aa08952671d65fda9867a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 8 May 2023 18:27:08 +0200 Subject: Merging upstream version 1.39.0. Signed-off-by: Daniel Baumann --- contrib/debian/conffiles | 4 ++++ contrib/debian/control | 1 + contrib/debian/rules | 11 ++++++++--- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 contrib/debian/conffiles (limited to 'contrib/debian') diff --git a/contrib/debian/conffiles b/contrib/debian/conffiles new file mode 100644 index 000000000..5ea613f3d --- /dev/null +++ b/contrib/debian/conffiles @@ -0,0 +1,4 @@ +/etc/default/netdata +/etc/init.d/netdata +/etc/logrotate.d/netdata +/etc/netdata/netdata.conf diff --git a/contrib/debian/control b/contrib/debian/control index c5e5791ff..eeeb8d25c 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 9.20160709), libssl-dev, libmnl-dev, libjson-c-dev, + libyaml-dev, libcups2-dev, libipmimonitoring-dev, libnetfilter-acct-dev, diff --git a/contrib/debian/rules b/contrib/debian/rules index a4820cd4a..149b19ec7 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -10,9 +10,9 @@ BASE_CONFIG = system/netdata.conf SYSTEMD_VERSION = $(shell /bin/sh -c "systemd --version 2>&1 | head -n 1 | cut -f 2 -d ' '") ifeq ($(shell test $(SYSTEMD_VERSION) -ge 235 && echo "1"), 1) -SYSTEMD_UNIT = system/netdata.service.v235 +SYSTEMD_UNIT = system/systemd/netdata.service.v235 else -SYSTEMD_UNIT = system/netdata.service +SYSTEMD_UNIT = system/systemd/netdata.service endif ifeq ($(shell test `uname -m` != "x86_64" && echo "1"), 1) @@ -124,9 +124,14 @@ override_dh_fixperms: chmod 4750 $(TOP)-plugin-freeipmi/usr/libexec/netdata/plugins.d/freeipmi.plugin override_dh_installlogrotate: - cp system/netdata.logrotate debian/netdata.logrotate + cp system/logrotate/netdata debian/netdata.logrotate dh_installlogrotate +override_dh_installdeb: + dh_installdeb + @echo "Recreating conffiles without auto-adding /etc files" + @cp $(CURDIR)/debian/conffiles $(CURDIR)/debian/netdata/DEBIAN/conffiles + override_dh_clean: dh_clean -- cgit v1.2.3