initial linking

4 files changed, 42 insertions, 15 deletions

diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index d4098bb90..2f1124a05 100644
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -1,19 +1,20 @@
 * De-vendorize JS/font libraries
 	* bootstrap, raphael, jquery + some jquery plugins exist.
-		- web/lib/bootstrap.min.js: libjs-bootstrap
-		- web/lib/raphael-min.js: libjs-raphael
-		- web/lib/d3.min.js: libjs-d3
-		- web/lib/jquery-1.12.0.min.js: libjs-jquery
-		- web/fonts/FontAwesome.otf: fonts-font-awesome
-		- web/fonts/fontawesome-webfont.ttf: fonts-font-awesome
-		- web/fonts/glyphicons-halflings-regular.ttf: libjs-bootstrap -.-
 		- web/lib/c3.min.js: #819891
+		- web/css/c3.min.css #819891
 		- web/lib/dygraph-combined.js: #749603
+		- web/lib/dygraph-smooth-plotter.js
+		- web/lib/bootstrap-toggle.min.js
+		- web/lib/ElementQueries.js
+		- web/lib/ResizeSensor.js
 		- web/lib/gauge.min.js
 		- web/lib/jquery.easypiechart.min.js
 		- web/lib/jquery.nanoscroller.min.js
 		- web/lib/jquery.peity.min.js
 		- web/lib/jquery.sparkline.min.js
 		- web/lib/morris.min.js
+		- web/css/bootstrap.slate.min.css
+		- web/css/bootstrap-toggle.min.css
+		- web/css/morris.css
 	* Create additional or keep them in mind for future linking
 * Restrict security permissions in netdata.service
diff --git a/debian/control b/debian/control
index f64bcaff7..f25e03e2a 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,12 @@ Package: netdata
 Architecture: any
 Multi-Arch: no
 Depends: adduser,
+         fonts-font-awesome,
          libcap2-bin (>= 1:2.0),
+         libjs-bootstrap,
+         libjs-d3,
+         libjs-jquery,
+         libjs-raphael,
          lsb-base (>= 3.1-23.2),
          netdata-data,
          ${misc:Depends},
diff --git a/debian/netdata-data.links b/debian/netdata-data.links
new file mode 100644
index 000000000..cbba848ce
--- /dev/null
+++ b/debian/netdata-data.links
@@ -0,0 +1,15 @@
+#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.ttf usr/share/netdata/web/fonts/glyphicons-halflings-regular.ttf
+/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
+/usr/share/javascript/jquery/jquery.min.js usr/share/netdata/web/lib/jquery-1.12.0.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.ttf usr/share/netdata/web/fonts/fontawesome-webfont.ttf
+/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 432ba1c07..040eb35dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
 # the location of plugins in /usr/lib
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 TOP = $(CURDIR)/debian/netdata
+WEB = $(TOP)-data/usr/share/web/
 
 export DH_VERBOSE = 1
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
@@ -12,6 +13,18 @@ export DEB_CFLAGS_MAINT_APPEND  = -Wall -O3
 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
 	#
@@ -37,14 +50,7 @@ override_dh_install: $(MULTIARCH_INSTALL)
 	find "$(TOP)" -name .keep -exec rm '{}' ';'
 	rm -rf $(TOP)-data/usr/share/netdata/web/old
 
-	# Move files that local user shouldn't be editing to /usr/share/netdata
-	#
-	#mkdir -p "$(TOP)/usr/share/netdata"
-	#for D in $$(find "$(TOP)/var/lib/netdata/www/" -maxdepth 1 -type d -printf '%f '); do \
-	#	echo Relocating $$D; \
-	#	mv "$(TOP)/var/lib/netdata/www/$$D" "$(TOP)/usr/share/netdata/$$D"; \
-	#	ln -s "/usr/share/netdata/$$D" "$(TOP)/var/lib/netdata/www/$$D"; \
-	#done
+	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*