[ovs-dev] Debian: Add Joe Perches to debian/copyright

Tue Aug 31 18:18:10 UTC 2010

On Tue, Aug 31, 2010 at 10:39:02AM +0900, Simon Horman wrote:
> On Mon, Aug 30, 2010 at 06:18:55PM -0700, Jesse Gross wrote:
> > On Mon, Aug 30, 2010 at 6:13 PM, Simon Horman <horms at verge.net.au> wrote:
> > > This syncs debian/copyright with the AUTHORS file.
> > >
> > > Signed-off-by: Simon Horman <horms at verge.net.au>
> > 
> > Applied, thanks.  I can see the bitrotting of this list has already begun...
> 
> Yes...

How about this as a fix.  (Is debian/copyright allowed to be a generated
file?  I assume so, but I haven't ever done this before.)

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

>From 637da46f00f79334b56ea0c1c7fcca9f9ed6255f Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp at nicira.com>
Date: Tue, 31 Aug 2010 11:13:38 -0700
Subject: [PATCH] debian: Generate authorship in debian/copyright from AUTHORS.

---
 debian/.gitignore   |    1 +
 debian/automake.mk  |    2 +-
 debian/copyright    |   67 ---------------------------------------------------
 debian/copyright.in |   41 +++++++++++++++++++++++++++++++
 debian/rules        |   13 +++++++--
 5 files changed, 53 insertions(+), 71 deletions(-)
 delete mode 100644 debian/copyright
 create mode 100644 debian/copyright.in

diff --git a/debian/.gitignore b/debian/.gitignore
index 3beef44..7f43aa6 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -3,6 +3,7 @@
 *.substvars
 /control
 /corekeeper
+/copyright
 /files
 /nicira-switch
 /openvswitch
diff --git a/debian/automake.mk b/debian/automake.mk
index 5a23d46..67187a7 100644
--- a/debian/automake.mk
+++ b/debian/automake.mk
@@ -3,7 +3,7 @@ EXTRA_DIST += \
 	debian/compat \
 	debian/control \
 	debian/control.modules.in \
-	debian/copyright \
+	debian/copyright.in \
 	debian/corekeeper.cron.daily \
 	debian/corekeeper.init \
 	debian/corekeeper.override \
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 56c4f2b..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,67 +0,0 @@
-The original sources for this package can be found at:
-
-	http://openvswitch.org/
-
-
-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:
-
-* 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.
-
-  On Debian systems, the complete text of the Apache License version 2.0
-  can be found in '/usr/share/common-licenses/Apache-2.0'.
-
diff --git a/debian/copyright.in b/debian/copyright.in
new file mode 100644
index 0000000..ae1a788
--- /dev/null
+++ b/debian/copyright.in
@@ -0,0 +1,41 @@
+The original sources for this package can be found at:
+
+	http://openvswitch.org/
+
+Upstream Authors (from AUTHORS):
+
+%AUTHORS%
+
+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:
+
+* 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.
+
+  On Debian systems, the complete text of the Apache License version 2.0
+  can be found in '/usr/share/common-licenses/Apache-2.0'.
+
diff --git a/debian/rules b/debian/rules
index 49d562a..fd77c98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,7 +40,13 @@ configure-stamp:
 #Architecture 
 build: build-arch build-indep
 
-build-arch: build-arch-stamp
+debian/copyright: AUTHORS debian/copyright.in
+	{ sed -n -e '/%AUTHORS%/q' -e p < debian/copyright.in;		\
+	  sed '1,/^$$/d' AUTHORS | sed -n -e '/^$$/q' -e 's/^/	/p';	\
+	  sed -e '1,/%AUTHORS%/d' debian/copyright.in;			\
+	} > $@
+
+build-arch: build-arch-stamp debian/copyright
 build-arch-stamp: configure-stamp 
 	$(MAKE) -C _debian
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
@@ -48,8 +54,8 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 endif
 	touch $@
 
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp 
+build-indep: build-indep-stamp debian/copyright
+build-indep-stamp: configure-stamp
 	$(MAKE) -C _debian dist distdir=openvswitch
 	touch $@
 
@@ -59,6 +65,7 @@ clean:
 	rm -f build-arch-stamp build-indep-stamp configure-stamp
 	rm -rf _debian
 	[ ! -f Makefile ] || $(MAKE) distclean
+	rm -f debian/copyright
 	dh_clean 
 
 install: install-indep install-arch
-- 
1.7.1



