X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d922b1897c81db10b5b8a48d4b92e56a92d12448..de38423a59cd356c1e5d82e8b70dccfa9fa94808:/debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 09febb6e5..e14398acd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -142,11 +142,11 @@ Copyright: © 2009 William Uther
 License: GPL-2+
 
 Files: IkiWiki/Plugin/cvs.pm
-Copyright: © 2009 Amitai Schlair
+Copyright: © 2009 Amitai Schlair <http://www.schmonz.com/>
 License: BSD-2-clause
 
 Files: IkiWiki/Plugin/rsync.pm
-Copyright: © 2009 Amitai Schlair
+Copyright: © 2009 Amitai Schlair <http://www.schmonz.com/>
 License: BSD-2-clause
 
 Files: IkiWiki/Plugin/osm.pm
@@ -201,20 +201,20 @@ Comment:
  Republished with permission.
 License: GPL-2+
 
-Files: underlays/openid-selector/ikiwiki/openid/*
+Files: underlays/openid-selector/ikiwiki/login-selector/*
 Copyright: © 2008-2010 andyjm, david.j.boden
 Comment: 
  From http://code.google.com/p/openid-selector/
 License: BSD-2-clause
 
-Files: underlays/openid-selector/ikiwiki/openid/goa-*
+Files: underlays/openid-selector/ikiwiki/login-selector/goa-*
 Copyright:
  © 2011 Red Hat, Inc.
 License: LGPL-2.1+
 Comment:
  taken from data/icons/16x16/ in gnome-online-accounts git
 
-Files: underlays/openid-selector/ikiwiki/openid/wordpress.png
+Files: underlays/openid-selector/ikiwiki/login-selector/wordpress.png
 Copyright:
  © 2003-2013 "the contributors"
 License: GPL-2+
@@ -226,9 +226,8 @@ Files:
  icons/aol.svg
  icons/livejournal.svg
  icons/verisign.svg
- underlays/openid-selector/ikiwiki/openid/aol.png
- underlays/openid-selector/ikiwiki/openid/livejournal.png
- underlays/openid-selector/ikiwiki/openid/verisign.png
+ underlays/openid-selector/ikiwiki/login-selector/aol.png
+ underlays/openid-selector/ikiwiki/login-selector/verisign.png
 Copyright:
  © 2014 Simon McVittie
 License: other
@@ -276,6 +275,15 @@ Files: themes/monochrome/*
 Copyright: © 2012 Jon Dowland
 License: GPL-2+
 
+Files:
+ icons/internet-mail.svg
+ doc/wikiicons/email.png
+Comment:
+ icon by Jakub Steiner and Andreas Nilsson, taken from
+ tango-icon-theme 0.8.90.
+Copyright: none
+License: public-domain
+
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -342,3 +350,39 @@ License: LGPL-2.1+
  .
  On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+License: public-domain
+ Public Domain Dedication
+ .
+ Copyright-Only Dedication (based on United States law) or Public Domain
+ Certification
+ .
+ The person or persons who have associated work with this document (the
+ "Dedicator" or "Certifier") hereby either (a) certifies that, to the best
+ of his knowledge, the work of authorship identified is in the public
+ domain of the country from which the work is published, or (b)
+ hereby dedicates whatever copyright the dedicators holds in the work
+ of authorship identified below (the "Work") to the public domain. A
+ certifier, moreover, dedicates any copyright interest he may have in
+ the associated work, and for these purposes, is described as a
+ "dedicator" below.
+ .
+ A certifier has taken reasonable steps to verify the copyright
+ status of this work. Certifier recognizes that his good faith efforts
+ may not shield him from liability if in fact the work certified is not
+ in the public domain.
+ .
+ Dedicator makes this dedication for the benefit of the public at
+ large and to the detriment of the Dedicator's heirs and successors.
+ Dedicator intends this dedication to be an overt act of relinquishment
+ in perpetuity of all present and future rights under copyright law,
+ whether vested or contingent, in the Work. Dedicator understands that
+ such relinquishment of all rights includes the relinquishment of all
+ rights to enforce (by lawsuit or otherwise) those copyrights in the
+ Work.
+ .
+ Dedicator recognizes that, once placed in the public domain, the Work
+ may be freely reproduced, distributed, transmitted, used, modified,
+ built upon, or otherwise exploited by anyone for any purpose, commercial
+ or non-commercial, and in any way, including by methods that have not
+ yet been invented or conceived.