From c1d6c8d4f6e2899afd9ef8ab9fb16845e0301e7b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 1 Jan 2019 14:15:48 +0100 Subject: Renaming netdata-data to netdata-web. Signed-off-by: Daniel Baumann --- debian/control | 17 +++++++++++------ debian/netdata-data.install | 1 - debian/netdata-data.links | 14 -------------- debian/netdata-data.lintian-overrides | 2 -- debian/netdata-web.install | 1 + debian/netdata-web.links | 14 ++++++++++++++ debian/netdata-web.lintian-overrides | 2 ++ debian/rules | 2 +- 8 files changed, 29 insertions(+), 24 deletions(-) delete mode 100644 debian/netdata-data.install delete mode 100644 debian/netdata-data.links delete mode 100644 debian/netdata-data.lintian-overrides create mode 100644 debian/netdata-web.install create mode 100644 debian/netdata-web.links create mode 100644 debian/netdata-web.lintian-overrides diff --git a/debian/control b/debian/control index 6c0346a08..ca7ec846c 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Pre-Depends: Depends: libcap2-bin, lsb-base, - netdata-data (=${source:Version}), + netdata-web (=${source:Version}), python3, python3-six, python3-urllib3 (>= 1.22), @@ -45,18 +45,23 @@ Description: real-time performance monitoring integrated to existing monitoring tool chains (Prometheus, Graphite, OpenTSDB, Kafka, Grafana, etc). -Package: netdata-data +Package: netdata-web Section: net Architecture: all Depends: fonts-font-awesome, libjs-bootstrap, - ${misc:Depends}, -Recommends: netdata (=${source:Version}), -Description: real-time performance monitoring (data) + ${misc:Depends}, +Conflicts: + netdata-data, +Replaces: + netdata-data, +Enhances: + netdata, +Description: real-time performance monitoring (web) 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 architecture independent data. + This package contains the web frontend. diff --git a/debian/netdata-data.install b/debian/netdata-data.install deleted file mode 100644 index 32a3caaab..000000000 --- a/debian/netdata-data.install +++ /dev/null @@ -1 +0,0 @@ -/usr/share/netdata diff --git a/debian/netdata-data.links b/debian/netdata-data.links deleted file mode 100644 index f1a19802d..000000000 --- a/debian/netdata-data.links +++ /dev/null @@ -1,14 +0,0 @@ -# libjs-bootstrap -/usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.eot usr/share/netdata/web/fonts/glyphicons-halflings-regular.eot -/usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.svg usr/share/netdata/web/fonts/glyphicons-halflings-regular.svg -/usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.ttf usr/share/netdata/web/fonts/glyphicons-halflings-regular.ttf -/usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.woff usr/share/netdata/web/fonts/glyphicons-halflings-regular.woff -/usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.woff2 usr/share/netdata/web/fonts/glyphicons-halflings-regular.woff2 -# fonts-font-awesome -/usr/share/fonts-font-awesome/fonts/FontAwesome.otf usr/share/netdata/web/fonts/FontAwesome.otf -/usr/share/fonts-font-awesome/fonts/fontawesome-webfont.eot usr/share/netdata/web/fonts/fontawesome-webfont.eot -/usr/share/fonts-font-awesome/fonts/fontawesome-webfont.svg usr/share/netdata/web/fonts/fontawesome-webfont.svg -/usr/share/fonts-font-awesome/fonts/fontawesome-webfont.ttf usr/share/netdata/web/fonts/fontawesome-webfont.ttf -/usr/share/fonts-font-awesome/fonts/fontawesome-webfont.woff usr/share/netdata/web/fonts/fontawesome-webfont.woff -/usr/share/fonts-font-awesome/fonts/fontawesome-webfont.woff2 usr/share/netdata/web/fonts/fontawesome-webfont.woff2 -/usr/share/fonts-font-awesome/css/font-awesome.min.css usr/share/netdata/web/css/font-awesome.min.css diff --git a/debian/netdata-data.lintian-overrides b/debian/netdata-data.lintian-overrides deleted file mode 100644 index 469711334..000000000 --- a/debian/netdata-data.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# Versions are way off -netdata-data: embedded-javascript-library usr/share/netdata/web/lib/jquery-2.2.4.min.js * diff --git a/debian/netdata-web.install b/debian/netdata-web.install new file mode 100644 index 000000000..db2f259e3 --- /dev/null +++ b/debian/netdata-web.install @@ -0,0 +1 @@ +/usr/share/netdata/web diff --git a/debian/netdata-web.links b/debian/netdata-web.links new file mode 100644 index 000000000..f1a19802d --- /dev/null +++ b/debian/netdata-web.links @@ -0,0 +1,14 @@ +# libjs-bootstrap +/usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.eot usr/share/netdata/web/fonts/glyphicons-halflings-regular.eot +/usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.svg usr/share/netdata/web/fonts/glyphicons-halflings-regular.svg +/usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.ttf usr/share/netdata/web/fonts/glyphicons-halflings-regular.ttf +/usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.woff usr/share/netdata/web/fonts/glyphicons-halflings-regular.woff +/usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.woff2 usr/share/netdata/web/fonts/glyphicons-halflings-regular.woff2 +# fonts-font-awesome +/usr/share/fonts-font-awesome/fonts/FontAwesome.otf usr/share/netdata/web/fonts/FontAwesome.otf +/usr/share/fonts-font-awesome/fonts/fontawesome-webfont.eot usr/share/netdata/web/fonts/fontawesome-webfont.eot +/usr/share/fonts-font-awesome/fonts/fontawesome-webfont.svg usr/share/netdata/web/fonts/fontawesome-webfont.svg +/usr/share/fonts-font-awesome/fonts/fontawesome-webfont.ttf usr/share/netdata/web/fonts/fontawesome-webfont.ttf +/usr/share/fonts-font-awesome/fonts/fontawesome-webfont.woff usr/share/netdata/web/fonts/fontawesome-webfont.woff +/usr/share/fonts-font-awesome/fonts/fontawesome-webfont.woff2 usr/share/netdata/web/fonts/fontawesome-webfont.woff2 +/usr/share/fonts-font-awesome/css/font-awesome.min.css usr/share/netdata/web/css/font-awesome.min.css diff --git a/debian/netdata-web.lintian-overrides b/debian/netdata-web.lintian-overrides new file mode 100644 index 000000000..e8d80fff2 --- /dev/null +++ b/debian/netdata-web.lintian-overrides @@ -0,0 +1,2 @@ +# Versions are way off +netdata-web: embedded-javascript-library usr/share/netdata/web/lib/jquery-2.2.4.min.js * diff --git a/debian/rules b/debian/rules index 6ba1e769a..cf2f6bda3 100755 --- a/debian/rules +++ b/debian/rules @@ -50,7 +50,7 @@ override_dh_install: override_dh_install-indep: dh_install # Setting package version (update check) - echo $(VERSION) > $(TOP)-data/usr/share/netdata/web/version.txt + echo $(VERSION) > $(TOP)-web/usr/share/netdata/web/version.txt override_dh_missing: dh_missing --fail-missing -- cgit v1.2.3