diff options
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/copyright | 3 | ||||
| -rw-r--r-- | debian/netdata-data.links | 9 | ||||
| -rw-r--r-- | debian/netdata-data.lintian-overrides | 5 | ||||
| -rw-r--r-- | debian/netdata.install | 1 | ||||
| -rw-r--r-- | debian/patches/0001-linked-js-css-fonts-removed-from-make.patch | 99 | ||||
| -rw-r--r-- | debian/source/lintian-overrides | 12 |
7 files changed, 104 insertions, 29 deletions
diff --git a/debian/control b/debian/control index 55985e2d..77098b6f 100644 --- a/debian/control +++ b/debian/control @@ -21,9 +21,11 @@ Architecture: any Depends: adduser, fonts-font-awesome (>= 4.6), libcap2-bin (>= 1:2.0), + libjs-bootstrap, lsb-base (>= 3.1-23.2), netdata-data (=${source:Version}), - python, + python3, + python3-yaml, ${misc:Depends}, ${misc:Pre-Depends}, ${shlibs:Depends} diff --git a/debian/copyright b/debian/copyright index 2f83af45..70602866 100644 --- a/debian/copyright +++ b/debian/copyright @@ -48,7 +48,6 @@ Copyright: 2015 Joseph Huckaby License: Expat Files: - web/css/bootstrap-3.3.7.min.css web/css/bootstrap-theme-3.3.7.min.css web/lib/bootstrap-3.3.7.min.js debian/missing-sources/bootstrap-3.3.7.js @@ -158,7 +157,7 @@ Copyright: 2016 hhurz License: Expat Files: - web/lib/raphael-2.2.4.min.js + web/lib/raphael-2.2.4-min.js debian/missing-sources/raphael-2.2.4.js Copyright: 2016 Dmitry Baranovskiy 2016 Sencha Labs diff --git a/debian/netdata-data.links b/debian/netdata-data.links index 96e61e24..e2f5e298 100644 --- a/debian/netdata-data.links +++ b/debian/netdata-data.links @@ -1,18 +1,9 @@ #libjs-bootstrap -/usr/share/javascript/bootstrap/js/bootstrap.min.js usr/share/netdata/web/lib/bootstrap.min.js /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 -/usr/share/javascript/bootstrap/css/bootstrap-theme.min.css usr/share/netdata/web/css/bootstrap-theme.min.css -/usr/share/javascript/bootstrap/css/bootstrap.min.css usr/share/netdata/web/css/bootstrap.min.css -#libjs-jquery -/usr/share/javascript/jquery/jquery.min.js usr/share/netdata/web/lib/jquery.min.js -#libjs-d3 -/usr/share/javascript/d3/d3.min.js usr/share/netdata/web/lib/d3.min.js -#libjs-raphael -/usr/share/javascript/raphael/raphael.min.js usr/share/netdata/web/lib/raphael-min.js #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 diff --git a/debian/netdata-data.lintian-overrides b/debian/netdata-data.lintian-overrides deleted file mode 100644 index 24b46385..00000000 --- a/debian/netdata-data.lintian-overrides +++ /dev/null @@ -1,5 +0,0 @@ -# Acceptable for a demo page -netdata-data: privacy-breach-generic usr/share/netdata/web/demo2.html * - -# Acceptable for a demo page -netdata-data: privacy-breach-generic usr/share/netdata/web/demosites.html * diff --git a/debian/netdata.install b/debian/netdata.install index a5f9aaea..07124d3f 100644 --- a/debian/netdata.install +++ b/debian/netdata.install @@ -6,4 +6,3 @@ usr/lib/*/netdata/plugins.d/*.plugin usr/lib/*/netdata/plugins.d/*.sh usr/lib/*/netdata/plugins.d/loopsleepms.sh.inc usr/lib/*/netdata/python.d/*.py -usr/lib/*/netdata/python.d/python_modules diff --git a/debian/patches/0001-linked-js-css-fonts-removed-from-make.patch b/debian/patches/0001-linked-js-css-fonts-removed-from-make.patch index f50dc3f1..eb3e93cd 100644 --- a/debian/patches/0001-linked-js-css-fonts-removed-from-make.patch +++ b/debian/patches/0001-linked-js-css-fonts-removed-from-make.patch @@ -1,16 +1,86 @@ From: Lennart Weller <lhw@ring0.de> -Date: Tue, 24 Jan 2017 16:48:02 +0100 +Date: Thu, 26 Jan 2017 14:03:06 +0100 Subject: linked js/css/fonts removed from make --- - web/Makefile.am | 21 --------------------- - 1 file changed, 21 deletions(-) + python.d/Makefile.am | 50 -------------------------------------------------- + web/Makefile.am | 35 ----------------------------------- + 2 files changed, 85 deletions(-) +diff --git a/python.d/Makefile.am b/python.d/Makefile.am +index 883f06c..f8b14da 100644 +--- a/python.d/Makefile.am ++++ b/python.d/Makefile.am +@@ -45,53 +45,3 @@ dist_python_SCRIPTS = \ + dist_python_DATA = \ + README.md \ + $(NULL) +- +-pythonmodulesdir=$(pythondir)/python_modules +-dist_pythonmodules_DATA = \ +- python_modules/__init__.py \ +- python_modules/base.py \ +- python_modules/msg.py \ +- python_modules/lm_sensors.py \ +- $(NULL) +- +-pythonyaml2dir=$(pythonmodulesdir)/pyyaml2 +-dist_pythonyaml2_DATA = \ +- python_modules/pyyaml2/__init__.py \ +- python_modules/pyyaml2/composer.py \ +- python_modules/pyyaml2/constructor.py \ +- python_modules/pyyaml2/cyaml.py \ +- python_modules/pyyaml2/dumper.py \ +- python_modules/pyyaml2/emitter.py \ +- python_modules/pyyaml2/error.py \ +- python_modules/pyyaml2/events.py \ +- python_modules/pyyaml2/loader.py \ +- python_modules/pyyaml2/nodes.py \ +- python_modules/pyyaml2/parser.py \ +- python_modules/pyyaml2/reader.py \ +- python_modules/pyyaml2/representer.py \ +- python_modules/pyyaml2/resolver.py \ +- python_modules/pyyaml2/scanner.py \ +- python_modules/pyyaml2/serializer.py \ +- python_modules/pyyaml2/tokens.py \ +- $(NULL) +- +-pythonyaml3dir=$(pythonmodulesdir)/pyyaml3 +-dist_pythonyaml3_DATA = \ +- python_modules/pyyaml3/__init__.py \ +- python_modules/pyyaml3/composer.py \ +- python_modules/pyyaml3/constructor.py \ +- python_modules/pyyaml3/cyaml.py \ +- python_modules/pyyaml3/dumper.py \ +- python_modules/pyyaml3/emitter.py \ +- python_modules/pyyaml3/error.py \ +- python_modules/pyyaml3/events.py \ +- python_modules/pyyaml3/loader.py \ +- python_modules/pyyaml3/nodes.py \ +- python_modules/pyyaml3/parser.py \ +- python_modules/pyyaml3/reader.py \ +- python_modules/pyyaml3/representer.py \ +- python_modules/pyyaml3/resolver.py \ +- python_modules/pyyaml3/scanner.py \ +- python_modules/pyyaml3/serializer.py \ +- python_modules/pyyaml3/tokens.py \ +- $(NULL) diff --git a/web/Makefile.am b/web/Makefile.am -index 396cf0b..d94d87e 100644 +index 396cf0b..e14cc57 100644 --- a/web/Makefile.am +++ b/web/Makefile.am -@@ -25,15 +25,6 @@ dist_web_DATA = \ +@@ -4,10 +4,6 @@ + MAINTAINERCLEANFILES= $(srcdir)/Makefile.in + + dist_web_DATA = \ +- demo.html \ +- demo2.html \ +- demosites.html \ +- demosites2.html \ + dashboard.html \ + dashboard.js \ + dashboard_info.js \ +@@ -25,15 +21,6 @@ dist_web_DATA = \ version.txt \ $(NULL) @@ -26,7 +96,7 @@ index 396cf0b..d94d87e 100644 weblibdir=$(webdir)/lib dist_weblib_DATA = \ lib/bootstrap-3.3.7.min.js \ -@@ -62,23 +53,11 @@ dist_webcss_DATA = \ +@@ -62,23 +49,11 @@ dist_webcss_DATA = \ css/bootstrap-theme-3.3.7.min.css \ css/bootstrap-slate-flat-3.3.7.css \ css/bootstrap-toggle-2.2.2.min.css \ @@ -50,3 +120,20 @@ index 396cf0b..d94d87e 100644 $(NULL) webimagesdir=$(webdir)/images +@@ -105,16 +80,6 @@ dist_webimages_DATA = \ + images/seo-performance-multi-size.icns \ + $(NULL) + +- +-webwellknowndir=$(webdir)/.well-known +-dist_webwellknown_DATA = \ +- $(NULL) +- +-webdntdir=$(webdir)/.well-known/dnt +-dist_webdnt_DATA = \ +- .well-known/dnt/cookies \ +- $(NULL) +- + version.txt: + if test -d "$(top_srcdir)/.git"; then \ + git --git-dir="$(top_srcdir)/.git" log -n 1 --format=%H; \ diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index aa7fbe83..590cc187 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -1,8 +1,10 @@ -# Long HTML blocks; not a minified JS file -netdata: insane-line-length-in-source-file web/dashboard_info.js * +# Long lines in source files +netdata source: source-is-missing debian/missing-sources/dygraph-combined-dd74404.js * +netdata source: source-is-missing debian/missing-sources/morris-0.5.1.js * +netdata source: source-is-missing debian/missing-sources/perfect-scrollbar-0.6.15.js * -# Not a minified JS file -netdata source: source-contains-prebuilt-javascript-object web/dashboard_info.js * +# Source is present as gauge-d5260c3.coffee +netdata source: source-is-missing web/lib/gauge-d5260c3.min.js # Not a minified JS file -netdata: source-is-missing web/dashboard_info.js * +netdata source: source-is-missing web/dashboard_info.js * |