From 806cd1b0588a200fd3709a3f3ccc0337cf3c9e97 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 25 Oct 2016 17:22:39 +0200 Subject: Merging upstream version 20161101. Signed-off-by: Daniel Baumann --- CHANGELOG.txt | 13 +++++++++++++ VERSION | 2 +- share/apache/mods/000-apache-icons.conf | 8 +++++++- share/maps/awesome.txt | 3 +++ share/maps/tango.txt | 3 +++ 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 74588f7..45dd2b5 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,19 @@ +2016-11-01 Daniel Baumann + + * Releasing version 20161101. + + [ Daniel Baumann ] + * Adding icon for optical media images. + * Adding icon for harddisk media images. + * Adding dedicated icon for checksum and signature files. + * Adding filename suffix for checksums. + * Adding author name to changelog file. + 2016-07-01 Daniel Baumann * Releasing version 20160701. + + [ Daniel Baumann ] * Added further file suffixes for text icon. * Correcting and updating existing documentation. * Adding apache-icons manpage. diff --git a/VERSION b/VERSION index f48d32f..c2ace56 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -20160701 +20161101 diff --git a/share/apache/mods/000-apache-icons.conf b/share/apache/mods/000-apache-icons.conf index bd9c2b5..e57f2f2 100644 --- a/share/apache/mods/000-apache-icons.conf +++ b/share/apache/mods/000-apache-icons.conf @@ -31,11 +31,17 @@ AddIconByType (IMG,/icons/image.${FORMAT}) image/* + AddIcon /icons/optical.${FORMAT} .iso + + AddIcon /icons/harddisk.${FORMAT} .img + + AddIcon /icons/checksum.${FORMAT} .asc .gpg .sign .changes .dsc .md5 MD5SUMS .sha1 SHA1SUMS .sha224 SHA224SUMS .sha256 SHA256SUMS .sha384 SHA384SUMS .sha512 SHA512SUMS + AddIcon /icons/presentation.${FORMAT} .odp .otp .ppt .pot .pptx .potx .pps .ppsx AddIcon /icons/spreadsheet.${FORMAT} .ods .ots .xls .xlt .xlsx .xltx - AddIcon /icons/text.${FORMAT} .txt .htm .html .shtml .xhtml .asc .gpg .sign .changes .dsc MD5SUMS SHA1SUMS SHA224SUMS SHA256SUMS SHA384SUMS SHA512SUMS + AddIcon /icons/text.${FORMAT} .txt .htm .html .shtml .xhtml AddIconByType (TXT,/icons/text.${FORMAT}) text/* AddIcon (VID,/icons/video.${FORMAT}) .mkv .mp4 .ogm diff --git a/share/maps/awesome.txt b/share/maps/awesome.txt index 7a04452..6a7b845 100644 --- a/share/maps/awesome.txt +++ b/share/maps/awesome.txt @@ -8,5 +8,8 @@ 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 diff --git a/share/maps/tango.txt b/share/maps/tango.txt index 33a7627..4dae761 100644 --- a/share/maps/tango.txt +++ b/share/maps/tango.txt @@ -8,5 +8,8 @@ archive mimetypes/package-x-generic.svg text mimetypes/text-x-generic.svg video mimetypes/video-x-generic.svg document mimetypes/x-office-document.svg +optical devices/media-optical.svg +harddisk devices/drive-harddisk.svg +checksum mimetypes/application-certificate.svg presentation mimetypes/x-office-presentation.svg spreadsheet mimetypes/x-office-spreadsheet.svg -- cgit v1.2.3