Hi Sylvestre,

On Sat, Oct 14, 2017 at 08:42:19AM +0200, Sylvestre Ledru wrote:
>    Hello,
> 
>    Le 14/10/2017 à 05:16, Nicholas D Steeves a écrit :
> 
>  I would submit a patch, but I'm sure what conventions the LLVM/Clang team 
> follow.
> 
>    We don't really have a convention for this. So, feel free to submit a
>    patch with what you think is the best!

Patches attached.  I broke them up into multiple commits in case you
wanted to reject by patch instead of by hunk.  Feel free to squash
them if you prefer fewer commits.

See commit messages for more info.  My method was:

Update from ./LICENSE.txt
Update from ./clang-tools-extra/CODE_OWNERS.TXT
For files that don't have date ranges in the header, get this info
from git history.

My assumption was that clang-tools-extra is joint copyright between
"University of Illinois at Urbana-Champaign" and those named in
CODE_OWNERS.TXT.  If I'm wrong about this I'd be happy to remove those
three lines from 0004-Add-copyright-for-clang-tools-extra.patch.
Alternatively, feel free to fixup the patch.

Sincerely,
Nicholas
From 8ea289a51284356f7652ad7ffb1001d4982eb3e3 Mon Sep 17 00:00:00 2001
From: Nicholas D Steeves <nstee...@gmail.com>
Date: Tue, 17 Oct 2017 14:44:53 -0400
Subject: [PATCH 1/4] Update U-OF-I-BSD-LIKE years from ./LICENSE.TXT

---
 debian/copyright | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index a50dd550..b6139179 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -370,7 +370,7 @@ License: U-OF-I-BSD-LIKE
  University of Illinois/NCSA
  Open Source License
  .
- Copyright (c) 2003-2013 University of Illinois at Urbana-Champaign.
+ Copyright (c) 2003-2017 University of Illinois at Urbana-Champaign.
  All rights reserved.
  .
  Developed by:
-- 
2.11.0

Attachment: 0001-Update-U-OF-I-BSD-LIKE-years-from-.-LICENSE.TXT.patch.sig
Description: PGP signature

From 6c1dbddb60a7edcfd819d6c1e5a4733b06baf5d8 Mon Sep 17 00:00:00 2001
From: Nicholas D Steeves <nstee...@gmail.com>
Date: Tue, 17 Oct 2017 14:55:28 -0400
Subject: [PATCH 2/4] Add copyright for md5 contributions from ./LICENSE.txt

---
 debian/copyright | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/debian/copyright b/debian/copyright
index b6139179..70ccf153 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -132,6 +132,21 @@ Copyright: 1992, 1993, 1994 Henry Spencer
            1992, 1993, 1994 The Regents of the University of California
 License: BSD-3-clause
 
+Files: lib/Support/MD5.cpp llvm/include/llvm/Support/MD5.h
+Copyright: 2001 Alexander Peslyak aka Solar Designer <solar at openwall.com>
+License: solar-public-domain
+ This software was written by Alexander Peslyak in 2001.  No copyright is
+ claimed, and the software is hereby placed in the public domain.
+ In case this attempt to disclaim copyright and place the software in the
+ public domain is deemed null and void, then the software is
+ Copyright (c) 2001 Alexander Peslyak and it is hereby released to the
+ general public under the following terms:
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted.
+ .
+ * There's ABSOLUTELY NO WARRANTY, express or implied.
+
 Files: lib/Target/ARM/*
 Copyright: ARM Limited
 License: ARM
-- 
2.11.0

Attachment: 0002-Add-copyright-for-md5-contributions-from-.-LICENSE.t.patch.sig
Description: PGP signature

From 6b3defc1b83c4663bfa636b28cf1314a868125e6 Mon Sep 17 00:00:00 2001
From: Nicholas D Steeves <nstee...@gmail.com>
Date: Tue, 17 Oct 2017 17:19:47 -0400
Subject: [PATCH 3/4] Update Copyright years for Files: * from ./LICENSE.TXT

---
 debian/copyright | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index 70ccf153..f5b3185d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: LLVM/Clang
 Source: http://llvm.org/releases/download.html
 
 Files: *
-Copyright: 2003-2007 University of Illinois at Urbana-Champaign.
+Copyright: 2003-2017 University of Illinois at Urbana-Champaign.
 License: U-OF-I-BSD-LIKE
 
 Files: */install-sh
-- 
2.11.0

Attachment: 0003-Update-Copyright-years-for-Files-from-.-LICENSE.TXT.patch.sig
Description: PGP signature

From b20d80da15d29337c13a59f66331c6cfb9472e6f Mon Sep 17 00:00:00 2001
From: Nicholas D Steeves <nstee...@gmail.com>
Date: Tue, 17 Oct 2017 17:21:12 -0400
Subject: [PATCH 4/4] Add copyright for clang-tools-extra

Copyright info taken from ./clang-tools-extra/CODE_OWNERS.TXT
Date range taken from git history of:
https://github.com/llvm-mirror/clang-tools-extra.git

Note: CODE_OWNERS.TXT states that clang-rename is copyright Manual
Klimek, but clang-rename seems to have been moved from
clang-tools-extra/clang-rename to clang/tools/clang-rename
---
 debian/copyright | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/debian/copyright b/debian/copyright
index f5b3185d..c52a66f3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -100,6 +100,21 @@ Files: clang/lib/Headers/tgmath.h
 Copyright: 2009 Howard Hinnant
 License: Expat
 
+Files: clang-tools-extra/*
+Copyright: 2012-2017 University of Illinois at Urbana-Champaign.
+           2012-2017 Manuel Klimek <kli...@google.com>
+License: U-OF-I-BSD-LIKE
+
+Files: clang-tools-extra/clang-query/*
+Copyright: 2013-2017 University of Illinois at Urbana-Champaign.
+           2013-2017 Peter Collingbourne <pe...@pcc.me.uk>
+License: U-OF-I-BSD-LIKE
+
+Files: clang-tools-extra/clang-tidy/*
+Copyright: 2013-2017 University of Illinois at Urbana-Champaign.
+           2013-2017 Alexander Kornienko <ale...@google.com>
+License: U-OF-I-BSD-LIKE
+
 Files: compiler-rt/*
 Copyright: 2009-2013 Craig van Vliet
            2009-2013 Edward O'Callaghan
-- 
2.11.0

Attachment: 0004-Add-copyright-for-clang-tools-extra.patch.sig
Description: PGP signature

Attachment: signature.asc
Description: PGP signature

Reply via email to