summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas D Steeves <nsteeves@gmail.com>2017-09-17 18:01:14 -0400
committerDimitri John Ledkov <xnox@ubuntu.com>2017-10-18 14:07:10 +0100
commita8f074711ecc157ec8968fa47252af89ede1bb15 (patch)
tree37b31f450149394526e3cd28a653665c4a397478
parentd2111daa89a4bd6c79f024203677e9dc5855e496 (diff)
Add copyright for tests/sha.h tests/sha224-256.c tests/sha-private.h
For the discussion with debian-legal, consult the following thread: https://lists.debian.org/debian-legal/2017/08/msg00003.html
-rw-r--r--debian/changelog4
-rw-r--r--debian/copyright40
2 files changed, 44 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 9c1695c0..c4ef0056 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
btrfs-progs (4.13.3-1) unstable; urgency=medium
+ [ Dimitri John Ledkov ]
* New upstream release.
* Add breaks against incompatible btrbk. Closes: #872836
+ [ Nicholas D Steeves ]
+ * Add copyright for tests/sha.h tests/sha224-256.c tests/sha-private.h
+
-- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 18 Oct 2017 13:15:37 +0100
btrfs-progs (4.12-1) unstable; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index a569c389..318e967c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,6 +19,10 @@ Copyright: 2007-2009 Oracle <http://www.oracle.com/>
2001 Christoph Hellwig
License: GPL-2
+Files: tests/sha.h tests/sha224-256.c tests/sha-private.h
+Copyright: 2011 IETF Trust
+License: TLP-4
+
Files: debian/*
Copyright: 2007-2013 Daniel Baumann <daniel.baumann@progress-technologies.net>
2013 <luk@debian.org>
@@ -57,3 +61,39 @@ License: GPL-2
.
The complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-2 file.
+
+License: TLP-4
+ Copyright (c) 2011 IETF Trust and the persons identified as
+ authors of the code. All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or
+ without modification, are permitted provided that the following
+ conditions are met:
+ .
+ - Redistributions of source code must retain the above
+ copyright notice, this list of conditions and
+ the following disclaimer.
+ .
+ - Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ .
+ - Neither the name of Internet Society, IETF or IETF Trust, nor
+ the names of specific contributors, may be used to endorse or
+ promote products derived from this software without specific
+ prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.