Patchwork [meta-oe,v2,2/2] gnuplot: added upstream license file and updated recipe to match

login
register
mail settings
Submitter stephen.arnold42
Date April 2, 2014, 3:47 a.m.
Message ID <1396410465-13709-2-git-send-email-stephen.arnold42@gmail.com>
Download mbox | patch
Permalink /patch/69993/
State Accepted, archived
Headers show

Comments

stephen.arnold42 - April 2, 2014, 3:47 a.m.
This fixes QA warnings about missing license file and updates the license 
type to match custom license file.

Upstream-Status: Inappropriate (distribution/packaging fix)

Signed-off-by: Stephen Arnold <stephen.arnold42@gmail.com>
---
 meta-oe/licenses/gnuplot                     | 29 ++++++++++++++++++++++++++++
 meta-oe/recipes-extended/gnuplot/gnuplot.inc |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/licenses/gnuplot
stephen.arnold42 - April 8, 2014, 1:50 a.m.
This is 2/2 as requested by Martin, et al.  Is there pending feedback, or
did I miss an email?

Thanks, Steve


On Tue, Apr 1, 2014 at 8:47 PM, Stephen Arnold
<stephen.arnold42@gmail.com>wrote:

> This fixes QA warnings about missing license file and updates the license
> type to match custom license file.
>
> Upstream-Status: Inappropriate (distribution/packaging fix)
>
> Signed-off-by: Stephen Arnold <stephen.arnold42@gmail.com>
> ---
>  meta-oe/licenses/gnuplot                     | 29
> ++++++++++++++++++++++++++++
>  meta-oe/recipes-extended/gnuplot/gnuplot.inc |  2 +-
>  2 files changed, 30 insertions(+), 1 deletion(-)
>  create mode 100644 meta-oe/licenses/gnuplot
>
> diff --git a/meta-oe/licenses/gnuplot b/meta-oe/licenses/gnuplot
> new file mode 100644
> index 0000000..ff6fe23
> --- /dev/null
> +++ b/meta-oe/licenses/gnuplot
> @@ -0,0 +1,29 @@
> +/*[
> + * Copyright 1986 - 1993, 1998, 2004   Thomas Williams, Colin Kelley
> + *
> + * Permission to use, copy, and distribute this software and its
> + * documentation for any purpose with or without fee is hereby granted,
> + * provided that the above copyright notice appear in all copies and
> + * that both that copyright notice and this permission notice appear
> + * in supporting documentation.
> + *
> + * Permission to modify the software is granted, but not the right to
> + * distribute the complete modified source code.  Modifications are to
> + * be distributed as patches to the released version.  Permission to
> + * distribute binaries produced by compiling modified sources is granted,
> + * provided you
> + *   1. distribute the corresponding source modifications from the
> + *    released version in the form of a patch file along with the
> binaries,
> + *   2. add special version identification to distinguish your version
> + *    in addition to the base release version number,
> + *   3. provide your name and address as the primary contact for the
> + *    support of your modified version, and
> + *   4. retain our contact information in regard to use of the base
> + *    software.
> + * Permission to distribute the released version of the source code along
> + * with corresponding source modifications in the form of a patch file is
> + * granted with same provisions 2 through 4 for binary distributions.
> + *
> + * This software is provided "as is" without express or implied warranty
> + * to the extent permitted by applicable law.
> +]*/
> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot.inc
> b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
> index ab3ec3f..6c27e6d 100644
> --- a/meta-oe/recipes-extended/gnuplot/gnuplot.inc
> +++ b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
> @@ -2,7 +2,7 @@ DESCRIPTION = "Gnuplot is a portable command-line driven
> interactive datafile \
>  (text or binary) and function plotting utility."
>  HOMEPAGE = "http://www.gnuplot.info/"
>  SECTION = "console/scientific"
> -LICENSE = "BSD-4"
> +LICENSE = "gnuplot"
>  LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f"
>  DEPENDS = "virtual/libx11 gd readline"
>
> --
> 1.9.1
>
>

Patch

diff --git a/meta-oe/licenses/gnuplot b/meta-oe/licenses/gnuplot
new file mode 100644
index 0000000..ff6fe23
--- /dev/null
+++ b/meta-oe/licenses/gnuplot
@@ -0,0 +1,29 @@ 
+/*[
+ * Copyright 1986 - 1993, 1998, 2004   Thomas Williams, Colin Kelley
+ *
+ * Permission to use, copy, and distribute this software and its
+ * documentation for any purpose with or without fee is hereby granted,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.
+ *
+ * Permission to modify the software is granted, but not the right to
+ * distribute the complete modified source code.  Modifications are to
+ * be distributed as patches to the released version.  Permission to
+ * distribute binaries produced by compiling modified sources is granted,
+ * provided you
+ *   1. distribute the corresponding source modifications from the
+ *    released version in the form of a patch file along with the binaries,
+ *   2. add special version identification to distinguish your version
+ *    in addition to the base release version number,
+ *   3. provide your name and address as the primary contact for the
+ *    support of your modified version, and
+ *   4. retain our contact information in regard to use of the base
+ *    software.
+ * Permission to distribute the released version of the source code along
+ * with corresponding source modifications in the form of a patch file is
+ * granted with same provisions 2 through 4 for binary distributions.
+ *
+ * This software is provided "as is" without express or implied warranty
+ * to the extent permitted by applicable law.
+]*/
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot.inc b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
index ab3ec3f..6c27e6d 100644
--- a/meta-oe/recipes-extended/gnuplot/gnuplot.inc
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
@@ -2,7 +2,7 @@  DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \
 (text or binary) and function plotting utility."
 HOMEPAGE = "http://www.gnuplot.info/"
 SECTION = "console/scientific"
-LICENSE = "BSD-4"
+LICENSE = "gnuplot"
 LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f"
 DEPENDS = "virtual/libx11 gd readline"