diff --git a/COPYING.md b/COPYING.md index 0a81d2c0d..8045c9eb6 100644 --- a/COPYING.md +++ b/COPYING.md @@ -7,6 +7,9 @@ Affero General Public License, Version 3 or later. A copy of AGPLv3 is available [from the Free Software Foundation](http://www.gnu.org/licenses/agpl.html). +Licenses for individual files are listed in debian/copyright which is +a machine readable format. + In addition, the documentation to this software is distributed under a Creative Commons Attribution-ShareAlike 3.0 Unported, Version 3 license. This CC-By-SA license is available in both diff --git a/LICENSES b/LICENSES deleted file mode 100644 index 5398feed5..000000000 --- a/LICENSES +++ /dev/null @@ -1,14 +0,0 @@ -# -*- mode: org; mode: org-indent; mode: visual-line; -*- - -License for this program is described in COPYING.md. Individual files with -different licenses are primarily listed in debian/copyright. The remaining are -listed here. - -- static/themes/default/icons/diaspora.png :: [[https://upload.wikimedia.org/wikipedia/commons/thumb/8/85//Deluge-Logo.svg/2000px-Deluge-Logo.svg.png][Publc Domain]] -- static/themes/default/icons/ejabberd.png :: [[https://www.ejabberd.im/][GPL-2]] -- static/themes/default/icons/jsxc.png :: - -- static/themes/default/icons/privoxy.png :: [[https://openhub.net/p/privoxy][GPL]] -- static/themes/default/icons/repro.png :: [[https://www.resiprocate.org/Main_Page][BSD-3-clause]] -- static/themes/default/icons/sharing.png :: [[https://www.shareicon.net/social-share-this-107338][CC 2.5]] -- static/themes/default/icons/tor.png :: [[https://commons.wikimedia.org/wiki/File:Tor_logo1.png][CC BY 3.0 US]] -- static/themes/default/icons/transmission.png :: [[https://transmissionbt.com/][GPL]] diff --git a/debian/copyright b/debian/copyright index 94ca41b97..d4b984a2e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,6 +3,7 @@ Source: https://salsa.debian.org/freedombox-team/plinth Files: * static/themes/default/icons/coquelicot.svg + static/themes/default/icons/jsxc.png static/themes/default/icons/jsxc.svg static/themes/default/icons/mldonkey.svg Copyright: 2011-2019 FreedomBox Authors @@ -39,12 +40,16 @@ Copyright: Jakub Steiner, Tuomas Kuosmanen Comment: https://git.deluge-torrent.org/deluge/tree/deluge/ui/data/icons/hicolor/scalable/apps/deluge.svg License: CC-BY-SA-2.0 -Files: static/themes/default/icons/diaspora.svg +Files: static/themes/default/icons/diaspora.png + static/themes/default/icons/diaspora.svg + static/themes/default/icons/ejabberd.png static/themes/default/icons/ejabberd.svg static/themes/default/icons/matrixsynapse.svg static/themes/default/icons/mediawiki.svg + static/themes/default/icons/privoxy.png static/themes/default/icons/privoxy.svg static/themes/default/icons/radicale.svg + static/themes/default/icons/repro.png static/themes/default/icons/repro.svg static/themes/default/img/network-* Copyright: None @@ -181,7 +186,8 @@ Copyright: Clowwindy Comment: https://commons.wikimedia.org/wiki/File:Shadowsocks-Logo.svg License: Apache-2.0 -Files: static/themes/default/icons/sharing.svg +Files: static/themes/default/icons/sharing.png + static/themes/default/icons/sharing.svg Copyright: Interface (https://www.shareicon.net/author/interface) Comment: https://www.shareicon.net/universal-interface-interface-sharing-share-697502 License: CC-BY-3.0 @@ -207,12 +213,15 @@ Copyright: 2006-2018 The Tahoe-LAFS Software Foundation Comment: https://github.com/tahoe-lafs/tahoe-lafs/blob/master/misc/build_helpers/icons/logo.svg License: GPL-2+ -Files: static/themes/default/icons/tor.svg +Files: static/themes/default/icons/tor.png + static/themes/default/icons/tor.svg Copyright: The Tor Project, Inc. -Comment: https://commons.wikimedia.org/wiki/File:Tor-logo-2011-flat.svg +Comment: https://commons.wikimedia.org/wiki/File:Tor_logo1.png + https://commons.wikimedia.org/wiki/File:Tor-logo-2011-flat.svg License: CC-BY-3.0-US -Files: static/themes/default/icons/transmission.svg +Files: static/themes/default/icons/transmission.png + static/themes/default/icons/transmission.svg Copyright: Transmission Authors Comment: https://github.com/transmission/transmission/blob/master/gtk/icons/hicolor_apps_scalable_transmission.svg License: GPL-3 diff --git a/static/themes/default/icons/diaspora.png b/static/themes/default/icons/diaspora.png index 0aac946d0..ab98a53ad 100644 Binary files a/static/themes/default/icons/diaspora.png and b/static/themes/default/icons/diaspora.png differ diff --git a/static/themes/default/icons/ejabberd.png b/static/themes/default/icons/ejabberd.png index a65c2af75..f24364f55 100644 Binary files a/static/themes/default/icons/ejabberd.png and b/static/themes/default/icons/ejabberd.png differ diff --git a/static/themes/default/icons/privoxy.png b/static/themes/default/icons/privoxy.png index 67f25e84d..4799b2ab5 100644 Binary files a/static/themes/default/icons/privoxy.png and b/static/themes/default/icons/privoxy.png differ diff --git a/static/themes/default/icons/repro.png b/static/themes/default/icons/repro.png index cca9828dc..d5b0366ae 100644 Binary files a/static/themes/default/icons/repro.png and b/static/themes/default/icons/repro.png differ diff --git a/static/themes/default/icons/sharing.png b/static/themes/default/icons/sharing.png index 86ff7d5dc..0dfd6c3c2 100644 Binary files a/static/themes/default/icons/sharing.png and b/static/themes/default/icons/sharing.png differ