From 0e16b63aafea8475a35447f94e2d79b1601f02c5 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 20 Sep 2014 14:00:19 +0000 Subject: add exception for non GPL GStreamer Plugins to License diff --git a/LICENSE b/LICENSE index c73bd4a..524a84a 100644 --- a/LICENSE +++ b/LICENSE @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/debian/copyright b/debian/copyright index 501a0ee..5478c59 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Fri, 29 May 2009 11:23:42 +0200. Upstream Author: Christian Pointner -Copyright: 2011 Christian Pointner +Copyright: 2009-2014 Christian Pointner License: @@ -21,8 +21,14 @@ License: along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + In addition, as a special exception, the copyright holders hereby + grant permission for non-GPL-compatible GStreamer plugins to be used + and distributed together with GStreamer and rharchive. + This permission goes above and beyond the permissions granted by the + GPL license rharchive is covered by. + On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-3'. -The Debian packaging is © 2009, Christian Pointner and +The Debian packaging is © 2009-2014, Christian Pointner and is licensed under the GPL, see above. diff --git a/doc/Makefile b/doc/Makefile index afb48aa..eedcb6c 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -4,7 +4,7 @@ ## The Radio Helsinki Archive Daemon ## ## -## Copyright (C) 2010-2014 Christian Pointner +## Copyright (C) 2009-2014 Christian Pointner ## ## This file is part of rharchive. ## @@ -21,6 +21,12 @@ ## You should have received a copy of the GNU General Public License ## along with rharchive. If not, see . ## +## In addition, as a special exception, the copyright holders hereby +## grant permission for non-GPL-compatible GStreamer plugins to be used +## and distributed together with GStreamer and rharchive. +## This permission goes above and beyond the permissions granted by the +## GPL license rharchive is covered by. +## VERSION=$(shell cat ../version) diff --git a/doc/rharchive.8 b/doc/rharchive.8 index 5e577df..07b0d5b 100644 --- a/doc/rharchive.8 +++ b/doc/rharchive.8 @@ -2,12 +2,12 @@ .\" Title: rharchive .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 02/04/2014 +.\" Date: 09/20/2014 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "RHARCHIVE" "8" "02/04/2014" "\ \&" "\ \&" +.TH "RHARCHIVE" "8" "09/20/2014" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -188,4 +188,4 @@ Christian Pointner Radio Helsinki Website: http://www\&.helsinki\&.at .SH "COPYING" .sp -Copyright (C) 2010\-2014 Christian Pointner\&. 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 3 of the License, or any later version\&. +Copyright (C) 2009\-2014 Christian Pointner\&. 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 3 of the License, or any later version\&. diff --git a/doc/rharchive.8.txt b/doc/rharchive.8.txt index 3c5d3f9..f2f0acc 100644 --- a/doc/rharchive.8.txt +++ b/doc/rharchive.8.txt @@ -140,7 +140,7 @@ Radio Helsinki Website: http://www.helsinki.at COPYING ------- -Copyright \(C) 2010-2014 Christian Pointner. This program is free +Copyright \(C) 2009-2014 Christian Pointner. 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 3 of the License, or any later version. diff --git a/src/Makefile b/src/Makefile index e55eb53..0634395 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,7 +4,7 @@ ## The Radio Helsinki Archive Daemon ## ## -## Copyright (C) 2010-2014 Christian Pointner +## Copyright (C) 2009-2014 Christian Pointner ## ## This file is part of rharchive. ## @@ -21,6 +21,12 @@ ## You should have received a copy of the GNU General Public License ## along with rharchive. If not, see . ## +## In addition, as a special exception, the copyright holders hereby +## grant permission for non-GPL-compatible GStreamer plugins to be used +## and distributed together with GStreamer and rharchive. +## This permission goes above and beyond the permissions granted by the +## GPL license rharchive is covered by. +## ifneq ($(MAKECMDGOALS),distclean) include include.mk diff --git a/src/configure b/src/configure index c9fcbad..e953737 100755 --- a/src/configure +++ b/src/configure @@ -5,7 +5,7 @@ # The Radio Helsinki Archive Daemon # # -# Copyright (C) 2010-2014 Christian Pointner +# Copyright (C) 2009-2014 Christian Pointner # # This file is part of rharchive. # @@ -22,6 +22,12 @@ # You should have received a copy of the GNU General Public License # along with rharchive. If not, see . # +# In addition, as a special exception, the copyright holders hereby +# grant permission for non-GPL-compatible GStreamer plugins to be used +# and distributed together with GStreamer and rharchive. +# This permission goes above and beyond the permissions granted by the +# GPL license rharchive is covered by. +# set -e diff --git a/src/daemon.h b/src/daemon.h index 291e837..ee95042 100644 --- a/src/daemon.h +++ b/src/daemon.h @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #ifndef RHARCHIVE_daemon_h_INCLUDED diff --git a/src/datatypes.h b/src/datatypes.h index 500cd00..9a1bd67 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #ifndef RHARCHIVE_datatypes_h_INCLUDED diff --git a/src/file_list.c b/src/file_list.c index cd7e697..a8b3f7a 100644 --- a/src/file_list.c +++ b/src/file_list.c @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #define _GNU_SOURCE diff --git a/src/file_list.h b/src/file_list.h index 45be1cf..322178a 100644 --- a/src/file_list.h +++ b/src/file_list.h @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #ifndef RHARCHIVE_file_list_h_INCLUDED diff --git a/src/log.c b/src/log.c index 8f6c8da..ef8755f 100644 --- a/src/log.c +++ b/src/log.c @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #include "datatypes.h" diff --git a/src/log.h b/src/log.h index 77db260..bf6bb31 100644 --- a/src/log.h +++ b/src/log.h @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #ifndef RHARCHIVE_log_h_INCLUDED diff --git a/src/log_targets.h b/src/log_targets.h index 5efd4c0..3bf7d27 100644 --- a/src/log_targets.h +++ b/src/log_targets.h @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #ifndef RHARCHIVE_log_targets_h_INCLUDED diff --git a/src/options.c b/src/options.c index 71015f8..6dcc580 100644 --- a/src/options.c +++ b/src/options.c @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #include "datatypes.h" diff --git a/src/options.h b/src/options.h index a529d9c..03e77a8 100644 --- a/src/options.h +++ b/src/options.h @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #ifndef RHARCHIVE_options_h_INCLUDED diff --git a/src/rharchive.c b/src/rharchive.c index 3bfca27..204b3c9 100644 --- a/src/rharchive.c +++ b/src/rharchive.c @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #include diff --git a/src/sig_handler.c b/src/sig_handler.c index 916580c..3184e00 100644 --- a/src/sig_handler.c +++ b/src/sig_handler.c @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #include "datatypes.h" diff --git a/src/sig_handler.h b/src/sig_handler.h index 180369d..cca0061 100644 --- a/src/sig_handler.h +++ b/src/sig_handler.h @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #ifndef RHARCHIVE_sig_handler_h_INCLUDED diff --git a/src/slist.c b/src/slist.c index bc9d7c3..69de868 100644 --- a/src/slist.c +++ b/src/slist.c @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #include diff --git a/src/slist.h b/src/slist.h index d25831a..9b3fbd6 100644 --- a/src/slist.h +++ b/src/slist.h @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #ifndef RHARCHIVE_slist_h_INCLUDED diff --git a/src/string_list.c b/src/string_list.c index f5de488..003dd38 100644 --- a/src/string_list.c +++ b/src/string_list.c @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #include diff --git a/src/string_list.h b/src/string_list.h index 54552b5..e5dffa2 100644 --- a/src/string_list.h +++ b/src/string_list.h @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #ifndef RHARCHIVE_string_list_h_INCLUDED diff --git a/src/sysexec.c b/src/sysexec.c index 490a3f9..e10fc3d 100644 --- a/src/sysexec.c +++ b/src/sysexec.c @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #include "datatypes.h" diff --git a/src/sysexec.h b/src/sysexec.h index 3c8908d..e0fb0f0 100644 --- a/src/sysexec.h +++ b/src/sysexec.h @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #ifndef RHARCHIVE_sysexec_h_INCLUDED diff --git a/src/writer.c b/src/writer.c index 95d12ed..b8cca53 100644 --- a/src/writer.c +++ b/src/writer.c @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #include diff --git a/src/writer.h b/src/writer.h index 9ee98a8..e9a6e3a 100644 --- a/src/writer.h +++ b/src/writer.h @@ -4,7 +4,7 @@ * The Radio Helsinki Archive Daemon * * - * Copyright (C) 2010-2014 Christian Pointner + * Copyright (C) 2009-2014 Christian Pointner * * This file is part of rharchive. * @@ -20,6 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with rharchive. If not, see . + * + * In addition, as a special exception, the copyright holders hereby + * grant permission for non-GPL-compatible GStreamer plugins to be used + * and distributed together with GStreamer and rharchive. + * This permission goes above and beyond the permissions granted by the + * GPL license rharchive is covered by. */ #ifndef RHARCHIVE_writer_h_INCLUDED -- cgit v0.10.2