[PATCH v4] epiphany-2.30.2: unbreak build by adding ca-certificates dependencies

[PATCH v4] epiphany-2.30.2: unbreak build by adding ca-certificates dependencies

[Steffen Sledz]

Signed-off-by: Steffen Sledz <sledz@dresearch.de>
---
 recipes/gnome/epiphany_2.30.2.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes/gnome/epiphany_2.30.2.bb b/recipes/gnome/epiphany_2.30.2.bb
index 426d468..6422c74 100644
--- a/recipes/gnome/epiphany_2.30.2.bb
+++ b/recipes/gnome/epiphany_2.30.2.bb
@@ -1,7 +1,9 @@
 DESCRIPTION = "GNOME default webbrowser"
-DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
+LICENSE = "GPLv2"
+DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification ca-certificates"
 RDEPENDS_${PN} = "gnome-vfs-plugin-http iso-codes"
-PR = "r2"
+RRECOMMENDS_${PN} = "ca-certificates"
+PR = "r3"
 
 inherit gnome
 
-- 
1.7.1

Re: [PATCH v4] epiphany-2.30.2: unbreak build by adding ca-certificates dependencies

[Steffen Sledz]

Am 04.10.2010 14:09, schrieb Steffen Sledz:
> Signed-off-by: Steffen Sledz <sledz@dresearch.de>
> ---
>  recipes/gnome/epiphany_2.30.2.bb |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes/gnome/epiphany_2.30.2.bb b/recipes/gnome/epiphany_2.30.2.bb
> index 426d468..6422c74 100644
> --- a/recipes/gnome/epiphany_2.30.2.bb
> +++ b/recipes/gnome/epiphany_2.30.2.bb
> @@ -1,7 +1,9 @@
>  DESCRIPTION = "GNOME default webbrowser"
> -DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
> +LICENSE = "GPLv2"
> +DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification ca-certificates"
>  RDEPENDS_${PN} = "gnome-vfs-plugin-http iso-codes"
> -PR = "r2"
> +RRECOMMENDS_${PN} = "ca-certificates"
> +PR = "r3"
>  
>  inherit gnome
>  

Re: [PATCH v4] epiphany-2.30.2: unbreak build by adding ca-certificates dependencies

[Steffen Sledz]

Sorry, new thread because of erroneous quoting of some '$' signs in the message id. :(

Re: [PATCH v4] epiphany-2.30.2: unbreak build by adding ca-certificates dependencies

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 04-10-10 14:09, Steffen Sledz wrote:
> Signed-off-by: Steffen Sledz <sledz@dresearch.de>
> ---
>  recipes/gnome/epiphany_2.30.2.bb |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes/gnome/epiphany_2.30.2.bb b/recipes/gnome/epiphany_2.30.2.bb
> index 426d468..6422c74 100644
> --- a/recipes/gnome/epiphany_2.30.2.bb
> +++ b/recipes/gnome/epiphany_2.30.2.bb
> @@ -1,7 +1,9 @@
>  DESCRIPTION = "GNOME default webbrowser"
> -DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
> +LICENSE = "GPLv2"

To double check: is it gplv2 or gplv2+ (aka "or later"?)

Looks good otherwise, provided the license is gplv2:

Acked-by: Koen Kooi <koen@openembedded.org>

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMqdGfMkyGM64RGpERAp9FAJkBdHU2eBr4GUBevB0Bz8D3+eKPLQCffGko
WDyMet3wGhh/sZ8NA2zlODw=
=BNoS
-----END PGP SIGNATURE-----

Re: [PATCH v4] epiphany-2.30.2: unbreak build by adding ca-certificates dependencies

[Steffen Sledz]

Am 04.10.2010 15:07, schrieb Koen Kooi:
> To double check: is it gplv2 or gplv2+ (aka "or later"?)

No really sure. The source tree contains a COPYING file containing "GNU GENERAL PUBLIC LICENSE Version 2, June 1991".

So it's "GPLv2" or "GPLv2+"?

-- 
Steffen Sledz
DResearch Digital Media Systems GmbH
Otto-Schmirgal-Str.3, D-10319 Berlin, Germany
Tel: +49 (30) 515932237 mailto:sledz@DResearch.DE
Fax: +49 (30) 515932299 http://www.DResearch.DE
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 54412;
Ust.-IDNr. DE169013825; WEEE Reg.-Nr. DE 85995642

Re: [PATCH v4] epiphany-2.30.2: unbreak build by adding ca-certificates dependencies

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 04-10-10 15:16, Steffen Sledz wrote:
> Am 04.10.2010 15:07, schrieb Koen Kooi:
>> To double check: is it gplv2 or gplv2+ (aka "or later"?)
> 
> No really sure. The source tree contains a COPYING file containing "GNU GENERAL PUBLIC LICENSE Version 2, June 1991".
> 
> So it's "GPLv2" or "GPLv2+"?
> 

GPLv2, the other would say something like:

"GNU GENERAL PUBLIC LICENSE Version 2 or later"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMqeA3MkyGM64RGpERApqhAJ0T5vRudnAvMzQzyomRt+0AoJNS/QCgns1i
kryxJ06jsmpD01RsN5pQ+Tc=
=O9Uc
-----END PGP SIGNATURE-----

Re: [PATCH v4] epiphany-2.30.2: unbreak build by adding ca-certificates dependencies

[Phil Blundell]

On Mon, 2010-10-04 at 15:16 +0200, Steffen Sledz wrote:
> Am 04.10.2010 15:07, schrieb Koen Kooi:
> > To double check: is it gplv2 or gplv2+ (aka "or later"?)
> 
> No really sure. The source tree contains a COPYING file containing "GNU GENERAL PUBLIC LICENSE Version 2, June 1991".
> 
> So it's "GPLv2" or "GPLv2+"?

The COPYING file isn't what you want to be looking at, really.  That
will just be a copy of one particular version of the GPL and doesn't
necessarily mean that the package can't be distributed under other
licenses.

According to the copyright file from Debian's epiphany-browser package,
it's GPLv2+.  Specifically:

    This package is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

except that:

        The contents of the help/ directory are licensed under the GNU
        FDL
        version 1.1 and above. 

p.

Re: [PATCH v4] epiphany-2.30.2: unbreak build by adding ca-certificates dependencies

[Steffen Sledz]

Am 04.10.2010 16:32, schrieb Phil Blundell:
> On Mon, 2010-10-04 at 15:16 +0200, Steffen Sledz wrote:
>> Am 04.10.2010 15:07, schrieb Koen Kooi:
>>> To double check: is it gplv2 or gplv2+ (aka "or later"?)
>>
>> No really sure. The source tree contains a COPYING file containing "GNU GENERAL PUBLIC LICENSE Version 2, June 1991".
>>
>> So it's "GPLv2" or "GPLv2+"?
> 
> The COPYING file isn't what you want to be looking at, really.  That
> will just be a copy of one particular version of the GPL and doesn't
> necessarily mean that the package can't be distributed under other
> licenses.
> 
> According to the copyright file from Debian's epiphany-browser package,
> it's GPLv2+.  Specifically:
> ...

OK, pushed with LICENSE = "GPLv2+"

-- 
Steffen Sledz
DResearch Digital Media Systems GmbH
Otto-Schmirgal-Str.3, D-10319 Berlin, Germany
Tel: +49 (30) 515932237 mailto:sledz@DResearch.DE
Fax: +49 (30) 515932299 http://www.DResearch.DE
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 54412;
Ust.-IDNr. DE169013825; WEEE Reg.-Nr. DE 85995642