diff options
| author | Christian Pointner <equinox@helsinki.at> | 2014-09-20 14:00:19 (GMT) |
|---|---|---|
| committer | Christian Pointner <equinox@helsinki.at> | 2014-09-20 14:00:19 (GMT) |
| commit | 0e16b63aafea8475a35447f94e2d79b1601f02c5 (patch) | |
| tree | a8125b884b661f31617710a7ffebd37ce34c227e /doc | |
| parent | 5f4fceff0f892bf19a8f6176b17ea1ad2569bdf0 (diff) | |
add exception for non GPL GStreamer Plugins to License
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile | 8 | ||||
| -rw-r--r-- | doc/rharchive.8 | 6 | ||||
| -rw-r--r-- | doc/rharchive.8.txt | 2 |
3 files changed, 11 insertions, 5 deletions
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 <equinox@helsinki.at> +## Copyright (C) 2009-2014 Christian Pointner <equinox@helsinki.at> ## ## 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 <http://www.gnu.org/licenses/>. ## +## 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 <http://docbook.sf.net/> -.\" 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 <equinox@helsinki\&.at> 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. |