summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/control9
-rwxr-xr-xdebian/rules1
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/control b/debian/control
index 45259dd1f..edb277208 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,9 @@ Build-Depends: debhelper (>= 9),
dh-autoreconf,
dh-systemd (>= 1.5),
dpkg-dev (>= 1.13.19),
+ pkg-config,
zlib1g-dev
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
Homepage: https://github.com/firehol/netdata
Vcs-Git: https://anonscm.debian.org/collab-maint/netdata.git
Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/netdata.git
@@ -32,7 +33,10 @@ Description: real-time charts for system monitoring
Package: netdata-data
Architecture: all
+<<<<<<< HEAD
+=======
Multi-Arch: foreign
+>>>>>>> f2a27bcd6e16cafd4505fc84d9beac11cbcfdf8d
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: real-time charts for system monitoring
Netdata is a daemon that collects data in realtime (per second)
@@ -44,7 +48,10 @@ Description: real-time charts for system monitoring
Package: netdata-plugins-nodejs
Architecture: all
+<<<<<<< HEAD
+=======
Multi-Arch: foreign
+>>>>>>> f2a27bcd6e16cafd4505fc84d9beac11cbcfdf8d
Depends: nodejs, ${misc:Depends}, ${shlibs:Depends}
Description: real-time charts for system monitoring
Netdata is a daemon that collects data in realtime (per second)
diff --git a/debian/rules b/debian/rules
index 37e3d8fab..e853d24a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,7 @@ override_dh_install: debian/netdata.postinst
# Remove unneeded .keep files
#
find "$(TOP)" -name .keep -exec rm '{}' ';'
+ rm -rf $(CURDIR)/debian/netdata-data/usr/share/netdata/web/old
# Move files that local user shouldn't be editing to /usr/share/netdata
#