Merging upstream version 1.18.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 47 insertions, 0 deletions

diff --git a/contrib/debian/control b/contrib/debian/control
index be9a7786..b4dfa683 100644
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -50,6 +50,7 @@ Depends: adduser,
          libprotoc10,
          ${misc:Depends},
          ${shlibs:Depends}
+Pre-Depends: dpkg (>= 1.17.14)
 Description: real-time charts for system monitoring
  Netdata is a daemon that collects data in realtime (per second)
  and presents a web site to view and analyze them. The presentation
diff --git a/contrib/debian/control.buster b/contrib/debian/control.buster
index 1166883b..6b9d0dc5 100644
--- a/contrib/debian/control.buster
+++ b/contrib/debian/control.buster
@@ -50,6 +50,7 @@ Depends: adduser,
          libprotoc17,
          ${misc:Depends},
          ${shlibs:Depends}
+Pre-Depends: dpkg (>= 1.17.14)
 Description: real-time charts for system monitoring
  Netdata is a daemon that collects data in realtime (per second)
  and presents a web site to view and analyze them. The presentation
diff --git a/contrib/debian/control.jessie b/contrib/debian/control.jessie
index 79db7839..4ffd25b5 100644
--- a/contrib/debian/control.jessie
+++ b/contrib/debian/control.jessie
@@ -48,6 +48,7 @@ Depends: adduser,
          libprotoc10,
          ${misc:Depends},
          ${shlibs:Depends}
+Pre-Depends: dpkg (>= 1.17.14)
 Description: real-time charts for system monitoring
  Netdata is a daemon that collects data in realtime (per second)
  and presents a web site to view and analyze them. The presentation
diff --git a/contrib/debian/control.trusty b/contrib/debian/control.trusty
index 918d2ad3..5edcb95f 100644
--- a/contrib/debian/control.trusty
+++ b/contrib/debian/control.trusty
@@ -48,6 +48,7 @@ Depends: adduser,
          libprotoc8,
          ${misc:Depends},
          ${shlibs:Depends}
+Pre-Depends: dpkg (>= 1.17.14)
 Description: real-time charts for system monitoring
  Netdata is a daemon that collects data in realtime (per second)
  and presents a web site to view and analyze them. The presentation
diff --git a/contrib/debian/control.xenial b/contrib/debian/control.xenial
index 412b389e..c562e8ef 100644
--- a/contrib/debian/control.xenial
+++ b/contrib/debian/control.xenial
@@ -50,6 +50,7 @@ Depends: adduser,
          libprotoc9v5,
          ${misc:Depends},
          ${shlibs:Depends}
+Pre-Depends: dpkg (>= 1.17.14)
 Description: real-time charts for system monitoring
  Netdata is a daemon that collects data in realtime (per second)
  and presents a web site to view and analyze them. The presentation
diff --git a/contrib/debian/netdata.postinst.in b/contrib/debian/netdata.postinst.in
index 44b53ccf..602f21c7 100644
--- a/contrib/debian/netdata.postinst.in
+++ b/contrib/debian/netdata.postinst.in
@@ -2,6 +2,19 @@
 
 set -e
 
+dpkg-maintscript-helper dir_to_symlink \
+	/var/lib/netdata/www/.well-known /usr/share/netdata/www/.well-known 1.18.1~ netdata -- "$@"
+dpkg-maintscript-helper dir_to_symlink \
+	/var/lib/netdata/www/css /usr/share/netdata/www/css 1.18.1~ netdata -- "$@"
+dpkg-maintscript-helper dir_to_symlink \
+	/var/lib/netdata/www/fonts /usr/share/netdata/www/fonts 1.18.1~ netdata -- "$@"
+dpkg-maintscript-helper dir_to_symlink \
+	/var/lib/netdata/www/images /usr/share/netdata/www/images 1.18.1~ netdata -- "$@"
+dpkg-maintscript-helper dir_to_symlink \
+	/var/lib/netdata/www/lib /usr/share/netdata/www/lib 1.18.1~ netdata -- "$@"
+dpkg-maintscript-helper dir_to_symlink \
+	/var/lib/netdata/www/static /usr/share/netdata/www/static 1.18.1~ netdata -- "$@"
+
 case "$1" in
   configure)
         if [ -z "$2" ]; then
diff --git a/contrib/debian/netdata.postrm b/contrib/debian/netdata.postrm
index 94e82bcd..de93dad1 100644
--- a/contrib/debian/netdata.postrm
+++ b/contrib/debian/netdata.postrm
@@ -2,6 +2,19 @@
 
 set -e
 
+dpkg-maintscript-helper dir_to_symlink \
+	/var/lib/netdata/www/.well-known /usr/share/netdata/www/.well-known 1.18.1~ netdata -- "$@"
+dpkg-maintscript-helper dir_to_symlink \
+	/var/lib/netdata/www/css /usr/share/netdata/www/css 1.18.1~ netdata -- "$@"
+dpkg-maintscript-helper dir_to_symlink \
+	/var/lib/netdata/www/fonts /usr/share/netdata/www/fonts 1.18.1~ netdata -- "$@"
+dpkg-maintscript-helper dir_to_symlink \
+	/var/lib/netdata/www/images /usr/share/netdata/www/images 1.18.1~ netdata -- "$@"
+dpkg-maintscript-helper dir_to_symlink \
+	/var/lib/netdata/www/lib /usr/share/netdata/www/lib 1.18.1~ netdata -- "$@"
+dpkg-maintscript-helper dir_to_symlink \
+	/var/lib/netdata/www/static /usr/share/netdata/www/static 1.18.1~ netdata -- "$@"
+
 case "$1" in
 	remove)
 		;;
diff --git a/contrib/debian/netdata.preinst b/contrib/debian/netdata.preinst
new file mode 100644
index 00000000..c4da80fc
--- /dev/null
+++ b/contrib/debian/netdata.preinst
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper dir_to_symlink \
+	/var/lib/netdata/www/.well-known /usr/share/netdata/www/.well-known 1.18.1~ netdata -- "$@"
+dpkg-maintscript-helper dir_to_symlink \
+	/var/lib/netdata/www/css /usr/share/netdata/www/css 1.18.1~ netdata -- "$@"
+dpkg-maintscript-helper dir_to_symlink \
+	/var/lib/netdata/www/fonts /usr/share/netdata/www/fonts 1.18.1~ netdata -- "$@"
+dpkg-maintscript-helper dir_to_symlink \
+	/var/lib/netdata/www/images /usr/share/netdata/www/images 1.18.1~ netdata -- "$@"
+dpkg-maintscript-helper dir_to_symlink \
+	/var/lib/netdata/www/lib /usr/share/netdata/www/lib 1.18.1~ netdata -- "$@"
+dpkg-maintscript-helper dir_to_symlink \
+	/var/lib/netdata/www/static /usr/share/netdata/www/static 1.18.1~ netdata -- "$@"