d/copyright: re-order to put more specific stanzas later, to get the intended interpretation

master
Simon McVittie 2017-01-10 11:26:46 +00:00
parent 93429ca11d
commit ce29e7ec66
2 changed files with 12 additions and 10 deletions

2
debian/changelog vendored
View File

@ -26,6 +26,8 @@ ikiwiki (3.20170109) UNRELEASED; urgency=medium
* news: use Debian security tracker instead of MITRE for security * news: use Debian security tracker instead of MITRE for security
references. Thanks, anarcat references. Thanks, anarcat
* Set package format to 3.0 (native) * Set package format to 3.0 (native)
* d/copyright: re-order to put more specific stanzas later, to get the
intended interpretation
-- Simon McVittie <smcv@debian.org> Mon, 09 Jan 2017 14:33:19 +0000 -- Simon McVittie <smcv@debian.org> Mon, 09 Jan 2017 14:33:19 +0000

20
debian/copyright vendored
View File

@ -233,6 +233,13 @@ Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer
© 2011 The Dojo Foundation © 2011 The Dojo Foundation
License: GPL-2 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* Files: underlays/attachment/ikiwiki/jquery-ui*
Copyright: © 2008 Paul Bakaus Copyright: © 2008 Paul Bakaus
© 2011 the jQuery UI Authors (http://jqueryui.com/about) © 2011 the jQuery UI Authors (http://jqueryui.com/about)
@ -242,12 +249,9 @@ Files: underlays/attachment/ikiwiki/jquery.tmpl*
Copyright: © Boris Moore Copyright: © Boris Moore
License: GPL-2 License: GPL-2
Files: underlays/attachment/ikiwiki/* Files: themes/blueview/*
Copyright: 2010, 2011 Sebastian Tschan Copyright: © 2009,2010 Bernd Zeimetz
Comment: License: GPL-2+
blueimp / jQuery-File-Upload widget,
from https://github.com/blueimp/jQuery-File-Upload
License: Expat
Files: themes/blueview/style.css Files: themes/blueview/style.css
Copyright: © 2009,2010 Bernd Zeimetz Copyright: © 2009,2010 Bernd Zeimetz
@ -257,10 +261,6 @@ Comment:
http://developer.yahoo.com/yui/license.html http://developer.yahoo.com/yui/license.html
License: GPL-2+ License: GPL-2+
Files: themes/blueview/*
Copyright: © 2009,2010 Bernd Zeimetz
License: GPL-2+
Files: themes/goldtype/* Files: themes/goldtype/*
Copyright: © Lars Wirzenius Copyright: © Lars Wirzenius
License: GPL-2+ License: GPL-2+