Updating packaging for upstreams nodejs removal.

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

6 files changed, 4 insertions, 62 deletions

diff --git a/debian/control b/debian/control
index fa64ca5e..521b055f 100644
--- a/debian/control
+++ b/debian/control
@@ -38,8 +38,11 @@ Depends:
  netdata-web,
  ${misc:Depends},
 Recommends:
- netdata-plugins-nodejs,
  netdata-plugins-python,
+Breaks:
+  netdata-plugins-nodejs,
+Replaces:
+  netdata-plugins-nodejs,
 Description: real-time performance monitoring (metapackage)
  Netdata is distributed, real-time, performance and health monitoring for
  systems and applications. It provides insights of everything happening on the
@@ -170,27 +173,6 @@ Description: real-time performance monitoring (bash plugins)
  .
  This package contains the plugins using bash.
 
-Package: netdata-plugins-nodejs
-Section: net
-Architecture: all
-Multi-Arch: foreign
-Depends:
- netdata-core (>= ${source:Version}) | netdata-core-no-sse (>= ${source:Version}),
- ${misc:Depends},
-Recommends:
- nodejs,
-Provides:
- netdata-plugins,
-Enhances:
- netdata-core,
- netdata-core-no-sse,
-Description: real-time performance monitoring (nodejs plugins)
- Netdata is distributed, real-time, performance and health monitoring for
- systems and applications. It provides insights of everything happening on the
- systems it runs using interactive web dashboards.
- .
- This package contains the plugins using nodejs.
-
 Package: netdata-plugins-python
 Section: net
 Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 3ee386d2..9233873c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -31,23 +31,6 @@ Copyright: 2017 Costa Tsaousis
 License: GPL-3+
 
 Files:
- collectors/node.d.plugin/node_modules/lib/ber/*
-Copyright: 2011 Mark Cavage <mcavage@gmail.com>
-License: Expat
-
-Files: collectors/node.d.plugin/node_modules/net-snmp.js
-Copyright: 2013 Stephen Vickers <stephen.vickers.sv@gmail.com>
-License: Expat
-
-Files: collectors/node.d.plugin/node_modules/extend.js
-Copyright: 2014 Stefan Thomas
-License: Expat
-
-Files: collectors/node.d.plugin/node_modules/pixl-xml.js
-Copyright: 2015 Joseph Huckaby
-License: Expat
-
-Files:
  web/gui/css/bootstrap-theme-3.3.7.min.css
  web/gui/lib/bootstrap-3.3.7.min.js
  debian/missing-sources/bootstrap-3.3.7.js
diff --git a/debian/netdata-plugins-nodejs.install b/debian/netdata-plugins-nodejs.install
deleted file mode 100644
index 910fb755..00000000
--- a/debian/netdata-plugins-nodejs.install
+++ /dev/null
@@ -1,3 +0,0 @@
-etc/netdata/node.d
-usr/lib/netdata/conf.d/node.d.conf
-usr/lib/netdata/node.d
diff --git a/debian/patches/debian/0004-use-sh.patch b/debian/patches/debian/0004-use-sh.patch
deleted file mode 100644
index 6c8e93bf..00000000
--- a/debian/patches/debian/0004-use-sh.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Author: Daniel Baumann <daniel.baumann@progress-linux.org>
-Description: Fix shebang hack to not depend on bash.
-
-diff -Naurp netdata.orig/collectors/node.d.plugin/node.d.plugin.in netdata/collectors/node.d.plugin/node.d.plugin.in
---- netdata.orig/collectors/node.d.plugin/node.d.plugin.in
-+++ netdata/collectors/node.d.plugin/node.d.plugin.in
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/bin/sh
- ':' //; exec "$(command -v nodejs || command -v node || echo "ERROR node IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@"
- 
- // shebang hack from:
diff --git a/debian/patches/series b/debian/patches/series
index 7d8318f1..30c81f16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 debian/0001-use-system-python.patch
 debian/0002-use-system-exim4.patch
 debian/0003-use-python3.patch
-debian/0004-use-sh.patch
 debian/0005-use-bash.patch
 upstream/0001-allow-symlinks.patch
 upstream/0002-fix-FTCBFS.patch
diff --git a/debian/rules b/debian/rules
index 321a0fc4..3541cc1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -149,13 +149,6 @@ override_dh_install-indep:
 		   $(TOP)-core/usr/lib/netdata/plugins.d; \
 	done
 
-	mkdir -p $(TOP)-plugins-nodejs/usr/lib/netdata/plugins.d
-	for plugin in node.d.plugin; \
-	do \
-		mv $(TOP)-plugins-bash/usr/lib/netdata/plugins.d/$${plugin} \
-		   $(TOP)-plugins-nodejs/usr/lib/netdata/plugins.d; \
-	done
-
 	mkdir -p $(TOP)-plugins-python/usr/lib/netdata/plugins.d
 	for plugin in python.d.plugin; \
 	do \