summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-11-28 04:53:29 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-11-28 04:53:29 +0000
commit17c93e2be4ad7b3af0cd6878bdd5d8a4a3e6da99 (patch)
tree3e0c96613972e8bb4afdeeb97a034806363ddfa9 /contrib
parentReleasing debian version 1.18.1-1. (diff)
downloadnetdata-17c93e2be4ad7b3af0cd6878bdd5d8a4a3e6da99.tar.xz
netdata-17c93e2be4ad7b3af0cd6878bdd5d8a4a3e6da99.zip
Merging upstream version 1.19.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/debian/control2
-rw-r--r--contrib/debian/control.buster2
-rw-r--r--contrib/debian/control.jessie8
-rw-r--r--contrib/debian/control.trusty2
-rw-r--r--contrib/debian/control.wheezy2
-rw-r--r--contrib/debian/control.xenial2
-rwxr-xr-xcontrib/debian/rules29
7 files changed, 12 insertions, 35 deletions
diff --git a/contrib/debian/control b/contrib/debian/control
index b4dfa683d..a06f29376 100644
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -61,4 +61,4 @@ Package: netdata-plugin-cups
Architecture: any
Depends: cups,
netdata (>= ${source:Version})
-Description: The Common Unix Printing System plugin for metrics collection from cupds
+Description: The Common Unix Printing System plugin for metrics collection from cupsd
diff --git a/contrib/debian/control.buster b/contrib/debian/control.buster
index 6b9d0dc50..7c4d6e892 100644
--- a/contrib/debian/control.buster
+++ b/contrib/debian/control.buster
@@ -61,4 +61,4 @@ Package: netdata-plugin-cups
Architecture: any
Depends: cups,
netdata (>= ${source:Version})
-Description: The Common Unix Printing System plugin for metrics collection from cupds
+Description: The Common Unix Printing System plugin for metrics collection from cupsd
diff --git a/contrib/debian/control.jessie b/contrib/debian/control.jessie
index 4ffd25b55..15e0d1335 100644
--- a/contrib/debian/control.jessie
+++ b/contrib/debian/control.jessie
@@ -40,12 +40,12 @@ Depends: adduser,
libjudydebian1,
openssl,
libmnl0,
- libjson-c3,
+ libjson-c2,
freeipmi,
libnetfilter-acct1,
libprotobuf-c1,
- libsnappy1v5,
- libprotoc10,
+ libsnappy1,
+ libprotoc9,
${misc:Depends},
${shlibs:Depends}
Pre-Depends: dpkg (>= 1.17.14)
@@ -59,4 +59,4 @@ Package: netdata-plugin-cups
Architecture: any
Depends: cups,
netdata (>= ${source:Version})
-Description: The Common Unix Printing System plugin for metrics collection from cupds
+Description: The Common Unix Printing System plugin for metrics collection from cupsd
diff --git a/contrib/debian/control.trusty b/contrib/debian/control.trusty
index 5edcb95fb..9e4e43b8f 100644
--- a/contrib/debian/control.trusty
+++ b/contrib/debian/control.trusty
@@ -59,4 +59,4 @@ Package: netdata-plugin-cups
Architecture: any
Depends: cups,
netdata (>= ${source:Version})
-Description: The Common Unix Printing System plugin for metrics collection from cupds
+Description: The Common Unix Printing System plugin for metrics collection from cupsd
diff --git a/contrib/debian/control.wheezy b/contrib/debian/control.wheezy
index dc23b788e..cc725c04c 100644
--- a/contrib/debian/control.wheezy
+++ b/contrib/debian/control.wheezy
@@ -28,4 +28,4 @@ Package: netdata-plugin-cups
Architecture: any
Depends: cups,
netdata (>= ${source:Version})
-Description: The Common Unix Printing System plugin for metrics collection from cupds
+Description: The Common Unix Printing System plugin for metrics collection from cupsd
diff --git a/contrib/debian/control.xenial b/contrib/debian/control.xenial
index c562e8ef9..2d986d5e5 100644
--- a/contrib/debian/control.xenial
+++ b/contrib/debian/control.xenial
@@ -61,4 +61,4 @@ Package: netdata-plugin-cups
Architecture: any
Depends: cups,
netdata (>= ${source:Version})
-Description: The Common Unix Printing System plugin for metrics collection from cupds
+Description: The Common Unix Printing System plugin for metrics collection from cupsd
diff --git a/contrib/debian/rules b/contrib/debian/rules
index 0e17e3953..56d346aeb 100755
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -28,10 +28,6 @@ debian/%.postinst: debian/%.postinst.in
override_dh_install: debian/netdata.postinst
dh_install
- # Remove unneeded .keep files
- #
- find "$(TOP)" -name .keep -exec rm '{}' ';'
-
# Set the CUPS plugin install rule
#
mkdir -p $(TOP)-plugin-cups/usr/libexec/netdata/plugins.d
@@ -40,24 +36,9 @@ override_dh_install: debian/netdata.postinst
# Set the rest of the software in the main package
#
- cp -rp $(TEMPTOP)/usr $(TOP)/usr
- cp -rp $(TEMPTOP)/var $(TOP)/var
- #cp -rp $(TEMPTOP)/etc $(TOP)/etc
-
- # Copy sample netdata.conf
- cp -p $(CURDIR)/system/edit-config $(TOP)/etc/netdata/
-
- # Create placeholder dirs in netdata configuration directory
- #
- mkdir -p $(TOP)/etc/netdata/health.d
- mkdir -p $(TOP)/etc/netdata/python.d
- mkdir -p $(TOP)/etc/netdata/charts.d
- mkdir -p $(TOP)/etc/netdata/cystonm-plugins.d
- mkdir -p $(TOP)/etc/netdata/go.d
- mkdir -p $(TOP)/etc/netdata/ssl
- mkdir -p $(TOP)/etc/netdata/node.d
- mkdir -p $(TOP)/etc/netdata/statsd.d
-
+ cp -rp $(TEMPTOP)/usr $(TOP)
+ cp -rp $(TEMPTOP)/var $(TOP)
+ cp -rp $(TEMPTOP)/etc $(TOP)
# Move files that local user shouldn't be editing to /usr/share/netdata
#
@@ -110,10 +91,6 @@ override_dh_fixperms:
chmod 0754 $(TOP)/usr/libexec/netdata/plugins.d/slabinfo.plugin
chmod 0750 $(TOP)/usr/libexec/netdata/plugins.d/go.d.plugin
- # Support script for configuration file management
- #
- chmod 0750 $(TOP)/etc/netdata/edit-config
-
# CUPS plugin package
chmod 0750 $(TOP)-plugin-cups/usr/libexec/netdata/plugins.d/cups.plugin