cross-ref to new todo

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

diff --git a/debian/copyright b/debian/copyright
index d6c66b303d3cb7edd22fbc4501d159194738f6fa..a25660adfa17e54b58cc98e115b98a87969c3800 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: native package
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://ikiwiki.info/git/
 
 Files: *
 Copyright: © 2006-2011 Joey Hess <joey@ikiwiki.info>
 License: GPL-2+
 
 Files: templates/* underlays/basewiki/* doc/ikiwiki/directive/*
- ikiwiki.setup po/underlays/*
+ po/underlays/* underlays/javascript/*
 Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info>
 License: permissive
 
@@ -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
@@ -203,36 +203,18 @@ Comment:
  Based on https://code.google.com/archive/p/openid-selector/
 License: BSD-2-clause
 
-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
-
-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 +224,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 +236,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+
@@ -332,23 +307,6 @@ License: Expat
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
-License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- .
- 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
  .