change to debian font-awesome

instead of having font-awesome copied into the repository,
depend on the debian package 'fonts-font-awesome', which provides all we
need

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm
index 8b821154d9947b04b044772104dd08097ff2191c..0904127f11f9f52157251c1fda0fc5e746968dce 100755 (executable)
--- a/PVE/Service/pveproxy.pm
+++ b/PVE/Service/pveproxy.pm
@@ -49,6 +49,7 @@ my $basedirs = {
     extjs => '/usr/share/javascript/extjs',
     manager => '/usr/share/pve-manager',
     docs => '/usr/share/pve-docs',
+    fontawesome => '/usr/share/fonts-font-awesome',
 };
 
 sub init {
@@ -73,6 +74,8 @@ sub init {
     add_dirs($dirs, '/pve2/images/' =>  "$basedirs->{manager}/images/");
     add_dirs($dirs, '/pve2/css/' =>  "$basedirs->{manager}/css/");
     add_dirs($dirs, '/pve2/js/' =>  "$basedirs->{manager}/js/");
+    add_dirs($dirs, '/pve2/fa/fonts/' =>  "$basedirs->{fontawesome}/fonts/");
+    add_dirs($dirs, '/pve2/fa/css/' =>  "$basedirs->{fontawesome}/css/");
     add_dirs($dirs, '/pve-docs/' => "$basedirs->{docs}/");
     add_dirs($dirs, '/novnc/' => "$basedirs->{novnc}/");
 

diff --git a/debian/control b/debian/control
index d65d9312d26cde52fea160b764a1a91272cfc403..bea96c12147b72fdf8072a0856652c7c53a1ee35 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -66,7 +66,8 @@ Depends: libc6 (>= 2.14),
          lsb-base,
          ${perl:Depends},
          ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+         fonts-font-awesome
 Conflicts: netcat-openbsd, vzdump, vlan
 Replaces: vzdump, vlan
 Provides: vzdump, vlan

diff --git a/www/css/Makefile b/www/css/Makefile
index 449f6f4fe4f23eedb945cd63883c21a73be94295..3960292c6e623acaa1a624db1bcf90cdf5549384 100644 (file)
--- a/www/css/Makefile
+++ b/www/css/Makefile
@@ -2,11 +2,10 @@ include ../../defines.mk
 
 all:
 
-.PHONY: install 
-install: ext6-pve.css font-awesome.css
+.PHONY: install
+install: ext6-pve.css
        install -d ${WWWCSSDIR}
        install -m 0644 $? ${WWWCSSDIR}
-       set -e && ${MAKE} -C fonts install
 
 .PHONY: clean
 clean:

diff --git a/www/index.html.tpl b/www/index.html.tpl
index aa87aebc66510f6dde29c755a5085cb8ab492025..9abe09ef3f3d384b5a8c996566a0cd68961ab11b 100644 (file)
--- a/www/index.html.tpl
+++ b/www/index.html.tpl
@@ -9,7 +9,7 @@
     <link rel="apple-touch-icon" sizes="128x128" href="/pve2/images/logo-128.png" />
     <link rel="stylesheet" type="text/css" href="/pve2/ext6/theme-crisp/resources/theme-crisp-all.css" />
     <link rel="stylesheet" type="text/css" href="/pve2/ext6/crisp/resources/charts-all.css" />
-    <link rel="stylesheet" type="text/css" href="/pve2/css/font-awesome.css" />
+    <link rel="stylesheet" type="text/css" href="/pve2/fa/css/font-awesome.css" />
     <link rel="stylesheet" type="text/css" href="/pve2/css/ext6-pve.css" />
     [% IF langfile %]
     <script type='text/javascript' src='/pve2/locale/pve-lang-[% lang %].js'></script>