diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-06-09 04:52:47 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-06-09 04:52:57 +0000 |
| commit | 00151562145df50cc65e9902d52d5fa77f89fe50 (patch) | |
| tree | 2737716802f6725a5074d606ec8fe5422c58a83c /contrib | |
| parent | Releasing debian version 1.34.1-1. (diff) | |
| download | netdata-00151562145df50cc65e9902d52d5fa77f89fe50.tar.xz netdata-00151562145df50cc65e9902d52d5fa77f89fe50.zip | |
Merging upstream version 1.35.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/debian/control | 3 | ||||
| -rw-r--r-- | contrib/debian/netdata.default | 6 | ||||
| -rwxr-xr-x | contrib/debian/rules | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/contrib/debian/control b/contrib/debian/control index 912800b7e..ed8a6d58d 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -41,7 +41,6 @@ Depends: adduser, Conflicts: netdata-core, netdata-plugins-bash, netdata-plugins-python, - netdata-plugins-nodejs, netdata-web Pre-Depends: dpkg (>= 1.17.14) Description: real-time charts for system monitoring @@ -53,12 +52,14 @@ Description: real-time charts for system monitoring Package: netdata-plugin-cups Architecture: any Depends: cups, + ${shlibs:Depends}, netdata (>= ${source:Version}) Description: The Common Unix Printing System plugin for metrics collection from cupsd Package: netdata-plugin-freeipmi Architecture: any Depends: freeipmi, + ${shlibs:Depends}, netdata (= ${source:Version}) Description: FreeIPMI - The Intelligent Platform Management System. The IPMI specification defines a set of interfaces for platform management. diff --git a/contrib/debian/netdata.default b/contrib/debian/netdata.default index 1d9a9c4e9..0bc847fe7 100644 --- a/contrib/debian/netdata.default +++ b/contrib/debian/netdata.default @@ -1,7 +1,3 @@ # Extra arguments to pass to netdata # -#EXTRA_OPTS="" -# -# Location of pidfile. Only used on SysV init based systems. -# -#PIDFILE="/var/run/netdata/netdata.pid" +EXTRA_OPTS="-P /var/run/netdata/netdata.pid" diff --git a/contrib/debian/rules b/contrib/debian/rules index cbf4a8375..5be3e81c5 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -41,7 +41,7 @@ override_dh_auto_configure: autoreconf -ivf dh_auto_configure -- --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib \ --libexecdir=/usr/libexec --with-user=netdata --with-math --with-zlib --with-webdir=/var/lib/netdata/www \ - $(EBPF_CONFIG) + --disable-dependency-tracking $(EBPF_CONFIG) override_dh_install: cp -v $(BASE_CONFIG) debian/netdata.conf |