diff options
| author | Simon McVittie <smcv@debian.org> | 2017-01-10 11:26:46 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2017-01-10 11:26:46 +0000 |
| commit | ce29e7ec66ea99884a06e9d0e858110aaf26ca81 (patch) | |
| tree | 58dd7bd12694b0a23c0d39ebd7fd2212089ec964 /debian | |
| parent | 93429ca11da82eeac9722c00b6b9e81a5d570abb (diff) | |
| download | ikiwiki-ce29e7ec66ea99884a06e9d0e858110aaf26ca81.tar ikiwiki-ce29e7ec66ea99884a06e9d0e858110aaf26ca81.tar.gz | |
d/copyright: re-order to put more specific stanzas later, to get the intended interpretation
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/copyright | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index 52ab91b8b..f4bd2a9e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,8 @@ ikiwiki (3.20170109) UNRELEASED; urgency=medium * news: use Debian security tracker instead of MITRE for security references. Thanks, anarcat * 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 diff --git a/debian/copyright b/debian/copyright index f306a3a7e..de153ac6a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -233,6 +233,13 @@ 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 +249,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 +261,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+ |