[PATCH weston v2] (multiple): Use standard permission notice

Tue Feb 7 13:56:23 UTC 2017

On Mon, 23 Jan 2017 06:17:44 -0800
Yong Bakos <junk at humanoriented.com> wrote:

> From: Yong Bakos <ybakos at humanoriented.com>
> 
> A handful of source files were not using the MIT Expat text in
> COPYING. Update these files to bring them inline with the rest,
> standardizing on the MIT Expat text.
> 
> Signed-off-by: Yong Bakos <ybakos at humanoriented.com>
> ---
> 
> v2: Add commit message prefix.
> 
>  clients/simple-dmabuf-intel.c      | 35 +++++++++++++++++++----------------
>  clients/simple-dmabuf-v4l.c        | 35 +++++++++++++++++++----------------
>  libweston/launcher-direct.c        | 35 +++++++++++++++++++----------------
>  libweston/launcher-impl.h          | 35 +++++++++++++++++++----------------
>  libweston/launcher-weston-launch.c | 37 ++++++++++++++++++++-----------------
>  libweston/linux-dmabuf.c           | 35 +++++++++++++++++++----------------
>  libweston/linux-dmabuf.h           | 35 +++++++++++++++++++----------------
>  7 files changed, 134 insertions(+), 113 deletions(-)

Hi Yong,

for some reason I cannot seem to be able to apply this:

git am -3 wayland-devel/31977
-----------------------------------------------------------------------
Applying: (multiple): Use standard permission notice
Using index info to reconstruct a base tree...
error: patch failed: libweston/launcher-weston-launch.c:119
error: libweston/launcher-weston-launch.c: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Patch failed at 0001 (multiple): Use standard permission notice
The copy of the patch that failed is found in: .git/rebase-apply/patch

> 
> diff --git a/clients/simple-dmabuf-intel.c b/clients/simple-dmabuf-intel.c
> index ec5f1cb..67850b0 100644
> --- a/clients/simple-dmabuf-intel.c
> +++ b/clients/simple-dmabuf-intel.c
> @@ -3,23 +3,26 @@
>   * Copyright © 2010 Intel Corporation
>   * Copyright © 2014 Collabora Ltd.
>   *
> - * Permission to use, copy, modify, distribute, and sell this software and its
> - * documentation for any purpose is hereby granted without fee, provided that
> - * the above copyright notice appear in all copies and that both that copyright
> - * notice and this permission notice appear in supporting documentation, and
> - * that the name of the copyright holders not be used in advertising or
> - * publicity pertaining to distribution of the software without specific,
> - * written prior permission.  The copyright holders make no representations
> - * about the suitability of this software for any purpose.  It is provided "as
> - * is" without express or implied warranty.
> + * Permission is hereby granted, free of charge, to any person obtaining
> + * a copy of this software and associated documentation files (the
> + * "Software"), to deal in the Software without restriction, including
> + * without limitation the rights to use, copy, modify, merge, publish,
> + * distribute, sublicense, and/or sell copies of the Software, and to
> + * permit persons to whom the Software is furnished to do so, subject to
> + * the following conditions:
>   *
> - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
> - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
> - * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
> - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
> - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
> - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
> - * OF THIS SOFTWARE.
> + * The above copyright notice and this permission notice (including the
> + * next paragraph) shall be included in all copies or substantial
> + * portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
> + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
> + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
> + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> + * SOFTWARE.
>   */

I confirm that both the old and new license texts match the change made
in f27a48e1c4f661297c8ea9784b51562112c62a0a "COPYING: Update to MIT
Expat License rather than MIT X License".

> 
>  #include "config.h"
> diff --git a/clients/simple-dmabuf-v4l.c b/clients/simple-dmabuf-v4l.c
> index af25d0e..b49d62f 100644
> --- a/clients/simple-dmabuf-v4l.c
> +++ b/clients/simple-dmabuf-v4l.c
> @@ -1,23 +1,26 @@
>  /*
>   * Copyright © 2015 Collabora Ltd.

> diff --git a/libweston/launcher-direct.c b/libweston/launcher-direct.c
> index 29d9c28..9392f86 100644
> --- a/libweston/launcher-direct.c
> +++ b/libweston/launcher-direct.c
> @@ -2,23 +2,26 @@
>   * Copyright © 2012 Benjamin Franzke
>   * Copyright © 2013 Intel Corporation
>   *

> diff --git a/libweston/launcher-impl.h b/libweston/launcher-impl.h
> index 742721b..1b51b22 100644
> --- a/libweston/launcher-impl.h
> +++ b/libweston/launcher-impl.h
> @@ -1,23 +1,26 @@
>  /*
>   * Copyright © 2015 Jasper St. Pierre
>   *

> diff --git a/libweston/launcher-weston-launch.c b/libweston/launcher-weston-launch.c
> index f3e3a24..ebba69b 100644
> --- a/libweston/launcher-weston-launch.c
> +++ b/libweston/launcher-weston-launch.c
> @@ -2,23 +2,26 @@
>   * Copyright © 2012 Benjamin Franzke
>   * Copyright © 2013 Intel Corporation
>   *

> diff --git a/libweston/linux-dmabuf.c b/libweston/linux-dmabuf.c
> index 7b29f08..c1627d6 100644
> --- a/libweston/linux-dmabuf.c
> +++ b/libweston/linux-dmabuf.c
> @@ -1,23 +1,26 @@
>  /*
>   * Copyright © 2014, 2015 Collabora, Ltd.
>   *

> diff --git a/libweston/linux-dmabuf.h b/libweston/linux-dmabuf.h
> index cd30f91..64f43e5 100644
> --- a/libweston/linux-dmabuf.h
> +++ b/libweston/linux-dmabuf.h
> @@ -1,23 +1,26 @@
>  /*
>   * Copyright © 2014, 2015 Collabora, Ltd.
>   *

Acked-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

I believe all the Collabora copyrighted code is ok for the change, and
I would not expect anyone of the other copyright holders to complain
since we already did the same fix in 2015, and IIRC it wasn't necessary
then to ask all copyright holders. There is no record of copyright
holders acking any of the patches anyway.

Thanks,
pq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 801 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/wayland-devel/attachments/20170207/4e7e14cf/attachment.sig>