[Pkg-ceph-commits] [ceph] 03/04: upstream copyright update

[Dmitry Smirnov]

This is an automated email from the git hooks/post-receive script.

onlyjob pushed a commit to branch experimental
in repository ceph.

commit 314f2ee
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Tue Mar 25 18:56:48 2014

    upstream copyright update
---
 debian/copyright | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 101bf2d..064e3f6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,13 +5,18 @@ Source: http://ceph.com/
 
 Files: *
 Copyright: 2004-2013 Sage Weil <sage at newdream.net>
-           2013-2014 Inktank <info at inktank.com>
+           2004-2014 Inktank <info at inktank.com>
                      Inktank, Inc
                      Inktank Storage, Inc.
            2013-2014 Cloudwatt <libre.licensing at cloudwatt.com>
-           2011-2012 New Dream Network
+           2004-2011 Dreamhost
+           2013      eNovance SAS <licensing at enovance.com>
+           2012      Florian Haas, hastexo
+           2010      Greg Farnum <gregf at hq.newdream.net>
+           2004-2012 New Dream Network
            2011      Stanislav Sedov <stas at FreeBSD.org>
-           2013      UnitedStack <haomai at unitedstack.com
+           2013      UnitedStack <haomai at unitedstack.com>
+           2011      Wido den Hollander <wido at widodh.nl>
 License: LGPL-2.1
 
 Files: src/erasure-code/jerasure/vectorop.h
@@ -244,6 +249,44 @@ Files: src/json_spirit/*
 Copyright: 2007-2011, John W. Wilkinson
 License: Expat
 
+Files: src/java/native/ScopedLocalRef.h
+       src/java/native/JniConstants.*
+Copyright: 2010 The Android Open Source Project
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+      http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ The complete text of the Apache License, Version 2.0
+ can be found in "/usr/share/common-licenses/Apache-2.0".
+
+Files: src/libs3/*
+Copyright: 2008 Bryan Ischo <bryan at ischo.com>
+License: GPL-3/OpenSSL
+ libs3 is free software: you can redistribute it and/or modify it under the
+ terms of the GNU General Public License as published by the Free Software
+ Foundation, version 3 of the License.
+ .
+ In addition, as a special exception, the copyright holders give
+ permission to link the code of this library and its programs with the
+ OpenSSL library, and distribute linked combinations including the two.
+ .
+ libs3 is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ The complete text of the GNU General Public License version 3
+ can be found in "/usr/share/common-licenses/GPL-3' file.
+
 Files: debian/*
 Copyright: 2010      Sage Weil <sage at newdream.net>
            2010      Canonical, Ltd.

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-ceph/ceph.git