[ovs-dev] [patch] Debian: make debian/copyright more friendly to the ftpmasters

Ben Pfaff blp at nicira.com
Tue Aug 24 22:17:31 UTC 2010


On Tue, Aug 24, 2010 at 09:54:58AM +0900, Simon Horman wrote:
> On Mon, Aug 23, 2010 at 10:17:02AM -0700, Ben Pfaff wrote:
> > On Mon, Aug 23, 2010 at 06:34:36PM +0900, Simon Horman wrote:
> > > Signed-off-by: Simon Horman <horms at verge.net.au>
> > 
> > Thank you.  It looks about right, but I think that we need to
> > distinguish authors from copyright holders.  The @nicira.com email
> > addresses of authors, for example, correspond to Nicira Networks as
> > copyright holder, as opposed to the individual authors.  I'm not sure of
> > a good phrasing for this, do you have a suggestion?
> 
> Perhaps this would work?

I pushed it as follows, hope that's OK:

--8<--------------------------cut here-------------------------->8--

From: Simon Horman <horms at verge.net.au>
Date: Tue, 24 Aug 2010 09:54:58 +0900
Subject: [PATCH] Debian: make debian/copyright more friendly to the ftpmasters

Signed-off-by: Simon Horman <horms at verge.net.au>
[list of copyright holders adjusted]
Signed-off-by: Ben Pfaff <blp at nicira.com>
---
 debian/copyright |   72 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index ca2705c..56c4f2b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,21 +1,67 @@
-Upstream Authors: 
+The original sources for this package can be found at:
 
-    Nicira Networks
+	http://openvswitch.org/
 
-Copyright: 
 
-    Copyright (C) 2008 Nicira Networks.
+Upstream Authors (from AUTHORS):
+
+	Andy Southgate          andy.southgate at citrix.com
+	Ben Pfaff               blp at nicira.com
+	Bryan Phillippe         bp at toroki.com
+	Dan Wendlandt           dan at nicira.com
+	David Erickson          derickso at stanford.edu
+	Glen Gibb               grg at stanford.edu
+	Ian Campbell            Ian.Campbell at citrix.com
+	Jean Tourrilhes         jt at hpl.hp.com
+	Jeremy Stribling        strib at nicira.com
+	Jesse Gross             jesse at nicira.com
+	Jun Nakajima            jun.nakajima at intel.com
+	Justin Pettit           jpettit at nicira.com
+	Keith Amidon            keith at nicira.com
+	Martin Casado           casado at nicira.com
+	Natasha Gude            natasha at nicira.com
+	Neil McKee              neil.mckee at inmon.com
+	Paul Fazzone            pfazzone at nicira.com
+	Reid Price              reid at nicira.com
+	Simon Horman            horms at verge.net.au
+	Tetsuo NAKAGAWA         nakagawa at mxc.nes.nec.co.jp
+	Thomas Lacroix          thomas.lacroix at citrix.com
+	Todd Deshane            deshantm at gmail.com
+	Tom Everman             teverman at google.com
+	Tsvi Slonim             tsvi at toroki.com
+	Wei Yongjun             yjwei at cn.fujitsu.com
+	Yu Zhiguo               yuzg at cn.fujitsu.com
+
+Upstream Copyright Holders:
+
+	Copyright (c) 2007, 2008, 2009, 2010 Nicira Networks.
+	Copyright (c) 2010 Jean Tourrilhes - HP-Labs.
+	Copyright (c) 2008,2009,2010 Citrix Systems, Inc.
+	and authors listed above.
 
 License:
 
-    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:
+* The following components are licensed under the GNU General Public Licence
+  version 2.
+
+	datapath/
+
+  On Debian systems, the complete text of the GNU General Public Licence
+  version 2 can be found in `/usr/share/common-licenses/GPL-2'
+
+* The following components are dual-licensed under the
+  GNU General Public Licence version 3 and the Apache Licence Version 2.0.
+
+	include/openvswitch/
+
+  On Debian systems, the complete text of the GNU General Public Licence
+  version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+  On Debian systems, the complete text of the Apache License version 2.0
+  can be found in '/usr/share/common-licenses/Apache-2.0'.
+
+* All other components of this package are licensed under
+  The Apache License Version 2.0.
 
-        http://www.apache.org/licenses/LICENSE-2.0
+  On Debian systems, the complete text of the Apache License version 2.0
+  can be found in '/usr/share/common-licenses/Apache-2.0'.
 
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-- 
1.7.1






More information about the dev mailing list