[ovs-dev] Debian: Add Joe Perches to debian/copyright
Simon Horman
horms at verge.net.au
Mon Sep 6 04:48:39 UTC 2010
On Wed, Sep 01, 2010 at 10:51:11AM -0700, Ben Pfaff wrote:
> On Wed, Sep 01, 2010 at 01:14:57PM +0900, Simon Horman wrote:
> > On Tue, Aug 31, 2010 at 11:44:37AM -0700, Jesse Gross wrote:
> > 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.
>
> That seems more complicated than necessary. Why the extra level of
> $(MAKE)? And why not just add $(srcdir)/debian/copyright as a target?
> It seems to work fine here. Passes "make distcheck".
Thanks, that looks good to me.
Acked-by: Simon Horman <horms at verge.net.au>
>
> --8<--------------------------cut here-------------------------->8--
>
> From: Ben Pfaff <blp at nicira.com>
> Date: Wed, 1 Sep 2010 10:50:49 -0700
> Subject: [PATCH] debian: Generate authorship in debian/copyright from AUTHORS.
>
> ---
> debian/.gitignore | 1 +
> debian/automake.mk | 10 +++++++
> debian/copyright | 68 ---------------------------------------------------
> debian/copyright.in | 41 ++++++++++++++++++++++++++++++
> 4 files changed, 52 insertions(+), 68 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..ba9ea86 100644
> --- a/debian/automake.mk
> +++ b/debian/automake.mk
> @@ -4,6 +4,7 @@ EXTRA_DIST += \
> debian/control \
> debian/control.modules.in \
> debian/copyright \
> + debian/copyright.in \
> debian/corekeeper.cron.daily \
> debian/corekeeper.init \
> debian/corekeeper.override \
> @@ -50,3 +51,12 @@ check-debian-changelog-version:
> fi
> ALL_LOCAL += check-debian-changelog-version
> DIST_HOOKS += check-debian-changelog-version
> +
> +$(srcdir)/debian/copyright: AUTHORS 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; \
> + } > $@
> +
> +DISTCLEANFILES += debian/copyright
> diff --git a/debian/copyright b/debian/copyright
> deleted file mode 100644
> index f4f4df6..0000000
> --- a/debian/copyright
> +++ /dev/null
> @@ -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'.
> -
> 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'.
> +
> --
> 1.7.1
>
>
> --
> 1.7.1
More information about the dev
mailing list