From a28cf44ebc90f9fb4c1943aa128dd5d25573e181 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 11 May 2017 07:29:01 +0200 Subject: cookies: change license to LGPL All authors have agreed. One minor exception is 21a9221e7bb2 (patch by someone who wasn't asked), but we just remove the added line again. It seems unneeded. --- Copyright | 2 +- stream/cookies.c | 15 +++++++-------- stream/cookies.h | 14 +++++++------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Copyright b/Copyright index 8306b423fe..466205db1e 100644 --- a/Copyright +++ b/Copyright @@ -221,7 +221,7 @@ LGPL relicensing status: stream/audio_in.* will stay GPL (TV code) stream/cache.c LGPL 3+ stream/cache_file.c LGPL - stream/cookies.* unknown + stream/cookies.* LGPL stream/dvb* must stay GPL stream/frequencies.* must stay GPL stream/rar.* LGPL diff --git a/stream/cookies.c b/stream/cookies.c index ce2d4ed503..d1c6e6d488 100644 --- a/stream/cookies.c +++ b/stream/cookies.c @@ -6,18 +6,18 @@ * * This file is part of mpv. * - * mpv 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. + * mpv is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * mpv is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License along - * with mpv. If not, see . + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see . */ #include @@ -28,7 +28,6 @@ #include #include #include -#include #include "osdep/io.h" diff --git a/stream/cookies.h b/stream/cookies.h index 7c4d6414b4..6acd0c3ba3 100644 --- a/stream/cookies.h +++ b/stream/cookies.h @@ -6,18 +6,18 @@ * * This file is part of mpv. * - * mpv 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. + * mpv is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * mpv is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License along - * with mpv. If not, see . + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see . */ #ifndef MPLAYER_COOKIES_H -- cgit v1.2.3