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

diff --git a/debian/changelog b/debian/changelog
index 52ab91b8bc925b2fb6246359276483832d38ca7a..f4bd2a9e48e5918357162efda3d43e9c8e456143 100644 (file)
--- 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 f306a3a7e72f3f048388bfa77c41722623efe680..de153ac6a190ca5cbe22046125e1630521f7bdfb 100644 (file)
--- 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+