summaryrefslogtreecommitdiffstats
path: root/debian/copyright
diff options
context:
space:
mode:
authorJames Page <james.page@ubuntu.com>2017-07-04 18:37:23 +0200
committerJames Page <james.page@ubuntu.com>2017-07-04 18:38:39 +0200
commit1341de99a09425a005fdf7e664c530f2bae30d0e (patch)
tree421d2e5af30e7d08a001e18e89b921e271b10a90 /debian/copyright
parentMerge pull request #15305 from wjwithagen/wip-wjw-HAVE_BABELTRACE (diff)
downloadceph-1341de99a09425a005fdf7e664c530f2bae30d0e.tar.xz
ceph-1341de99a09425a005fdf7e664c530f2bae30d0e.zip
debian: wrap-and-sort all files
'wrap-and-sort -a -t' debian folder to apply consistent ordering/formatting to all files. This makes synchronization of debian package changes between Ceph packages and Ubuntu packages easier to manage. Signed-off-by: James Page <james.page@ubuntu.com>
Diffstat (limited to 'debian/copyright')
-rw-r--r--debian/copyright18
1 files changed, 9 insertions, 9 deletions
diff --git a/debian/copyright b/debian/copyright
index 362ae78f291..994d676073a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -38,25 +38,25 @@ Copyright:
Copyright 2012-2013 Intel Corporation All Rights Reserved.
License: BSD 3-clause
-Files: src/common/sctp_crc32.c:
+Files: src/common/sctp_crc32.c:
Copyright:
Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
Copyright (c) 2004-2006 Intel Corporation - All Rights Reserved
License:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
-
+
a) Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
-
+
b) 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.
-
+
c) Neither the name of Cisco Systems, Inc. nor the names of its
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
@@ -110,19 +110,19 @@ License:
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 the University of Tennessee nor the names of its
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