From 80d6de097c0b85d354b57bcf1e2c3d46f08ec728 Mon Sep 17 00:00:00 2001 From: Johannes Löthberg Date: Sat, 6 Dec 2014 17:56:36 +0100 Subject: Relicense under GPL2 only Also add missing license headers to missing files. --- res/PKGBUILD | 2 +- src/config.h.in | 17 +++++++++++++++++ src/utils.c | 17 +++++++++++++++++ src/utils.h | 17 +++++++++++++++++ src/yawa.c | 18 +++++++++--------- src/yawa.h | 17 +++++++++++++++++ 6 files changed, 78 insertions(+), 10 deletions(-) diff --git a/res/PKGBUILD b/res/PKGBUILD index 2d38337..5f62fd2 100644 --- a/res/PKGBUILD +++ b/res/PKGBUILD @@ -5,7 +5,7 @@ pkgrel=1 pkgdesc='A tool which allows you to compose wallpapers for X.' url='http://git.kyriasis.com/kyrias/yawa/about/' arch=('i686' 'x86_64') -license=('GPL') +license=('GPL2') depends=('imlib2' 'libx11' 'libbsd') makedepends=('git' 'python-sphinx') diff --git a/src/config.h.in b/src/config.h.in index 6d0e598..806faab 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -1,5 +1,22 @@ #ifndef CONFIG_H #define CONFIG_H +/* + * yawa - Yet Another Wallpaper Application + * Copyright (C) 2014, The YAWA Developers + * + * This file is part of yawa. yawa 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, version 2. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + #define PACKAGE_NAME "@PACKAGE_NAME@" #define PACKAGE_VERSION "@PACKAGE_VERSION@" diff --git a/src/utils.c b/src/utils.c index 5bfbf5a..ede541e 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,3 +1,20 @@ +/* + * yawa - Yet Another Wallpaper Application + * Copyright (C) 2014, The YAWA Developers + * + * This file is part of yawa. yawa 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, version 2. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + #define _GNU_SOURCE #include #include diff --git a/src/utils.h b/src/utils.h index eb0fb40..202db06 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,5 +1,22 @@ #ifndef UTILS_H #define UTILS_H +/* + * yawa - Yet Another Wallpaper Application + * Copyright (C) 2014, The YAWA Developers + * + * This file is part of yawa. yawa 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, version 2. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + #include /// Prototypes diff --git a/src/yawa.c b/src/yawa.c index 372a0fa..ac52c00 100644 --- a/src/yawa.c +++ b/src/yawa.c @@ -1,16 +1,16 @@ /* + * yawa - Yet Another Wallpaper Application * Copyright (C) 2003, Hyriand - * Copyright (C) 2014, Johannes Löthberg + * Copyright (C) 2014, The YAWA Developers * - * This program 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. + * This file is part of yawa. yawa 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, version 2. * - * This program 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. + * This program 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. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . diff --git a/src/yawa.h b/src/yawa.h index 612c0e4..ef426d0 100644 --- a/src/yawa.h +++ b/src/yawa.h @@ -1,5 +1,22 @@ #ifndef YAWA_H #define YAWA_H +/* + * yawa - Yet Another Wallpaper Application + * Copyright (C) 2014, The YAWA Developers + * + * This file is part of yawa. yawa 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, version 2. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + #include #include -- cgit v1.2.3-70-g09d2