Merge branch 'master' into revert

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

diff --git a/debian/copyright b/debian/copyright
index 050a4dd61d98670c45c5196790c55d842f3fa545..74391e2cfe6dc870339dd35ff66e4ffc22bd520e 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,11 @@
 Files: *
 Files: *

-Copyright: © 2006-2008 Joey Hess <joey@ikiwiki.info>
+Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info>

 License: GPL-2+
  The full text of the GPL is distributed as doc/GPL in ikiwiki's source,
  and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems.
 
 Files: templates/*, underlays/basewiki/*, doc/ikiwiki/directive/*, ikiwiki.setup, po/underlay/*
 License: GPL-2+
  The full text of the GPL is distributed as doc/GPL in ikiwiki's source,
  and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems.
 
 Files: templates/*, underlays/basewiki/*, doc/ikiwiki/directive/*, ikiwiki.setup, po/underlay/*

-Copyright: © 2006-2008 Joey Hess <joey@ikiwiki.info>
+Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info>

 License: other
  Redistribution and use in source and compiled forms, with or without
  modification, are permitted under any circumstances. No warranty.
 License: other
  Redistribution and use in source and compiled forms, with or without
  modification, are permitted under any circumstances. No warranty.


@@ -163,6 +163,7 @@ Copyright:
   2007 Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
   2007 Daniel Nylander <po@danielnylander.se>
   2009 Fernando González de Requena <fgrequena@gmail.com>
   2007 Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
   2007 Daniel Nylander <po@danielnylander.se>
   2009 Fernando González de Requena <fgrequena@gmail.com>

+  2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>

 License: 
  Redistribution and use in source and compiled forms, with or without
  modification, are permitted under any circumstances. No warranty.
 License: 
  Redistribution and use in source and compiled forms, with or without
  modification, are permitted under any circumstances. No warranty.


@@ -190,6 +191,29 @@ License: GPL-2+
 
 Files: cvs.pm
 Copyright: © 2009 Amitai Schlair
 
 Files: cvs.pm
 Copyright: © 2009 Amitai Schlair

+License: BSD-C2
+
+Files: underlays/openid-selector/ikiwiki/openid/*
+Copyright: © 2008-2010 andyjm, david.j.boden
+License: BSD-C2
+  From http://code.google.com/p/openid-selector/
+
+Files: underlays/openid-selector/ikiwiki/openid/jquery.js
+Copyright: © 2005-2008 by John Resig, Branden Aaron & Jörn Zaefferer
+License: GPL-2
+
+Files: underlays/themes/blueview/style.css
+Copyright: 
+ © 2009,2010 Bernd Zeimetz
+ © 2008 Yahoo! Inc.
+License: GPL-2+
+  Parts derived from BSD-C3 licensed YUI library.
+  http://developer.yahoo.com/yui/license.html
+
+Files: underlays/themes/blueview/*
+Copyright: © 2009,2010 Bernd Zeimetz
+License: GPL-2+
+

 License: BSD-C2
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
 License: BSD-C2
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions