13 files changed, 56 insertions, 59 deletions

diff --git a/debian/control b/debian/control
index 503e6e92d..3af0e3514 100644
--- a/debian/control
+++ b/debian/control
@@ -37,32 +37,6 @@ Vcs-Git: https://git.progress-linux.org/users/daniel.baumann/debian/packages/net
 
 Package: netdata
 Section: net
-Architecture: all
-Depends:
- netdata-core,
- netdata-plugins-bash,
- ${misc:Depends},
-Recommends:
- netdata-plugins-python,
-Breaks:
- netdata-apache2,
- netdata-web,
-Replaces:
- netdata-apache2,
- netdata-web,
-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
- systems it runs using interactive web dashboards.
- .
- It can run autonomously without any third party components or it can be
- integrated to existing monitoring tool chains (Prometheus, Graphite,
- OpenTSDB, Kafka, Grafana, etc).
- .
- This package is a metapackage depending on the typical netdata components.
-
-Package: netdata-core
-Section: net
 Architecture: linux-any
 Pre-Depends:
  ${misc:Pre-Depends},
@@ -75,6 +49,8 @@ Depends:
  ${shlibs:Depends},
 Recommends:
  curl,
+ netdata-plugins-bash,
+ netdata-plugins-python,
 Suggests:
  apcupsd,
  iproute2,
@@ -82,16 +58,37 @@ Suggests:
  lm-sensors,
  nc,
 Breaks:
- netdata-core-no-sse (<< 1.44),
+ netdata-apache2,
+ netdata-core (<< 2),
+ netdata-core-no-sse (<< 2),
+ netdata-web,
 Replaces:
+ netdata-apache2,
+ netdata-core,
  netdata-core-no-sse,
-Description: real-time performance monitoring (core)
+ netdata-web,
+Description: real-time performance monitoring
  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 minimal core build with SSE2 optimizations for
- current systems.
+ It can run autonomously without any third party components or it can be
+ integrated to existing monitoring tool chains (Prometheus, Graphite,
+ OpenTSDB, Kafka, Grafana, etc).
+
+Package: netdata-core
+Section: net
+Architecture: all
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+Description: real-time performance monitoring (transitional package)
+ Package to ease upgrading from older netdata-core package to the new
+ netdata package.
+ .
+ This package can be purged at anytime once the netdata package has been
+ installed.
 
 Package: netdata-core-no-sse
 Section: net
@@ -102,9 +99,9 @@ Depends:
  ${misc:Depends},
 Description: real-time performance monitoring (transitional package)
  Package to ease upgrading from older netdata-core-no-sse package to the new
- netdata-core package.
+ netdata package.
  .
- This package can be purged at anytime once the netdata-core package has been
+ This package can be purged at anytime once the netdata package has been
  installed.
 
 Package: netdata-plugins-bash
@@ -112,14 +109,14 @@ Section: net
 Architecture: all
 Multi-Arch: foreign
 Depends:
- netdata-core (>= ${source:Version}),
+ netdata (>= ${source:Version}),
  ${misc:Depends},
 Suggests:
  fping,
 Provides:
  netdata-plugins,
 Enhances:
- netdata-core,
+ netdata,
 Description: real-time performance monitoring (bash plugins)
  Netdata is distributed, real-time, performance and health monitoring for
  systems and applications. It provides insights of everything happening on the
@@ -132,7 +129,7 @@ Section: net
 Architecture: all
 Multi-Arch: foreign
 Depends:
- netdata-core (>= ${source:Version}),
+ netdata (>= ${source:Version}),
  python3,
  python3-monotonic,
  python3-urllib3 (>= 1.22),
@@ -145,7 +142,7 @@ Suggests:
 Provides:
  netdata-plugins,
 Enhances:
- netdata-core,
+ netdata,
 Description: real-time performance monitoring (python plugins)
  Netdata is distributed, real-time, performance and health monitoring for
  systems and applications. It provides insights of everything happening on the
diff --git a/debian/netdata-core.lintian-overrides b/debian/netdata-core.lintian-overrides
deleted file mode 100644
index 279afa30d..000000000
--- a/debian/netdata-core.lintian-overrides
+++ /dev/null
@@ -1,10 +0,0 @@
-# See Debian policy 10.9. apps.plugin has extra capabilities, so don't let
-# normal users run it.
-netdata-core: non-standard-executable-perm usr/libexec/netdata/plugins.d/apps.plugin 0754 != 0755
-
-# user created during install
-netdata-core: maintainer-script-should-not-use-recursive-chown-or-chmod
-
-# plugins that require root access
-netdata-core: setuid-binary usr/libexec/netdata/plugins.d/freeipmi.plugin 4754 root/root
-netdata-core: setuid-binary usr/libexec/netdata/plugins.d/perf.plugin 4754 root/root
diff --git a/debian/netdata-core.README.Debian b/debian/netdata.README.Debian
index 6cded5c63..f228abb6a 100644
--- a/debian/netdata-core.README.Debian
+++ b/debian/netdata.README.Debian
@@ -48,7 +48,7 @@ leading to a corrupted internal database of the cached values in /var/cache/netd
 
 Try purging the package reinstalling netdata:
 
-  $ sudo apt purge netdata-core
-  $ sudo apt install netdata-core
+  $ sudo apt purge netdata
+  $ sudo apt install netdata
 
  -- Daniel Baumann <daniel.baumann@progress-linux.org>  Tue, 09 Feb 2021 11:03:31 +0100
diff --git a/debian/netdata-core.dirs b/debian/netdata.dirs
index 6cda555ff..6cda555ff 100644
--- a/debian/netdata-core.dirs
+++ b/debian/netdata.dirs
diff --git a/debian/netdata-core.docs b/debian/netdata.docs
index b43bf86b5..b43bf86b5 100644
--- a/debian/netdata-core.docs
+++ b/debian/netdata.docs
diff --git a/debian/netdata-core.install b/debian/netdata.install
index 59811f683..59811f683 100644
--- a/debian/netdata-core.install
+++ b/debian/netdata.install
diff --git a/debian/netdata.lintian-overrides b/debian/netdata.lintian-overrides
new file mode 100644
index 000000000..1570ac6e4
--- /dev/null
+++ b/debian/netdata.lintian-overrides
@@ -0,0 +1,10 @@
+# See Debian policy 10.9. apps.plugin has extra capabilities, so don't let
+# normal users run it.
+netdata: non-standard-executable-perm usr/libexec/netdata/plugins.d/apps.plugin 0754 != 0755
+
+# user created during install
+netdata: maintainer-script-should-not-use-recursive-chown-or-chmod
+
+# plugins that require root access
+netdata: setuid-binary usr/libexec/netdata/plugins.d/freeipmi.plugin 4754 root/root
+netdata: setuid-binary usr/libexec/netdata/plugins.d/perf.plugin 4754 root/root
diff --git a/debian/netdata-core.netdata.logrotate b/debian/netdata.logrotate
index 7ede4fcb0..7ede4fcb0 100644
--- a/debian/netdata-core.netdata.logrotate
+++ b/debian/netdata.logrotate
diff --git a/debian/netdata-core.manpages b/debian/netdata.manpages
index 2fb19fbd8..2fb19fbd8 100644
--- a/debian/netdata-core.manpages
+++ b/debian/netdata.manpages
diff --git a/debian/netdata-core.postinst b/debian/netdata.postinst
index 56aeafc7d..56aeafc7d 100755
--- a/debian/netdata-core.postinst
+++ b/debian/netdata.postinst
diff --git a/debian/netdata-core.postrm b/debian/netdata.postrm
index 358b2a773..358b2a773 100755
--- a/debian/netdata-core.postrm
+++ b/debian/netdata.postrm
diff --git a/debian/netdata-core.netdata.service b/debian/netdata.service
index fb62d0772..fb62d0772 100644
--- a/debian/netdata-core.netdata.service
+++ b/debian/netdata.service
diff --git a/debian/rules b/debian/rules
index 589a2a11a..409dcc147 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,15 +49,15 @@ override_dh_install-arch:
 	find debian/tmp -name .keep -delete
 
 	# Copy architecture dependent plugins
-	mkdir -p debian/netdata-core/etc/netdata
-	cp debian/local/netdata/netdata.conf debian/netdata-core/etc/netdata
-	touch debian/netdata-core/etc/netdata/.opt-out-from-anonymous-statistics
+	mkdir -p debian/netdata/etc/netdata
+	cp debian/local/netdata/netdata.conf debian/netdata/etc/netdata
+	touch debian/netdata/etc/netdata/.opt-out-from-anonymous-statistics
 
-	mkdir -p debian/netdata-core/usr/libexec/netdata/plugins.d
+	mkdir -p debian/netdata/usr/libexec/netdata/plugins.d
 	for plugin in cgroup-network apps.plugin nfacct.plugin perf.plugin slabinfo.plugin; \
 	do \
 		cp debian/tmp/usr/libexec/netdata/plugins.d/$${plugin} \
-		   debian/netdata-core/usr/libexec/netdata/plugins.d; \
+		   debian/netdata/usr/libexec/netdata/plugins.d; \
 	done
 
 	dh_install -a
@@ -68,11 +68,11 @@ override_dh_install-indep:
 	dh_install -i
 
 	# Move architecture dependent plugins
-	mkdir -p debian/netdata-core/usr/libexec/netdata/plugins.d
+	mkdir -p debian/netdata/usr/libexec/netdata/plugins.d
 	for plugin in cgroup-network apps.plugin nfacct.plugin perf.plugin slabinfo.plugin; \
 	do \
 		mv -f debian/netdata-plugins-bash/usr/libexec/netdata/plugins.d/$${plugin} \
-		   debian/netdata-core/usr/libexec/netdata/plugins.d; \
+		   debian/netdata/usr/libexec/netdata/plugins.d; \
 	done
 
 	mkdir -p debian/netdata-plugins-python/usr/libexec/netdata/plugins.d
@@ -83,11 +83,11 @@ override_dh_install-indep:
 	done
 
 override_dh_installsystemd:
-	dh_installsystemd -p netdata-core --name=netdata
+	dh_installsystemd -p netdata --name=netdata
 	dh_installsystemd --remaining-packages
 
 override_dh_installlogrotate:
-	dh_installlogrotate -p netdata-core --name=netdata
+	dh_installlogrotate -p netdata --name=netdata
 	dh_installlogrotate --remaining-packages
 
 override_dh_fixperms-arch:
@@ -95,8 +95,8 @@ override_dh_fixperms-arch:
 
 	# apps.plugin should only be runnable by the netdata user. It will be
 	# given extra capabilities in the postinst script.
-	chmod 0754 debian/netdata-core/usr/libexec/netdata/plugins.d/apps.plugin
-	chmod 4754 debian/netdata-core/usr/libexec/netdata/plugins.d/perf.plugin
+	chmod 0754 debian/netdata/usr/libexec/netdata/plugins.d/apps.plugin
+	chmod 4754 debian/netdata/usr/libexec/netdata/plugins.d/perf.plugin
 
 override_dh_fixperms-indep:
 	dh_fixperms -i