diff options
| -rw-r--r-- | debian/netdata-data.links | 8 | ||||
| -rwxr-xr-x | debian/rules | 13 |
2 files changed, 8 insertions, 13 deletions
diff --git a/debian/netdata-data.links b/debian/netdata-data.links index cbba848ce..411b620c5 100644 --- a/debian/netdata-data.links +++ b/debian/netdata-data.links @@ -1,6 +1,10 @@ #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/css/bootstrap-theme.min.css /usr/share/javascript/bootstrap/css/bootstrap.min.css usr/share/netdata/css/bootstrap.min.css #libjs-jquery @@ -11,5 +15,9 @@ /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 +/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/css/font-awesome.min.css diff --git a/debian/rules b/debian/rules index 040eb35dc..e2d7497f5 100755 --- a/debian/rules +++ b/debian/rules @@ -14,17 +14,6 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed MULTIARCH_INSTALL = debian/netdata.postinst -EXISTING_LINKS = $(WEB)lib/bootstrap.min.js \ - $(WEB)fonts/glyphicons-halflings-regular.ttf \ - $(WEB)css/bootstrap-theme.min.css \ - $(WEB)css/bootstrap.min.css \ - $(WEB)lib/jquery-1.12.0.min.js \ - $(WEB)lib/d3.min.js \ - $(WEB)lib/raphael-min.js \ - $(WEB)fonts/FontAwesome.otf \ - $(WEB)fonts/fontawesome-webfont.ttf \ - $(WEB)css/font-awesome.min.css - %: # For jessie and beyond # @@ -50,8 +39,6 @@ override_dh_install: $(MULTIARCH_INSTALL) find "$(TOP)" -name .keep -exec rm '{}' ';' rm -rf $(TOP)-data/usr/share/netdata/web/old - rm -f $(EXISTING_LINKS) - # Update postinst to set correct group for www files on installation. # Should probably be dpkg-statoverride really, but that gets *really* # messy. We also set all web files in /var as conffiles so an upgrade |