[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/5.0.7+dfsg-2-19-g53f1965

[David Prévot]

The following commit has been merged in the master branch:
commit d5f80ab8b5cd91a51da77227f900e970a433b13a
Author: David Prévot <taffit at debian.org>
Date:   Wed Jul 10 12:12:00 2013 -0400

    Update copyright

diff --git a/debian/copyright b/debian/copyright
index 082775c..9893e20 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,7 +17,7 @@ Copyright: 2010-2012, Frank Karlitschek <frank at owncloud.org>
            2010-2012, Marvin Thomas Rabe <mrabe at marvinrabe.de>
            2010-2012, Florian Pritz
            2010-2012, Bartek Przybylski <bart.p.pl at gmail.com>
-           2011-2012, Thomas Tanghus <thomas at tanghus.net>
+           2011-2013, Thomas Tanghus <thomas at tanghus.net>
            2011, Christopher Blum
            2011, Dominik Schmidt dev at dominik-schmidt.de
            2012-2013, Victor Dubiniuk <victor.dubiniuk at gmail.com>
@@ -25,6 +25,7 @@ Copyright: 2010-2012, Frank Karlitschek <frank at owncloud.org>
            2012, Manuel Deglado <manuel.delgado at ucr.ac.cr>
            2012, Jörn Dreyer <jfd at butonic.de>
            2012, Stefan Herbrechtsmeier <stefan at herbrechtsmeier.net>
+           2012, Bernhard Posselt <nukeawhale at gmail.com>
            2012-2013, Henrik Kjölhede <hkjolhede at gmail.com>
            2012-2013, Bjoern Schiessle <schiessle at owncloud.com>
            2012-2013, Thomas Müller <thomas.mueller at tmit.eu>
@@ -854,7 +855,8 @@ Copyright: 2006, 2008, The Android Open Source Project
 License: Apache-2.0
 
 Files: apps/files_texteditor/js/aceeditor/*
-Copyright: 2010, 2012 Ajax.org B.V.
+Copyright: 2010, 2012, 2013 Ajax.org B.V.
+           2013, Matthew Christopher Kastor-Inare III, Atropa Inc. Intl
 License: BSD-3-clause-Ajax
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
@@ -889,6 +891,12 @@ Copyright: 2009-2011, RStudio, Inc.
            2010, Initial Developer, Ajax.org B.V.
 License: AGPL-3+
 
+Files: apps/files_texteditor/js/aceeditor/theme-ambiance.js
+       apps/files_texteditor/js/aceeditor/theme-chaos.js
+Copyright: 2011 Irakli Gozalishvili
+License: Expat
+Comment: Expat license referred to as BSD license.
+
 Files: apps/files_videoviewer/js/*
        apps/files_videoviewer/mediaelement/*
 Copyright: 2010-2013, John Dyer (http://j.hn)

-- 
owncloud.git