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

Simon Horman horms at verge.net.au
Tue Aug 31 21:14:57 PDT 2010


On Tue, Aug 31, 2010 at 11:44:37AM -0700, Jesse Gross wrote:
> On Tue, Aug 31, 2010 at 11:18 AM, Ben Pfaff <blp at nicira.com> wrote:
> > 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.)
> 
> If it is acceptable to the Debian people, I like this a lot better.

I agree that this would be a lot better.

I checked the policy manual and the requirements seem to be that
a) /usr/share/doc/package/copyright exists in each binary package and
b)  debian/copyright exists in the source package

[1] http://www.debian.org/doc/debian-policy/ch-docs.html#s-copyrightfile

In order to satisfy b) I think that it would be desirable
for debian/copyright to exist in the distribution tarball.

It might be easiest to teach configure how to convert copyright.in
into copyright, but I'm not entirely sure how to do that.
So instead I handled things using automake.

Index: openvswitch/debian/.gitignore
===================================================================
--- openvswitch.orig/debian/.gitignore	2010-08-31 09:17:50.000000000 +0900
+++ openvswitch/debian/.gitignore	2010-09-01 12:05:12.000000000 +0900
@@ -3,6 +3,7 @@
 *.substvars
 /control
 /corekeeper
+/copyright
 /files
 /nicira-switch
 /openvswitch
Index: openvswitch/debian/automake.mk
===================================================================
--- openvswitch.orig/debian/automake.mk	2010-08-31 09:17:50.000000000 +0900
+++ openvswitch/debian/automake.mk	2010-09-01 13:03:30.000000000 +0900
@@ -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 \
@@ -48,5 +48,24 @@ check-debian-changelog-version:
 	  echo "Update debian/changelog to mention version $(VERSION)";	   \
 	  exit 1;							   \
 	fi
-ALL_LOCAL += check-debian-changelog-version
-DIST_HOOKS += check-debian-changelog-version
+
+debian-copyright: $(srcdir)/AUTHORS $(srcdir)/debian/copyright.in
+	{ sed -n -e '/%AUTHORS%/q' -e p < $(srcdir)/debian/copyright.in;   \
+	  sed '1,/^$$/d' $(srcdir)/AUTHORS |				   \
+		sed -n -e '/^$$/q' -e 's/^/  /p';			   \
+	  sed -e '1,/%AUTHORS%/d' $(srcdir)/debian/copyright.in;	   \
+	} > $(debian_copyright)
+
+# touch before make otherwise make exits with an error that
+# debian/copyright is missing from the distribution
+$(distdir)/debian/copyright:
+	touch $@
+	debian_copyright=$@ $(MAKE) $(AM_MAKEFLAGS) debian-copyright
+
+debian/copyright:
+	debian_copyright=$@ $(MAKE) $(AM_MAKEFLAGS) debian-copyright
+
+CLEANFILES += debian/copyright
+
+ALL_LOCAL += check-debian-changelog-version debian/copyright
+DIST_HOOKS += check-debian-changelog-version $(distdir)/debian/copyright
Index: openvswitch/debian/copyright
===================================================================
--- openvswitch.orig/debian/copyright	2010-09-01 12:03:37.000000000 +0900
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +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
-	Joe Perches             joe at perches.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'.
-
Index: openvswitch/debian/copyright.in
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ openvswitch/debian/copyright.in	2010-09-01 12:05:12.000000000 +0900
@@ -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'.
+




More information about the dev mailing list