From 5855582827006d711ded96f2de53f8edea8b3c4a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 2 Mar 2019 15:56:28 +0100 Subject: Merging upstream version 20190301. Signed-off-by: Daniel Baumann --- share/apache/conf/000-apache-icons.conf | 2 +- share/apache/mods/000-apache-icons.conf | 6 +- share/common/blank.png | Bin 154 -> 154 bytes share/common/blank.svg | 45 +++++----- share/icons/awesome/arrow-left.svg | 3 + share/icons/awesome/fa-arrow-left.svg | 63 -------------- share/icons/awesome/fa-file-archive-o.svg | 63 -------------- share/icons/awesome/fa-file-audio-o.svg | 63 -------------- share/icons/awesome/fa-file-code-o.svg | 64 -------------- share/icons/awesome/fa-file-excel-o.svg | 64 -------------- share/icons/awesome/fa-file-image-o.svg | 63 -------------- share/icons/awesome/fa-file-o.svg | 64 -------------- share/icons/awesome/fa-file-powerpoint-o.svg | 64 -------------- share/icons/awesome/fa-file-text-o.svg | 63 -------------- share/icons/awesome/fa-file-video-o.svg | 64 -------------- share/icons/awesome/fa-file-word-o.svg | 64 -------------- share/icons/awesome/fa-folder-o.svg | 63 -------------- share/icons/awesome/file-archive-o.svg | 3 + share/icons/awesome/file-audio-o.svg | 3 + share/icons/awesome/file-code-o.svg | 3 + share/icons/awesome/file-excel-o.svg | 3 + share/icons/awesome/file-image-o.svg | 3 + share/icons/awesome/file-o.svg | 3 + share/icons/awesome/file-powerpoint-o.svg | 3 + share/icons/awesome/file-text-o.svg | 3 + share/icons/awesome/file-video-o.svg | 3 + share/icons/awesome/file-word-o.svg | 3 + share/icons/awesome/folder-o.svg | 3 + share/man/Makefile | 7 +- share/man/apache-icons.7.txt | 119 -------------------------- share/man/service-tools.7.txt | 120 +++++++++++++++++++++++++++ share/maps/awesome.txt | 30 +++---- 32 files changed, 198 insertions(+), 929 deletions(-) create mode 100644 share/icons/awesome/arrow-left.svg delete mode 100644 share/icons/awesome/fa-arrow-left.svg delete mode 100644 share/icons/awesome/fa-file-archive-o.svg delete mode 100644 share/icons/awesome/fa-file-audio-o.svg delete mode 100644 share/icons/awesome/fa-file-code-o.svg delete mode 100644 share/icons/awesome/fa-file-excel-o.svg delete mode 100644 share/icons/awesome/fa-file-image-o.svg delete mode 100644 share/icons/awesome/fa-file-o.svg delete mode 100644 share/icons/awesome/fa-file-powerpoint-o.svg delete mode 100644 share/icons/awesome/fa-file-text-o.svg delete mode 100644 share/icons/awesome/fa-file-video-o.svg delete mode 100644 share/icons/awesome/fa-file-word-o.svg delete mode 100644 share/icons/awesome/fa-folder-o.svg create mode 100644 share/icons/awesome/file-archive-o.svg create mode 100644 share/icons/awesome/file-audio-o.svg create mode 100644 share/icons/awesome/file-code-o.svg create mode 100644 share/icons/awesome/file-excel-o.svg create mode 100644 share/icons/awesome/file-image-o.svg create mode 100644 share/icons/awesome/file-o.svg create mode 100644 share/icons/awesome/file-powerpoint-o.svg create mode 100644 share/icons/awesome/file-text-o.svg create mode 100644 share/icons/awesome/file-video-o.svg create mode 100644 share/icons/awesome/file-word-o.svg create mode 100644 share/icons/awesome/folder-o.svg delete mode 100644 share/man/apache-icons.7.txt create mode 100644 share/man/service-tools.7.txt (limited to 'share') 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 @@ - Include /usr/share/apache-icons/default.conf + Include /usr/share/open-infrastructure/apache-icons/default.conf DefaultIcon /icons/default.${FORMAT} 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 @@ - Alias /icons/ "/usr/share/apache-icons/default/" + Alias /icons/ "/usr/share/open-infrastructure/apache-icons/default/" - + Options FollowSymlinks AllowOverride None Require all granted @@ -9,7 +9,7 @@ - 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 Binary files a/share/common/blank.png and b/share/common/blank.png differ 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"> - - + inkscape:export-filename="blank.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> @@ -42,13 +27,23 @@ image/svg+xml - - + + 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 @@ + + + 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 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - 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 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - 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 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - 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 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - 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 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - 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 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - 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 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - 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 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - 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 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - 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 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - 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 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - 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 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - 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 @@ + + + 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 @@ + + + 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 @@ + + + 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 @@ + + + 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 @@ + + + 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 @@ + + + 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 @@ + + + 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 @@ + + + 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 @@ + + + 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 @@ + + + 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 @@ + + + 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 +# Copyright (C) 2014-2019 Daniel Baumann +# +# 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/apache-icons.7.txt deleted file mode 100644 index 4cfe6b8..0000000 --- a/share/man/apache-icons.7.txt +++ /dev/null @@ -1,119 +0,0 @@ -// apache-icons - Alternative icons for Apache autoindex -// Copyright (C) 2014-2017 Daniel Baumann -// -// 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 -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -APACHE-ICONS(7) -=============== -:doctype: manpage -:man manual: Open Infrastructure -:man source: apache-icons -:man version: {revnumber} - - -NAME ----- -apache-icons - Alternative icons for Apache autoindex - - -DESCRIPTION ------------ -"The Apache HTTP Server is the world's most used web server software." - -- Wikipedia (https://en.wikipedia.org/wiki/Apache_HTTP_Server) - -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 - - -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 - -DEBIAN 9 (STRETCH) AND NEWER -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * sudo apt install apache-icons - -UBUNTU 16.10 (YAKKETY) AND NEWER --------------------------------- - * sudo apt install apache-icons - - -DEVELOPMENT ------------ -Bug reports, feature requests, help, patches, support and everything else -are welcome on the Open Infrastructure Software Mailing List: - - * https://lists.open-infrastructure.net/listinfo/software - -Please base patches against the 'next' Git branch using common sense: - - * https://www.kernel.org/doc/Documentation/SubmittingPatches - -Debian specific bugs can also be reported in the Debian Bug Tracking System: - - * https://bugs.debian.org - - -KNOWN LIMITATIONS ------------------ -Changing from one icon set to the other requires a reload of the apache webserver. - - -USAGE ------ -The default icon theme is determined by the /usr/share/apache-icons/default -(and /usr/share/apache-icons/default.conf respectivly) file. - -On Debian based system "sudo update-alternatives --config apache-icons" can be -used to automatically select the active icon theme (including the default apache -icons). - -The following themes are available: - - * awesome-png: Font Awesome based, PNG format - * awesome-svg: Font Awesome based, SVG format - * tango-png: Tango Icons based, PNG format - * tango-svg: Tango Icons based, SVG format - -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. - - -LINKS ------ -*Font Awesome:*:: - http://fontawesome.io/ - -*Tango Desktop Project:*:: - http://tango.freedesktop.org/ - - -AUTHORS -------- - * Daniel Baumann diff --git a/share/man/service-tools.7.txt b/share/man/service-tools.7.txt new file mode 100644 index 0000000..01cec5f --- /dev/null +++ b/share/man/service-tools.7.txt @@ -0,0 +1,120 @@ +// Copyright (C) 2014-2019 Daniel Baumann +// +// 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 +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +APACHE-ICONS(7) +=============== +:doctype: manpage +:man manual: Open Infrastructure +:man source: service-tools +:man version: {revnumber} + + +NAME +---- +apache-icons - Alternative icons for Apache autoindex + + +DESCRIPTION +----------- +"The Apache HTTP Server is the world's most used web server software." + -- Wikipedia (https://en.wikipedia.org/wiki/Apache_HTTP_Server) + +apache-icons provides alternative icons for Apache autoindex. + + +DOWNLOAD +-------- + * 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 +------------ + +SOURCE +~~~~~~ + 1. sudo apt install asciidoc git docbook-xml docbook-xsl libxml2-utils make xsltproc imagemagick librsvg2-bin + 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 + +DEBIAN 10 (BUSTER) AND NEWER +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * sudo apt install apache-tools + + +DEVELOPMENT +----------- +Bug reports, feature requests, help, patches, support and everything else +are welcome on the Open Infrastructure Software Mailing List: + + * https://lists.open-infrastructure.net/listinfo/software + +Please base patches against the 'next' Git branch using common sense: + + * https://www.kernel.org/doc/Documentation/SubmittingPatches + +Debian specific bugs can also be reported in the Debian Bug Tracking System: + + * https://bugs.debian.org + + +KNOWN LIMITATIONS +----------------- +Changing from one icon set to the other requires a reload of the apache webserver. + + +USAGE +----- +The default icon theme is determined by the /usr/share/apache-icons/default +(and /usr/share/apache-icons/default.conf respectivly) file. + +On Debian based system "sudo update-alternatives --config apache-icons" can be +used to automatically select the active icon theme (including the default apache +icons). + +The following themes are available: + + * 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 + +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://get.open-infrastructure.net. + + +LINKS +----- +*Fork Awesome:*:: + https://https://forkaweso.me + +*Tango Desktop Project:*:: + http://tango.freedesktop.org/ + + +AUTHORS +------- + * Daniel Baumann 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 -- cgit v1.2.3