Merge branch 'master' into debian-jessie-backports

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

diff --git a/debian/copyright b/debian/copyright
index e58f01192bb3618b483229671652db57876e01f8..28b5aa5911d96dbcf7fda2686df8f51926906f31 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Copyright: © 2006-2011 Joey Hess <joey@ikiwiki.info>
 License: GPL-2+
 
 Files: templates/* underlays/basewiki/* doc/ikiwiki/directive/*
 License: GPL-2+
 
 Files: templates/* underlays/basewiki/* doc/ikiwiki/directive/*

- ikiwiki.setup po/underlays/*
+ ikiwiki.setup po/underlays/* underlays/javascript/*

 Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info>
 License: permissive
 
 Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info>
 License: permissive
 


@@ -197,20 +197,20 @@ Comment:
  Republished with permission.
 License: GPL-2+
 
  Republished with permission.
 License: GPL-2+
 

-Files: underlays/openid-selector/ikiwiki/login-selector/*
+Files: underlays/login-selector/ikiwiki/login-selector/*

 Copyright: © 2008-2010 andyjm, david.j.boden
 Comment:
 Copyright: © 2008-2010 andyjm, david.j.boden
 Comment:

- From http://code.google.com/p/openid-selector/
+ Based on https://code.google.com/archive/p/openid-selector/

 License: BSD-2-clause
 
 License: BSD-2-clause
 

-Files: underlays/openid-selector/ikiwiki/login-selector/goa-*
+Files: underlays/login-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
 
 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/login-selector/wordpress.png
+Files: underlays/login-selector/ikiwiki/login-selector/wordpress.png

 Copyright:
  © 2003-2013 "the contributors"
 License: GPL-2+
 Copyright:
  © 2003-2013 "the contributors"
 License: GPL-2+


@@ -222,8 +222,8 @@ Files:
  icons/aol.svg
  icons/livejournal.svg
  icons/verisign.svg
  icons/aol.svg
  icons/livejournal.svg
  icons/verisign.svg

- underlays/openid-selector/ikiwiki/login-selector/aol.png
- underlays/openid-selector/ikiwiki/login-selector/verisign.png
+ underlays/login-selector/ikiwiki/login-selector/aol.png
+ underlays/login-selector/ikiwiki/login-selector/verisign.png

 Copyright:
  © 2014 Simon McVittie
 License: permissive
 Copyright:
  © 2014 Simon McVittie
 License: permissive