diff options
| -rw-r--r-- | debian/control | 6 | ||||
| -rw-r--r-- | debian/netdata-data.links | 2 | ||||
| -rw-r--r-- | debian/patches/0005-remove-lib-versions.patch | 37 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 42 insertions, 4 deletions
diff --git a/debian/control b/debian/control index 6dad4aee..aa7b89bb 100644 --- a/debian/control +++ b/debian/control @@ -21,12 +21,12 @@ Architecture: any Depends: adduser, fonts-font-awesome (>= 4.6), libcap2-bin (>= 1:2.0), - libjs-bootstrap (>= 3.3.6), + libjs-bootstrap (>= 3.3.7), libjs-d3 (>= 3.5.17), - libjs-jquery (>= 1.12), + libjs-jquery (>= 3.1.1-2), libjs-raphael (>= 2.1.0), lsb-base (>= 3.1-23.2), - netdata-data, + netdata-data (=${source:Version}), python, ${misc:Depends}, ${misc:Pre-Depends}, diff --git a/debian/netdata-data.links b/debian/netdata-data.links index fa6aeab1..96e61e24 100644 --- a/debian/netdata-data.links +++ b/debian/netdata-data.links @@ -8,7 +8,7 @@ /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-1.12.0.min.js +/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 diff --git a/debian/patches/0005-remove-lib-versions.patch b/debian/patches/0005-remove-lib-versions.patch new file mode 100644 index 00000000..baba489d --- /dev/null +++ b/debian/patches/0005-remove-lib-versions.patch @@ -0,0 +1,37 @@ +--- a/web/dashboard.js ++++ b/web/dashboard.js +@@ -108,14 +108,14 @@ + // default URLs for all the external files we need + // make them RELATIVE so that the whole thing can also be + // installed under a web server +- NETDATA.jQuery = NETDATA.serverDefault + 'lib/jquery-2.2.4.min.js'; ++ NETDATA.jQuery = NETDATA.serverDefault + 'lib/jquery.min.js'; + NETDATA.peity_js = NETDATA.serverDefault + 'lib/jquery.peity-3.2.0.min.js'; + NETDATA.sparkline_js = NETDATA.serverDefault + 'lib/jquery.sparkline-2.1.2.min.js'; + NETDATA.easypiechart_js = NETDATA.serverDefault + 'lib/jquery.easypiechart-97b5824.min.js'; + NETDATA.gauge_js = NETDATA.serverDefault + 'lib/gauge-d5260c3.min.js'; + NETDATA.dygraph_js = NETDATA.serverDefault + 'lib/dygraph-combined-dd74404.js'; + NETDATA.dygraph_smooth_js = NETDATA.serverDefault + 'lib/dygraph-smooth-plotter-dd74404.js'; +- NETDATA.raphael_js = NETDATA.serverDefault + 'lib/raphael-2.2.4-min.js'; ++ NETDATA.raphael_js = NETDATA.serverDefault + 'lib/raphael-min.js'; + NETDATA.c3_js = NETDATA.serverDefault + 'lib/c3-0.4.11.min.js'; + NETDATA.c3_css = NETDATA.serverDefault + 'css/c3-0.4.11.min.css'; + NETDATA.d3_js = NETDATA.serverDefault + 'lib/d3-3.5.17.min.js'; +@@ -125,7 +125,7 @@ + + NETDATA.themes = { + white: { +- bootstrap_css: NETDATA.serverDefault + 'css/bootstrap-3.3.7.min.css', ++ bootstrap_css: NETDATA.serverDefault + 'css/bootstrap.min.css', + dashboard_css: NETDATA.serverDefault + 'dashboard.css?v20161002-1', + background: '#FFFFFF', + foreground: '#000000', +@@ -5577,7 +5577,7 @@ + + NETDATA.requiredJs = [ + { +- url: NETDATA.serverDefault + 'lib/bootstrap-3.3.7.min.js', ++ url: NETDATA.serverDefault + 'lib/bootstrap.min.js', + async: false, + isAlreadyLoaded: function() { + // check if bootstrap is loaded diff --git a/debian/patches/series b/debian/patches/series index f082ea8d..8ed8a277 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 0002-remove-file-serve-restrictions-for-symlinks.patch 0003-hide-update-button.patch 0004-readd-shebang-to-chart-scripts.patch +0005-remove-lib-versions.patch |