[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.8debian-1.6-48-g83c14ba

[David Prévot]

The following commit has been merged in the master branch:
commit 261c87c2fcccc7e2779d5e533362a1453e7029cb
Author: David Prévot <taffit at debian.org>
Date:   Mon Mar 25 16:57:27 2013 -0400

    Partially document messy licences, see: #692627

diff --git a/debian/copyright b/debian/copyright
index 9aa9cc6..f823e44 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -849,6 +849,29 @@ Files: apps/files_texteditor/js/aceeditor/*
 Copyright: 2010, Initial Developer, Ajax.org B.V.
 License: MPL-1.1 or GPL-2+ or LGPL-3
 
+Files: apps/files_texteditor/js/aceeditor/worker-javascript.js
+Copyright: 2009-2011, Kris Kowal
+           2009-2010, Tom Robinson
+           2010, Daniel Friesen
+           2010, Florian Schäfer
+           2010, Irakli Gozalishvili
+           2009, 280 North Inc. http://280north.com/
+           2011, Kit Cambridge
+           Sasha Koss
+           Bryan Forbes
+           2011, Quildreen Motta
+           2011, Michael Ficarra
+           2011, Gerard Paapu
+           2011, Brendan Molloy
+           iwyg
+           2011, Domenic Denicola
+           Montillet Xavier
+           2010, Sami Samhuri
+           2011, Rick Waldron
+           Alexey Zakharov
+           2004-2010, the Initial Developer
+License: Expat and XXX and BSD-3-clause and PD and (MPL-1.1 or GPL-2 or LGPL-2.1) and Evil
+
 Files: apps/files_videoviewer/js/*
        apps/files_videoviewer/mediaelement/*
 Copyright: 2010-2012, John Dyer (http://j.hn)

-- 
owncloud.git