Update upstream source from tag 'upstream/3.20180105'

[git.ikiwiki.info.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index b140feaa11569ef1361dba872e897f7130568173..077699dcbe24ed9bbd2b6b41a35e9d75811c6ede 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -210,6 +210,24 @@ License: LGPL-2.1+
 Comment:
  taken from data/icons/16x16/ in gnome-online-accounts git
 
+Files: underlays/login-selector/ikiwiki/login-selector/wordpress.png
+Copyright:
+ © 2003-2013 "the contributors"
+License: GPL-2+
+Comment:
+ taken from wp-admin/images/w-logo-blue.png in wordpress/3.8.1+dfsg1-1
+ and trivially modified (resized to 16x16, placed on a white background)
+
+Files:
+ icons/aol.svg
+ icons/livejournal.svg
+ icons/verisign.svg
+ underlays/login-selector/ikiwiki/login-selector/aol.png
+ underlays/login-selector/ikiwiki/login-selector/verisign.png
+Copyright:
+ © 2014 Simon McVittie
+License: permissive
+
 Files: underlays/jquery/*
 Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer
            © 2011 The Dojo Foundation