Merging upstream version 20190301.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
author: Daniel Baumann <daniel.baumann@progress-linux.org> 2019-03-02 14:56:28 +0000
committer: Daniel Baumann <daniel.baumann@progress-linux.org> 2019-03-02 14:56:41 +0000
commit: 5855582827006d711ded96f2de53f8edea8b3c4a (patch)
tree: 4d2f5c3eeb6ec55d75c1ad6937dd74a8bde7bfbf
parent: Releasing debian version 20170701-3. (diff)
download: open-infrastructure-service-tools-5855582827006d711ded96f2de53f8edea8b3c4a.tar.xz
open-infrastructure-service-tools-5855582827006d711ded96f2de53f8edea8b3c4a.zip
34 files changed, 127 insertions, 843 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 324f49e..5f8170c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,16 @@
+2019-03-01	Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+	* Releasing version 20190301.
+
+	[ Daniel Baumann ]
+	* Adding SPDX License Identifiers.
+	* Updating blank.svg.
+	* Switching from font-awesome to fork-awesome.
+	* Updating Makefile for rename to service-tools.
+	* Updating manpage for rename to service-tools.
+	* Updating apache configs for rename to service-tools.
+	* Updating copyright headers for 2019.
+
 2017-07-01	Daniel Baumann <daniel.baumann@open-infrastructure.net>
 
 	* Releasing version 20170701.
diff --git a/Makefile b/Makefile
index b5a3a47..0e7140b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
-# Makefile
-
-# apache-icons - Alternative icons for Apache autoindex
-# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+#
+# SPDX-License-Identifier: GPL-3.0+
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +17,9 @@
 
 SHELL := sh -e
 
-SOFTWARE = apache-icons
+PROJECT = open-infrastructure
+SOFTWARE = service-tools
+PROGRAM = apache-icons
 
 all: build
 
@@ -47,18 +48,16 @@ build: share/man/*.txt
 	done
 
 install: build
-	mkdir -p $(DESTDIR)/usr/share/doc/$(SOFTWARE)
-	cp -a CHANGELOG.txt LICENSE.txt README.txt $(DESTDIR)/usr/share/doc/$(SOFTWARE)
+	mkdir -p $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
+	cp -r VERSION.txt $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
+	cp -r build/* $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
 
-	mkdir -p $(DESTDIR)/usr/share/$(SOFTWARE)
-	cp -a build/* $(DESTDIR)/usr/share/$(SOFTWARE)
-
-	for DIRECTORY in $(DESTDIR)/usr/share/$(SOFTWARE)/*-png; \
+	for DIRECTORY in $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)/*-png; \
 	do \
 		cp -a share/common/*.png $${DIRECTORY}; \
 	done
 
-	for DIRECTORY in $(DESTDIR)/usr/share/$(SOFTWARE)/*-svg; \
+	for DIRECTORY in $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)/*-svg; \
 	do \
 		cp -a share/common/*.svg $${DIRECTORY}; \
 	done
@@ -78,6 +77,9 @@ install: build
 		fi; \
 	done
 
+	mkdir -p $(DESTDIR)/usr/share/doc/$(SOFTWARE)
+	cp -r CHANGELOG.txt LICENSE.txt README.txt $(DESTDIR)/usr/share/doc/$(SOFTWARE)
+
 uninstall:
 	for SECTION in $$(seq 1 8); \
 	do \
@@ -100,10 +102,10 @@ uninstall:
 	done
 	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/apache2/mods-available || true
 
-	rm -rf $(DESTDIR)/usr/share/$(SOFTWARE)/*
-	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share/$(SOFTWARE) || true
+	rm -rf $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share/$(PROJECT) || true
 
-	rm -rf $(DESTDIR)/usr/share/doc/$(SOFTWARE)/*
+	rm -rf $(DESTDIR)/usr/share/doc/$(SOFTWARE)
 	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share/doc/$(SOFTWARE) || true
 
 clean:
diff --git a/VERSION.txt b/VERSION.txt
index 454d1fc..868c05a 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20170701
+20190301
diff --git a/share/apache/conf/000-apache-icons.conf b/share/apache/conf/000-apache-icons.conf
index bfc6b4c..7cce24b 100644
--- a/share/apache/conf/000-apache-icons.conf
+++ b/share/apache/conf/000-apache-icons.conf
@@ -1,5 +1,5 @@
 <IfModule mod_autoindex.c>
-	Include /usr/share/apache-icons/default.conf
+	Include /usr/share/open-infrastructure/apache-icons/default.conf
 
 	DefaultIcon /icons/default.${FORMAT}
 </IfModule>
diff --git a/share/apache/mods/000-apache-icons.conf b/share/apache/mods/000-apache-icons.conf
index e57f2f2..c78afba 100644
--- a/share/apache/mods/000-apache-icons.conf
+++ b/share/apache/mods/000-apache-icons.conf
@@ -1,7 +1,7 @@
 <IfModule alias_module>
-	Alias /icons/ "/usr/share/apache-icons/default/"
+	Alias /icons/ "/usr/share/open-infrastructure/apache-icons/default/"
 
-	<Directory "/usr/share/apache-icons/default">
+	<Directory "/usr/share/open-infrastructure/apache-icons/default">
 		Options FollowSymlinks
 		AllowOverride None
 		Require all granted
@@ -9,7 +9,7 @@
 </IfModule>
 
 <IfModule mod_autoindex.c>
-	Include /usr/share/apache-icons/default.conf
+	Include /usr/share/open-infrastructure/apache-icons/default.conf
 
 	IndexOptions FancyIndexing VersionSort HTMLTable NameWidth=* DescriptionWidth=* Charset=UTF-8
 
diff --git a/share/common/blank.png b/share/common/blank.png
index f8fe361..0d1e6f4 100644
--- a/share/common/blank.png
+++ b/share/common/blank.png
diff --git a/share/common/blank.svg b/share/common/blank.svg
index 5822d2e..153f89f 100644
--- a/share/common/blank.svg
+++ b/share/common/blank.svg
@@ -14,26 +14,11 @@
    viewBox="0 0 22 22"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.1 r15371"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
    sodipodi:docname="blank.svg"
-   inkscape:export-filename="/srv/sources/open-infrastructure/software/apache-icons/share/icons/common/blank.svg.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-maximized="1" />
+   inkscape:export-filename="blank.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -42,13 +27,23 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1030.3622)" />
+  <defs
+     id="defs5" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1311"
+     id="namedview3"
+     showgrid="false"
+     inkscape:window-maximized="1" />
 </svg>
diff --git a/share/icons/awesome/arrow-left.svg b/share/icons/awesome/arrow-left.svg
new file mode 100644
index 0000000..50e9b92
--- /dev/null
+++ b/share/icons/awesome/arrow-left.svg
@@ -0,0 +1,3 @@
+<svg width="1536" height="1536" xmlns="http://www.w3.org/2000/svg">
+    <path d="M1536 896v128c0 68-45 128-117 128H715l293 294c24 23 38 56 38 90s-14 67-38 90l-75 76c-23 23-56 37-90 37s-67-14-91-37l-651-652c-23-23-37-56-37-90s14-67 37-91l651-650c24-24 57-38 91-38s66 14 90 38l75 74c24 24 38 57 38 91s-14 67-38 91L715 768h704c72 0 117 60 117 128z"/>
+</svg>
diff --git a/share/icons/awesome/fa-arrow-left.svg b/share/icons/awesome/fa-arrow-left.svg
deleted file mode 100644
index e203104..0000000
--- a/share/icons/awesome/fa-arrow-left.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="fa-arrow-left.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <text
-       xml:space="preserve"
-       x="0.89348119"
-       y="1044.9984"
-       id="text3336"
-       sodipodi:linespacing="125%"
-       style="font-size:51.75866318px;line-height:125%"><tspan
-         sodipodi:role="line"
-         id="tspan3338"
-         x="0.89348119"
-         y="1044.9984"></tspan></text>
-  </g>
-</svg>
diff --git a/share/icons/awesome/fa-file-archive-o.svg b/share/icons/awesome/fa-file-archive-o.svg
deleted file mode 100644
index 6ffb2a2..0000000
--- a/share/icons/awesome/fa-file-archive-o.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="fa-file-archive-o.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <text
-       xml:space="preserve"
-       x="4.7145"
-       y="1044.4336"
-       id="text3336"
-       sodipodi:linespacing="125%"
-       style="font-size:45px;line-height:125%"><tspan
-         sodipodi:role="line"
-         id="tspan3338"
-         x="4.7145"
-         y="1044.4336"></tspan></text>
-  </g>
-</svg>
diff --git a/share/icons/awesome/fa-file-audio-o.svg b/share/icons/awesome/fa-file-audio-o.svg
deleted file mode 100644
index 9f57f4b..0000000
--- a/share/icons/awesome/fa-file-audio-o.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="fa-file-audio-o.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <text
-       xml:space="preserve"
-       x="4.7145"
-       y="1044.4336"
-       id="text3336"
-       sodipodi:linespacing="125%"
-       style="font-size:45px;line-height:125%"><tspan
-         sodipodi:role="line"
-         id="tspan3338"
-         x="4.7145"
-         y="1044.4336"></tspan></text>
-  </g>
-</svg>
diff --git a/share/icons/awesome/fa-file-code-o.svg b/share/icons/awesome/fa-file-code-o.svg
deleted file mode 100644
index 5aab7fe..0000000
--- a/share/icons/awesome/fa-file-code-o.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="fa-file-code-o.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <text
-       xml:space="preserve"
-       x="4.7145395"
-       y="1044.4249"
-       id="text3336"
-       sodipodi:linespacing="125%"
-       style="font-size:45px;line-height:125%"
-       transform="scale(0.99999162,1.0000084)"><tspan
-         sodipodi:role="line"
-         id="tspan3338"
-         x="4.7145395"
-         y="1044.4249"></tspan></text>
-  </g>
-</svg>
diff --git a/share/icons/awesome/fa-file-excel-o.svg b/share/icons/awesome/fa-file-excel-o.svg
deleted file mode 100644
index f66bfd5..0000000
--- a/share/icons/awesome/fa-file-excel-o.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="fa-file-excel-o.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <text
-       xml:space="preserve"
-       x="4.7145262"
-       y="1044.4279"
-       id="text3336"
-       sodipodi:linespacing="125%"
-       style="font-size:45px;line-height:125%"
-       transform="scale(0.99999442,1.0000056)"><tspan
-         sodipodi:role="line"
-         id="tspan3338"
-         x="4.7145262"
-         y="1044.4279"></tspan></text>
-  </g>
-</svg>
diff --git a/share/icons/awesome/fa-file-image-o.svg b/share/icons/awesome/fa-file-image-o.svg
deleted file mode 100644
index d736081..0000000
--- a/share/icons/awesome/fa-file-image-o.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="fa-file-image-o.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <text
-       xml:space="preserve"
-       x="4.7145"
-       y="1044.4336"
-       id="text3336"
-       sodipodi:linespacing="125%"
-       style="font-size:45px;line-height:125%"><tspan
-         sodipodi:role="line"
-         id="tspan3338"
-         x="4.7145"
-         y="1044.4336"></tspan></text>
-  </g>
-</svg>
diff --git a/share/icons/awesome/fa-file-o.svg b/share/icons/awesome/fa-file-o.svg
deleted file mode 100644
index 06ee2e8..0000000
--- a/share/icons/awesome/fa-file-o.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="fa-file-o.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <text
-       xml:space="preserve"
-       x="4.7145262"
-       y="1044.4277"
-       id="text3336"
-       sodipodi:linespacing="125%"
-       style="font-size:45px;line-height:125%"
-       transform="scale(0.99999444,1.0000056)"><tspan
-         sodipodi:role="line"
-         id="tspan3338"
-         x="4.7145262"
-         y="1044.4277"></tspan></text>
-  </g>
-</svg>
diff --git a/share/icons/awesome/fa-file-powerpoint-o.svg b/share/icons/awesome/fa-file-powerpoint-o.svg
deleted file mode 100644
index a6c4ba9..0000000
--- a/share/icons/awesome/fa-file-powerpoint-o.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="fa-file-powerpoint-o.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <text
-       xml:space="preserve"
-       x="4.7145262"
-       y="1044.4279"
-       id="text3336"
-       sodipodi:linespacing="125%"
-       style="font-size:45px;line-height:125%"
-       transform="scale(0.99999442,1.0000056)"><tspan
-         sodipodi:role="line"
-         id="tspan3338"
-         x="4.7145262"
-         y="1044.4279"></tspan></text>
-  </g>
-</svg>
diff --git a/share/icons/awesome/fa-file-text-o.svg b/share/icons/awesome/fa-file-text-o.svg
deleted file mode 100644
index 5b503ca..0000000
--- a/share/icons/awesome/fa-file-text-o.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="fa-file-text-o.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <text
-       xml:space="preserve"
-       x="4.7145"
-       y="1044.4336"
-       id="text3336"
-       sodipodi:linespacing="125%"
-       style="font-size:45px;line-height:125%"><tspan
-         sodipodi:role="line"
-         id="tspan3338"
-         x="4.7145"
-         y="1044.4336"></tspan></text>
-  </g>
-</svg>
diff --git a/share/icons/awesome/fa-file-video-o.svg b/share/icons/awesome/fa-file-video-o.svg
deleted file mode 100644
index 1ac14a7..0000000
--- a/share/icons/awesome/fa-file-video-o.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="fa-file-video-o.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <text
-       xml:space="preserve"
-       x="4.7145395"
-       y="1044.4249"
-       id="text3336"
-       sodipodi:linespacing="125%"
-       style="font-size:45px;line-height:125%"
-       transform="scale(0.99999162,1.0000084)"><tspan
-         sodipodi:role="line"
-         id="tspan3338"
-         x="4.7145395"
-         y="1044.4249"></tspan></text>
-  </g>
-</svg>
diff --git a/share/icons/awesome/fa-file-word-o.svg b/share/icons/awesome/fa-file-word-o.svg
deleted file mode 100644
index 119c716..0000000
--- a/share/icons/awesome/fa-file-word-o.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="fa-file-word-o.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <text
-       xml:space="preserve"
-       x="4.7145262"
-       y="1044.4277"
-       id="text3336"
-       sodipodi:linespacing="125%"
-       style="font-size:45px;line-height:125%"
-       transform="scale(0.99999442,1.0000056)"><tspan
-         sodipodi:role="line"
-         id="tspan3338"
-         x="4.7145262"
-         y="1044.4277"></tspan></text>
-  </g>
-</svg>
diff --git a/share/icons/awesome/fa-folder-o.svg b/share/icons/awesome/fa-folder-o.svg
deleted file mode 100644
index 65a5fe6..0000000
--- a/share/icons/awesome/fa-folder-o.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="fa-folder-o.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <text
-       xml:space="preserve"
-       x="1.5000014"
-       y="1047.7472"
-       id="text3336"
-       sodipodi:linespacing="125%"
-       style="font-size:48.46154022px;line-height:125%"><tspan
-         sodipodi:role="line"
-         id="tspan3338"
-         x="1.5000014"
-         y="1047.7472"></tspan></text>
-  </g>
-</svg>
diff --git a/share/icons/awesome/file-archive-o.svg b/share/icons/awesome/file-archive-o.svg
new file mode 100644
index 0000000..bd99c37
--- /dev/null
+++ b/share/icons/awesome/file-archive-o.svg
@@ -0,0 +1,3 @@
+<svg width="1536" height="1536" xmlns="http://www.w3.org/2000/svg">
+    <path d="M640 384V256H512v128h128zm128 128V384H640v128h128zM640 640V512H512v128h128zm128 128V640H640v128h128zm700-388c37 37 68 111 68 164v1152c0 53-43 96-96 96H96c-53 0-96-43-96-96V96C0 43 43 0 96 0h896c53 0 127 31 164 68zm-444-244v376h376c-6-17-15-34-22-41l-313-313c-7-7-24-16-41-22zm384 1528V640H992c-53 0-96-43-96-96V128H768v128H640V128H128v1536h1280zM781 943c85 287 107 349 107 349 5 17 8 34 8 52 0 111-108 192-256 192s-256-81-256-192c0-18 3-35 8-52 0 0 21-62 120-396V768h128v128h79c29 0 54 19 62 47zm-141 465c71 0 128-29 128-64s-57-64-128-64-128 29-128 64 57 64 128 64z"/>
+</svg>
diff --git a/share/icons/awesome/file-audio-o.svg b/share/icons/awesome/file-audio-o.svg
new file mode 100644
index 0000000..fe0a167
--- /dev/null
+++ b/share/icons/awesome/file-audio-o.svg
@@ -0,0 +1,3 @@
+<svg width="1536" height="1536" xmlns="http://www.w3.org/2000/svg">
+    <path d="M1468 380c37 37 68 111 68 164v1152c0 53-43 96-96 96H96c-53 0-96-43-96-96V96C0 43 43 0 96 0h896c53 0 127 31 164 68zm-444-244v376h376c-6-17-15-34-22-41l-313-313c-7-7-24-16-41-22zm384 1528V640H992c-53 0-96-43-96-96V128H128v1536h1280zM620 850c12 5 20 17 20 30v544c0 13-8 25-20 30-4 1-8 2-12 2-8 0-16-3-23-9l-166-167H288c-18 0-32-14-32-32v-192c0-18 14-32 32-32h131l166-167c10-9 23-12 35-7zm417 689c19 0 37-8 50-24 83-102 129-231 129-363s-46-261-129-363c-22-28-63-32-90-10-28 23-32 63-9 91 65 80 100 178 100 282s-35 202-100 282c-23 28-19 68 9 90 12 10 26 15 40 15zm-211-148c17 0 34-7 47-20 56-60 87-137 87-219s-31-159-87-219c-24-26-65-27-91-3-25 24-27 65-2 91 33 36 52 82 52 131s-19 95-52 131c-25 26-23 67 2 91 13 11 29 17 44 17z"/>
+</svg>
diff --git a/share/icons/awesome/file-code-o.svg b/share/icons/awesome/file-code-o.svg
new file mode 100644
index 0000000..814c888
--- /dev/null
+++ b/share/icons/awesome/file-code-o.svg
@@ -0,0 +1,3 @@
+<svg width="1536" height="1536" xmlns="http://www.w3.org/2000/svg">
+    <path d="M1468 380c37 37 68 111 68 164v1152c0 53-43 96-96 96H96c-53 0-96-43-96-96V96C0 43 43 0 96 0h896c53 0 127 31 164 68zm-444-244v376h376c-6-17-15-34-22-41l-313-313c-7-7-24-16-41-22zm384 1528V640H992c-53 0-96-43-96-96V128H128v1536h1280zM480 768c11-14 31-17 45-6l51 38c14 11 17 31 6 45l-182 243 182 243c11 14 8 34-6 45l-51 38c-14 11-34 8-45-6l-226-301c-8-11-8-27 0-38zm802 301c8 11 8 27 0 38l-226 301c-11 14-31 17-45 6l-51-38c-14-11-17-31-6-45l182-243-182-243c-11-14-8-34 6-45l51-38c14-11 34-8 45 6zm-620 461c-18-3-29-20-26-37l138-831c3-18 20-29 37-26l63 10c18 3 29 20 26 37l-138 831c-3 18-20 29-37 26z"/>
+</svg>
diff --git a/share/icons/awesome/file-excel-o.svg b/share/icons/awesome/file-excel-o.svg
new file mode 100644
index 0000000..1f1f067
--- /dev/null
+++ b/share/icons/awesome/file-excel-o.svg
@@ -0,0 +1,3 @@
+<svg width="1536" height="1536" xmlns="http://www.w3.org/2000/svg">
+    <path d="M1468 380c37 37 68 111 68 164v1152c0 53-43 96-96 96H96c-53 0-96-43-96-96V96C0 43 43 0 96 0h896c53 0 127 31 164 68zm-444-244v376h376c-6-17-15-34-22-41l-313-313c-7-7-24-16-41-22zm384 1528V640H992c-53 0-96-43-96-96V128H128v1536h1280zm-979-234v106h281v-106h-75l103-161c12-19 18-34 21-34h2c1 4 3 7 5 10 4 8 10 14 17 24l107 161h-76v106h291v-106h-68l-192-273 195-282h67V768H828v107h74l-103 159c-12 19-21 34-21 33h-2c-1-4-3-7-5-10-4-7-9-14-17-23L648 875h76V768H434v107h68l189 272-194 283h-68z"/>
+</svg>
diff --git a/share/icons/awesome/file-image-o.svg b/share/icons/awesome/file-image-o.svg
new file mode 100644
index 0000000..3c411d9
--- /dev/null
+++ b/share/icons/awesome/file-image-o.svg
@@ -0,0 +1,3 @@
+<svg width="1536" height="1536" xmlns="http://www.w3.org/2000/svg">
+    <path d="M1468 380c37 37 68 111 68 164v1152c0 53-43 96-96 96H96c-53 0-96-43-96-96V96C0 43 43 0 96 0h896c53 0 127 31 164 68zm-444-244v376h376c-6-17-15-34-22-41l-313-313c-7-7-24-16-41-22zm384 1528V640H992c-53 0-96-43-96-96V128H128v1536h1280zm-128-448v320H256v-192l192-192 128 128 384-384zm-832-192c-106 0-192-86-192-192s86-192 192-192 192 86 192 192-86 192-192 192z"/>
+</svg>
diff --git a/share/icons/awesome/file-o.svg b/share/icons/awesome/file-o.svg
new file mode 100644
index 0000000..4dbf6d9
--- /dev/null
+++ b/share/icons/awesome/file-o.svg
@@ -0,0 +1,3 @@
+<svg width="1536" height="1536" xmlns="http://www.w3.org/2000/svg">
+    <path d="M1468 380c37 37 68 111 68 164v1152c0 53-43 96-96 96H96c-53 0-96-43-96-96V96C0 43 43 0 96 0h896c53 0 127 31 164 68zm-444-244v376h376c-6-17-15-34-22-41l-313-313c-7-7-24-16-41-22zm384 1528V640H992c-53 0-96-43-96-96V128H128v1536h1280z"/>
+</svg>
diff --git a/share/icons/awesome/file-powerpoint-o.svg b/share/icons/awesome/file-powerpoint-o.svg
new file mode 100644
index 0000000..7689b65
--- /dev/null
+++ b/share/icons/awesome/file-powerpoint-o.svg
@@ -0,0 +1,3 @@
+<svg width="1536" height="1536" xmlns="http://www.w3.org/2000/svg">
+    <path d="M1468 380c37 37 68 111 68 164v1152c0 53-43 96-96 96H96c-53 0-96-43-96-96V96C0 43 43 0 96 0h896c53 0 127 31 164 68zm-444-244v376h376c-6-17-15-34-22-41l-313-313c-7-7-24-16-41-22zm384 1528V640H992c-53 0-96-43-96-96V128H128v1536h1280zm-992-234v106h327v-106h-93v-167h137c43 0 82-2 118-15 90-31 146-124 146-233s-54-193-137-228c-38-15-84-19-130-19H416v107h92v555h-92zm353-280H650V882h120c35 0 62 6 83 18 36 21 56 62 56 115 0 56-20 99-62 120-21 10-47 15-78 15z"/>
+</svg>
diff --git a/share/icons/awesome/file-text-o.svg b/share/icons/awesome/file-text-o.svg
new file mode 100644
index 0000000..21fa1bc
--- /dev/null
+++ b/share/icons/awesome/file-text-o.svg
@@ -0,0 +1,3 @@
+<svg width="1536" height="1536" xmlns="http://www.w3.org/2000/svg">
+    <path d="M1468 380c37 37 68 111 68 164v1152c0 53-43 96-96 96H96c-53 0-96-43-96-96V96C0 43 43 0 96 0h896c53 0 127 31 164 68zm-444-244v376h376c-6-17-15-34-22-41l-313-313c-7-7-24-16-41-22zm384 1528V640H992c-53 0-96-43-96-96V128H128v1536h1280zM384 800c0-18 14-32 32-32h704c18 0 32 14 32 32v64c0 18-14 32-32 32H416c-18 0-32-14-32-32v-64zm736 224c18 0 32 14 32 32v64c0 18-14 32-32 32H416c-18 0-32-14-32-32v-64c0-18 14-32 32-32h704zm0 256c18 0 32 14 32 32v64c0 18-14 32-32 32H416c-18 0-32-14-32-32v-64c0-18 14-32 32-32h704z"/>
+</svg>
diff --git a/share/icons/awesome/file-video-o.svg b/share/icons/awesome/file-video-o.svg
new file mode 100644
index 0000000..939c471
--- /dev/null
+++ b/share/icons/awesome/file-video-o.svg
@@ -0,0 +1,3 @@
+<svg width="1536" height="1536" xmlns="http://www.w3.org/2000/svg">
+    <path d="M1468 380c37 37 68 111 68 164v1152c0 53-43 96-96 96H96c-53 0-96-43-96-96V96C0 43 43 0 96 0h896c53 0 127 31 164 68zm-444-244v376h376c-6-17-15-34-22-41l-313-313c-7-7-24-16-41-22zm384 1528V640H992c-53 0-96-43-96-96V128H128v1536h1280zM768 768c70 0 128 58 128 128v384c0 70-58 128-128 128H384c-70 0-128-58-128-128V896c0-70 58-128 128-128h384zm492 2c12 5 20 17 20 30v576c0 13-8 25-20 30-4 1-8 2-12 2-8 0-17-3-23-9l-265-266v-90l265-266c6-6 15-9 23-9 4 0 8 1 12 2z"/>
+</svg>
diff --git a/share/icons/awesome/file-word-o.svg b/share/icons/awesome/file-word-o.svg
new file mode 100644
index 0000000..b98cfb8
--- /dev/null
+++ b/share/icons/awesome/file-word-o.svg
@@ -0,0 +1,3 @@
+<svg width="1536" height="1536" xmlns="http://www.w3.org/2000/svg">
+    <path d="M1468 380c37 37 68 111 68 164v1152c0 53-43 96-96 96H96c-53 0-96-43-96-96V96C0 43 43 0 96 0h896c53 0 127 31 164 68zm-444-244v376h376c-6-17-15-34-22-41l-313-313c-7-7-24-16-41-22zm384 1528V640H992c-53 0-96-43-96-96V128H128v1536h1280zM233 768v107h70l164 661h159l128-485c5-15 8-30 10-46 1-8 2-16 2-24h4l3 24c3 14 4 30 9 46l128 485h159l164-661h70V768h-300v107h90l-99 438c-4 16-6 33-7 46l-2 21h-4c0-6-2-14-3-21-3-13-5-30-9-46L825 768H711l-144 545c-4 16-5 33-8 46l-4 21h-4l-2-21c-1-13-3-30-7-46l-99-438h90V768H233z"/>
+</svg>
diff --git a/share/icons/awesome/folder-o.svg b/share/icons/awesome/folder-o.svg
new file mode 100644
index 0000000..d5d126b
--- /dev/null
+++ b/share/icons/awesome/folder-o.svg
@@ -0,0 +1,3 @@
+<svg width="1536" height="1536" xmlns="http://www.w3.org/2000/svg">
+    <path d="M1536 1312V608c0-53-43-96-96-96H736c-53 0-96-43-96-96v-64c0-53-43-96-96-96H224c-53 0-96 43-96 96v960c0 53 43 96 96 96h1216c53 0 96-43 96-96zm128-704v704c0 123-101 224-224 224H224c-123 0-224-101-224-224V352c0-123 101-224 224-224h320c123 0 224 101 224 224v32h672c123 0 224 101 224 224z"/>
+</svg>
diff --git a/share/man/Makefile b/share/man/Makefile
index aff079f..2fe75b5 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -1,7 +1,6 @@
-# Makefile
-
-# apache-icons - Alternative icons for Apache autoindex
-# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+#
+# SPDX-License-Identifier: GPL-3.0+
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/share/man/apache-icons.7.txt b/share/man/service-tools.7.txt
index 4cfe6b8..01cec5f 100644
--- a/share/man/apache-icons.7.txt
+++ b/share/man/service-tools.7.txt
@@ -1,5 +1,6 @@
-// apache-icons - Alternative icons for Apache autoindex
-// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+//
+// SPDX-License-Identifier: GPL-3.0+
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -18,7 +19,7 @@ APACHE-ICONS(7)
 ===============
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: apache-icons
+:man source: service-tools
 :man version: {revnumber}
 
 
@@ -37,10 +38,10 @@ apache-icons provides alternative icons for Apache autoindex.
 
 DOWNLOAD
 --------
-  * Upstream Releases: https://files.open-infrastructure.net/software/apache-icons/upstream
-  * Upstream Sources: https://sources.open-infrastructure.net/software/apache-icons
-  * Debian Releases: https://files.open-infrastructure.net/software/apache-icons/debian
-  * Debian Sources: https://sources.progress-linux.org/users/daniel.baumann/debian/packages/open-infrastructure-apache-icons
+  * Upstream Releases: https://get.open-infrastructure.net/software/service-tools/upstream
+  * Upstream Sources: https://git.open-infrastructure.net/software/service-tools
+  * Debian Releases: https://get.open-infrastructure.net/software/service-tools/debian
+  * Debian Sources: https://git.progress-linux.org/users/daniel.baumann/debian/packages/open-infrastructure-service-tools
 
 
 INSTALLATION
@@ -49,16 +50,16 @@ INSTALLATION
 SOURCE
 ~~~~~~
   1. sudo apt install asciidoc git docbook-xml docbook-xsl libxml2-utils make xsltproc imagemagick librsvg2-bin
-  2. git clone https://sources.open-infrastructure.net/software/apache-icons
-  3. cd apache-icons && sudo make install
+  2. git clone https://git.open-infrastructure.net/software/service-tools
+  3. cd service-tools && sudo make install
 
 DEBIAN 9 (STRETCH) AND NEWER
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   * sudo apt install apache-icons
 
-UBUNTU 16.10 (YAKKETY) AND NEWER
---------------------------------
-  * sudo apt install apache-icons
+DEBIAN 10 (BUSTER) AND NEWER
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  * sudo apt install apache-tools
 
 
 DEVELOPMENT
@@ -93,8 +94,8 @@ icons).
 
 The following themes are available:
 
-  * awesome-png: Font Awesome based, PNG format
-  * awesome-svg: Font Awesome based, SVG format
+  * awesome-png: Fork Awesome based, PNG format
+  * awesome-svg: Fork Awesome based, SVG format
   * tango-png: Tango Icons based, PNG format
   * tango-svg: Tango Icons based, SVG format
 
@@ -102,13 +103,13 @@ The SVG themes are preferable because they are sharper and scale losless.
 They require somewhat modern browsers though.
 
 An example of the tango-svg theme can be seen on
-https://files.open-infrastructure.net.
+https://get.open-infrastructure.net.
 
 
 LINKS
 -----
-*Font Awesome:*::
-	http://fontawesome.io/
+*Fork Awesome:*::
+	https://https://forkaweso.me
 
 *Tango Desktop Project:*::
 	http://tango.freedesktop.org/
diff --git a/share/maps/awesome.txt b/share/maps/awesome.txt
index 6a7b845..5730c17 100644
--- a/share/maps/awesome.txt
+++ b/share/maps/awesome.txt
@@ -1,15 +1,15 @@
-back		fa-arrow-left.svg
-code		fa-file-code-o.svg
-directory	fa-folder-o.svg
-default		fa-file-o.svg
-audio		fa-file-audio-o.svg
-image		fa-file-image-o.svg
-archive		fa-file-archive-o.svg
-text		fa-file-text-o.svg
-video		fa-file-video-o.svg
-document	fa-file-word-o.svg
-optical		fa-file-archive-o.svg
-harddisk	fa-file-archive-o.svg
-checksum	fa-file-text-o.svg
-presentation	fa-file-powerpoint-o.svg
-spreadsheet	fa-file-excel-o.svg
+back		arrow-left.svg
+code		file-code-o.svg
+directory	folder-o.svg
+default		file-o.svg
+audio		file-audio-o.svg
+image		file-image-o.svg
+archive		file-archive-o.svg
+text		file-text-o.svg
+video		file-video-o.svg
+document	file-word-o.svg
+optical		file-archive-o.svg
+harddisk	file-archive-o.svg
+checksum	file-text-o.svg
+presentation	file-powerpoint-o.svg
+spreadsheet	file-excel-o.svg
author	Daniel Baumann <daniel.baumann@progress-linux.org>	2019-03-02 14:56:28 +0000
committer	Daniel Baumann <daniel.baumann@progress-linux.org>	2019-03-02 14:56:41 +0000
commit	5855582827006d711ded96f2de53f8edea8b3c4a (patch)
tree	4d2f5c3eeb6ec55d75c1ad6937dd74a8bde7bfbf
parent	Releasing debian version 20170701-3. (diff)
download	open-infrastructure-service-tools-5855582827006d711ded96f2de53f8edea8b3c4a.tar.xz open-infrastructure-service-tools-5855582827006d711ded96f2de53f8edea8b3c4a.zip