From f2b45ea15ba479b4bbebb3c6ffc72dd5a1623c33 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Wed, 27 Feb 2019 21:25:53 -0500 Subject: [PATCH] debian/copyright: Move some app icons from LICENSES Signed-off-by: James Valleroy --- LICENSES | 8 ----- debian/copyright | 77 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 75 insertions(+), 10 deletions(-) diff --git a/LICENSES b/LICENSES index ce2d106aa..4b0d86e3f 100644 --- a/LICENSES +++ b/LICENSES @@ -25,16 +25,9 @@ otherwise. Additional licenses are listed in debian/copyright. - static/themes/default/img/freedombox-logo-250px.png :: - - static/themes/default/img/freedombox-logo-32px.png :: - - static/themes/default/img/freedombox-logotype.png :: - -- static/themes/default/icons/deluge.png :: [[https://upload.wikimedia.org/wikipedia/commons/thumb/8/85//Deluge-Logo.svg/2000px-Deluge-Logo.svg.png][GPL]] - 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/infinoted.png :: [[https://github.com/gobby/gobby/blob/master/COPYING][ISC]] -- static/themes/default/icons/ikiwiki.png :: [[https://ikiwiki.info/][GPL-2+]] - static/themes/default/icons/jsxc.png :: - -- static/themes/default/icons/matrixsynapse.png :: [[https://github.com/thekishanraval/Logos][GPLv3+]] -- static/themes/default/icons/minetest.png :: [[http://www.minetest.net/media/icon.svg][LGPL 2.1]] -- static/themes/default/icons/mumble.png :: [[https://commons.wikimedia.org/wiki/File:Icons_mumble.svg][BSD-3-clause]] -- static/themes/default/icons/openvpn.png :: [[https://github.com/thekishanraval/Logos][GPLv3+]] - static/themes/default/icons/privoxy.png :: [[https://openhub.net/p/privoxy][GPL]] - static/themes/default/icons/quassel.png :: [[http://quassel-irc.org/][GPL-3]] - static/themes/default/icons/radicale.png :: [[http://radicale.org/][GPL-3.0]] @@ -44,7 +37,6 @@ otherwise. Additional licenses are listed in debian/copyright. - static/themes/default/icons/shadowsocks.png :: [[https://commons.wikimedia.org/wiki/File:Shadowsocks_logo.png][Apache 2.0]] - static/themes/default/icons/sharing.png :: [[https://www.shareicon.net/social-share-this-107338][CC 2.5]] - static/themes/default/icons/syncthing.png :: [[https://github.com/syncthing/syncthing/][Mozilla Public License Version 2.0]] -- static/themes/default/icons/tahoe.png :: [[https://github.com/thekishanraval/Logos][GPLv3+]] - 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]] - static/themes/default/icons/ttrss.png :: [[https://tt-rss.org/gitlab/fox/tt-rss][GPL]] diff --git a/debian/copyright b/debian/copyright index b470ea8fa..da6190272 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12,9 +12,41 @@ Copyright: 2012 Robert Martinez License: GPL-3+-or-CC-BY-SA Some rights reserved. +Files: static/themes/default/icons/deluge.png +Copyright: 2007 Andrew Wedderburn +License: GPL-2+ + +Files: static/themes/default/icons/ikiwiki.png +Copyright: 2006 Recai Oktaş +License: GPL-2+ + +Files: static/themes/default/icons/infinoted.png +Copyright: 2008-2014 Armin Burgmeier +License: ISC + +Files: static/themes/default/icons/matrixsynapse.png +Copyright: 2007 Kishan Raval +License: GPL-3+ + +Files: static/themes/default/icons/minetest.png +Copyright: 2011 erlehmann +License: CC-BY-SA-3.0 + +Files: static/themes/default/icons/mumble.png +Copyright: 2009 Martin Skilnand +License: BSD-3-clause + +Files: static/themes/default/icons/openvpn.png +Copyright: 2007 Kishan Raval +License: GPL-3+ + +Files: static/themes/default/icons/tahoe.png +Copyright: 2007 Kishan Raval +License: GPL-3+ + Files: static/themes/default/img/FreedomBox-logo-* Copyright: 2012 Robert Martinez -License: GPL-3+-or-CC-BY-SA +License: GPL-3+ or CC-BY-SA Some rights reserved. Files: static/themes/default/img/network-* @@ -28,7 +60,7 @@ License: LGPL-3+ or CC-BY-SA-3.0 Files: static/themes/default/img/network-freedombox.svg Copyright: 2012 Robert Martinez -License: GPL-3+-or-CC-BY-SA +License: GPL-3+ or CC-BY-SA Some rights reserved. Files: static/themes/default/lato/* @@ -44,6 +76,31 @@ Copyright: 2013 Tzafrir Cohen Copyright: 2013-2019 FreedomBox Authors License: GPL-2+ +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE HOLDERS OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + License: GPL-2+ 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 @@ -74,6 +131,9 @@ License: GPL-3+ . You should have received a copy of the GNU General Public License along with this program. If not, see . + . + On Debian systems you will find a copy of the GPL (version 3) at + /usr/share/common-licenses/GPL-3. License: LGPL-3+ This library is free software; you can redistribute it and/or modify @@ -87,6 +147,19 @@ License: LGPL-3+ On Debian systems you will find a copy of the LGPL (version 3) at /usr/share/common-licenses/LGPL-3. +License: ISC + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + License: OFL-1.1 PREAMBLE The goals of the Open Font License (OFL) are to stimulate worldwide