From: Sage Weil <sage@redhat.com>
Date: Wed, 6 Jun 2018 21:28:59 +0000 (-0500)
Subject: debian/copyright: sync with COPYING
X-Git-Tag: v15.1.0~2486^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a0f96165d9b01ce94463a6af4a020a0c64171162;p=ceph.git

debian/copyright: sync with COPYING

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/debian/copyright b/debian/copyright
index afb188d53421..02bb95c57cfb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Source: http://ceph.com/
 
 Files: *
 Copyright: (c) 2004-2010 by Sage Weil <sage@newdream.net>
-License: LGPL2.1 (see COPYING-LGPL2.1)
+License: LGPL-2.1 (see COPYING-LGPL2.1)
 
 Files: cmake/modules/FindLTTngUST.cmake
 Copyright:
@@ -17,9 +17,12 @@ Files: doc/*
 Copyright: (c) 2010-2012 New Dream Network and contributors
 License: Creative Commons Attribution Share Alike 3.0 (CC-BY-SA-3.0)
 
+Files: bin/git-archive-all.sh
+License: GPL3
+
 Files: src/mount/canonicalize.c
 Copyright: Copyright (C) 1993 Rick Sladkey <jrs@world.std.com>
-License: LGPL2 or later (see COPYING-GPL2)
+License: LGPL-2 or later
 
 Files: src/os/btrfs_ioctl.h
 Copyright: Copyright (C) 2007 Oracle.  All rights reserved.
@@ -30,7 +33,7 @@ Copyright: None
 License: Public domain
 
 Files: src/common/bloom_filter.hpp
-Copyright: Copyright (C) 2000 Arash Partow
+Copyright: Copyright (C) 2000 Arash Partow <arash@partow.net>
 License: Boost Software License, Version 1.0
 
 Files: src/common/crc32c_intel*:
@@ -98,11 +101,9 @@ License:
   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
   OTHER DEALINGS IN THE SOFTWARE.
 
-
-
 Files: src/test/common/Throttle.cc src/test/filestore/chain_xattr.cc
 Copyright: Copyright (C) 2013 Cloudwatt <libre.licensing@cloudwatt.com>
-License: LGPL2.1 or later
+License: LGPL-2.1 or later
 
 Files: src/osd/ErasureCodePluginJerasure/*.{c,h}
 Copyright: Copyright (c) 2011, James S. Plank <plank@cs.utk.edu>
@@ -147,3 +148,17 @@ Copyright:
   (c) 2011 Facebook
 License:
   The MIT License
+
+File: qa/workunits/erasure-code/jquery.js
+  Copyright 2012 jQuery Foundation and other contributors
+  Released under the MIT license
+  http://jquery.org/license
+
+Files: qa/workunits/erasure-code/jquery.{flot.categories,flot}.js
+  Copyright (c) 2007-2014 IOLA and Ole Laursen.
+  Licensed under the MIT license.
+
+Files: src/include/timegm.h
+  Copyright (C) Copyright Howard Hinnant
+  Copyright (C) Copyright 2010-2011 Vicente J. Botet Escriba
+  License: Boost Software License, Version 1.0