Commit ecbcdfa3 authored by Dan Povey's avatar Dan Povey

Update COPYING notice to further clarify our conventions regarding copyright...

Update COPYING notice to further clarify our conventions regarding copyright and multiple authors; update Apache headers to point to COPYING notice.

git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@2988 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
parent 0cda946d
Update to legal notice, made Feb. 2012. We would like to clarify that we
are using a convention where multiple names in the Apache copyright headers,
for example
Update to legal notice, made Feb 2012, modified Sep 2013. We would like to
clarify that we are using a convention where multiple names in the Apache
copyright headers, for example
// Copyright 2009-2012 Yanmin Qian Arnab Ghoshal
// 2013 Vassil Panayotov
does not necessarily signify joint ownership of copyright of that file, except
in cases where all those names were present in the original release made in
March 2011-- you can use the version history to work this out, if this matters
to you. Instead, we intend that those contributors who later modified the file,
agree to release their changes under the Apache license, but do not claim to
jointly own the copyright of the original material (which would require an agreement
with the original contributors). The conventional way of signifying
this is to duplicate the Apache headers at the top of each file each time
a change is made by a different author, but this would quickly become impractical.
does not signify joint ownership of copyright of that file, except in cases
where all those names were present in the original release made in March 2011--
you can use the version history to work this out, if this matters to you.
Instead, we intend that those contributors who later modified the file, agree
to release their changes under the Apache license. The conventional way of
signifying this is to duplicate the Apache headers at the top of each file each
time a change is made by a different author, but this would quickly become
impractical.
Where the copyright header says something like:
// Copyright 2013 Johns Hopkins University (author: Daniel Povey)
it is because the individual who wrote the code was at that institution as an
employee, so the copyright is owned by the university (we have checked that the
contributions were in accordance with the open-source policies of the
institutions concerned, including getting them vetted individually where
necessary). In some cases, however, particularly early on, we just wrote the
name of the university or company concerned, without the actual author's name
in parentheses. If you see something like
// Copyright 2009-2012 Arnab Ghoshal Microsoft Corporation
it does not imply that Arnab was working for Microsoft, it is because someone
else contributed to the file while working at Microsoft (this would be Daniel
Povey, in fact, who was working at Microsoft Research at the outset of the
project). If the actual author's name in parentheses, it is just to clarify
who wrote the code; it is not supposed to signify ownership of the copyright by
that individual.
The list of authors of each file is in an essentially arbitrary order, but is
often chronological if they contributed in different years.
The original legal notice is below. Note: we are continuing to modify it by
adding the names of new contributors.
adding the names of new contributors, but at any given time, the list may
be out of date.
---
Legal Notices
......
......@@ -3,6 +3,8 @@
// Copyright 2009-2011 Microsoft Corporation; Saarland University;
// Jan Silovsky; Yanmin Qian; Johns Hopkins University (Author: Daniel Povey)
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -2,6 +2,8 @@
// Copyright 2009-2011 Microsoft Corporation
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -2,6 +2,8 @@
// Copyright 2009-2011 Microsoft Corporation; Saarland University
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -3,6 +3,8 @@
// Copyright 2009-2011 Microsoft Corporation; Saarland University;
// Jan Silovsky; Yanmin Qian
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -2,6 +2,8 @@
// Copyright 2009-2011 Microsoft Corporation
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -2,6 +2,8 @@
// Copyright 2009-2011 Microsoft Corporation
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -2,6 +2,8 @@
// Copyright 2009-2011 Microsoft Corporation; Lukas Burget; Ondrej Glembek
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -3,6 +3,8 @@
// Copyright 2009-2011 Microsoft Corporation; Ondrej Glembek; Lukas Burget;
// Saarland University
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
// base/kaldi-math-test.cc
// Copyright 2009-2011 Microsoft Corporation; Yanmin Qian; Jan Silovsky
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -3,6 +3,8 @@
// Copyright 2009-2011 Microsoft Corporation; Yanmin Qian;
// Saarland University; Jan Silovsky
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -3,6 +3,8 @@
// Copyright 2009-2011 Ondrej Glembek; Microsoft Corporation; Yanmin Qian;
// Jan Silovsky; Saarland University
//
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -3,6 +3,8 @@
// Copyright 2009-2011 Microsoft Corporation; Saarland University;
// Jan Silovsky; Yanmin Qian
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
// base/kaldi-utils.cc
// Copyright 2009-2011 Karel Vesely; Yanmin Qian; Microsoft Corporation
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -3,6 +3,8 @@
// Copyright 2009-2011 Ondrej Glembek; Microsoft Corporation;
// Saarland University; Karel Vesely; Yanmin Qian
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -2,6 +2,8 @@
// Copyright 2009-2011 Microsoft Corporation, Go-Vivace Inc.
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -3,6 +3,8 @@
// Copyright 2009-2011 Microsoft Corporation, GoVivace Inc.
// 2013 Johns Hopkins University (author: Daniel Povey)
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
// bin/add-self-loops.cc
// Copyright 2009-2011 Microsoft Corporation
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -2,6 +2,8 @@
// Copyright 2009-2011 Microsoft Corporation
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -2,6 +2,8 @@
// Copyright 2009-2011 Microsoft Corporation
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -3,6 +3,8 @@
// Copyright 2009-2012 Microsoft Corporation, Go-Vivace Inc.,
// Johns Hopkins University (author: Daniel Povey)
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -2,6 +2,8 @@
// Copyright 2009-2012 Microsoft Corporation, Karel Vesely
//
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -3,6 +3,8 @@
// Copyright 2009-2013 Microsoft Corporation
// Johns Hopkins University (Author: Daniel Povey)
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -3,6 +3,8 @@
// Copyright 2009-2013 Microsoft Corporation
// Johns Hopkins University (Author: Daniel Povey)
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -3,6 +3,8 @@
// Copyright 2009-2012 Microsoft Corporation, Karel Vesely
// 2013 Johns Hopkins University (author: Daniel Povey)
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -2,6 +2,8 @@
// Copyright 2012 Karel Vesely (Brno University of Technology)
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -2,6 +2,8 @@
//
// Copyright 2009-2011 Gilles Boulianne.
//
// See ../../COPYING for clarification regarding multiple authors
//
// 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
......
......@@ -3,6 +3,8 @@
// Copyright 2013 Carnegie Mellon University (Author: Yajie Miao)
// Johns Hopkins University (Author: Daniel Povey)
// See ../../COPYING for clarification regarding multiple authors