X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3cbc16abd623a1780cde3b663c46114698fe1062..9ff9088636f6d065ac834a25a535e3dc86fde891:/debian/copyright?ds=sidebyside

diff --git a/debian/copyright b/debian/copyright
index 28b5aa591..b140feaa1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: native package
 
 Files: *
@@ -140,11 +140,11 @@ Copyright: © 2009 William Uther
 License: GPL-2+
 
 Files: IkiWiki/Plugin/cvs.pm
-Copyright: © 2009 Amitai Schlair <http://www.schmonz.com/>
+Copyright: © 2009 Amitai Schleier <http://www.schmonz.com/>
 License: BSD-2-clause
 
 Files: IkiWiki/Plugin/rsync.pm
-Copyright: © 2009 Amitai Schlair <http://www.schmonz.com/>
+Copyright: © 2009 Amitai Schleier <http://www.schmonz.com/>
 License: BSD-2-clause
 
 Files: IkiWiki/Plugin/osm.pm
@@ -210,29 +210,18 @@ 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
 License: GPL-2
 
+Files: underlays/attachment/ikiwiki/*
+Copyright: 2010, 2011 Sebastian Tschan
+Comment:
+ blueimp / jQuery-File-Upload widget,
+ from https://github.com/blueimp/jQuery-File-Upload
+License: Expat
+
 Files: underlays/attachment/ikiwiki/jquery-ui*
 Copyright: © 2008 Paul Bakaus
            © 2011 the jQuery UI Authors (http://jqueryui.com/about)
@@ -242,12 +231,9 @@ Files: underlays/attachment/ikiwiki/jquery.tmpl*
 Copyright: © Boris Moore
 License: GPL-2
 
-Files: underlays/attachment/ikiwiki/*
-Copyright: 2010, 2011 Sebastian Tschan
-Comment:
- blueimp / jQuery-File-Upload widget,
- from https://github.com/blueimp/jQuery-File-Upload
-License: Expat
+Files: themes/blueview/*
+Copyright: © 2009,2010 Bernd Zeimetz
+License: GPL-2+
 
 Files: themes/blueview/style.css
 Copyright: © 2009,2010 Bernd Zeimetz
@@ -257,10 +243,6 @@ Comment:
  http://developer.yahoo.com/yui/license.html
 License: GPL-2+
 
-Files: themes/blueview/*
-Copyright: © 2009,2010 Bernd Zeimetz
-License: GPL-2+
-
 Files: themes/goldtype/*
 Copyright: © Lars Wirzenius
 License: GPL-2+