added gstreamer exception to License

further cleanups

16 files changed, 99 insertions, 15 deletions

diff --git a/LICENSE b/LICENSE
index b1a39dd..9f62c98 100644
--- a/LICENSE
+++ b/LICENSE
@@ -21,6 +21,12 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with gstdvbbackend. 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 gstdvbbackend.
+ *  This permission goes above and beyond the permissions granted by the
+ *  GPL license sydra is covered by.
  */
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
diff --git a/doc/Makefile b/doc/Makefile
index 3ef92f0..327ad18 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -22,6 +22,12 @@
 ##  You should have received a copy of the GNU General Public License
 ##  along with gstdvbbackend. 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 gstdvbbackend.
+##  This permission goes above and beyond the permissions granted by the
+##  GPL license sydra is covered by.
+##
 
 VERSION=$(shell cat ../version)
 
diff --git a/doc/gstdvbbackend.8 b/doc/gstdvbbackend.8
index 34ae925..a61a211 100644
--- a/doc/gstdvbbackend.8
+++ b/doc/gstdvbbackend.8
@@ -123,7 +123,7 @@ to run in debug mode\&. It implicits
 .RE
 .SH "BUGS"
 .sp
-Most likely there are some bugs in \fBgstdvbbackend\fR\&. If you find a bug, please let the developers know at equinox@helsinki\&.at\&. Of course, patches are preferred\&.
+Most likely there are some bugs in \fBgstdvbbackend\fR\&. If you find a bug, please let the developers know at equinox@spreadspace\&.org\&. Of course, patches are preferred\&.
 .SH "SEE ALSO"
 .sp
 \fBgst\-launch\fR(1)
diff --git a/doc/gstdvbbackend.8.txt b/doc/gstdvbbackend.8.txt
index 62b5307..03b0469 100644
--- a/doc/gstdvbbackend.8.txt
+++ b/doc/gstdvbbackend.8.txt
@@ -26,7 +26,7 @@ gstdvbbackend
 DESCRIPTION
 -----------
 
-*gstdvbbackend* gstdvbbackend is small program based on gstreamer. It 
+*gstdvbbackend* gstdvbbackend is small program based on gstreamer. It
 captures a given set of dvb channels from one dvb device and provides
 the streams via minimal http.
 
@@ -40,7 +40,7 @@ The following options can be passed to the *gstdvbbackend* daemon:
    instead of becoming a daemon which is the default.
 
 *-u, --username <username>*::
-   run as this user. If no group is specified (*-g*) the default group of 
+   run as this user. If no group is specified (*-g*) the default group of
    the user is used. The default is to not drop privileges.
 
 *-g, --groupname <groupname>*::
@@ -48,20 +48,20 @@ The following options can be passed to the *gstdvbbackend* daemon:
    The default is to not drop privileges.
 
 *-C, --chroot <path>*::
-   Instruct *gstdvbbackend* to run in a chroot jail. The default is 
+   Instruct *gstdvbbackend* to run in a chroot jail. The default is
    to not run in chroot.
 
 *-P, --write-pid <filename>*::
-   Instruct *gstdvbbackend* to write it's pid to this file. The default is 
+   Instruct *gstdvbbackend* to write it's pid to this file. The default is
    to not create a pid file.
 
 *-L, --log <target>:<level>[,<param1>[,<param2>[..]]]*::
    add log target to logging system. This can be invoked several times
-   in order to log to different targets at the same time. Every target 
+   in order to log to different targets at the same time. Every target
    has its own log level which is a number between 0 and 5. Where 0 means
    disabling log and 5 means debug messages are enabled. +
    The file target can be used more than once with different levels.
-   If no target is provided at the command line a single target with the 
+   If no target is provided at the command line a single target with the
    config *syslog:3,gstdvbbackend,daemon* is added. +
    The following targets are supported:
 
@@ -71,7 +71,7 @@ The following options can be passed to the *gstdvbbackend* daemon:
    *stderr*;; log to standard error, parameters <level>
 
 *-U, --debug*::
-   This option instructs *gstdvbbackend* to run in debug mode. It implicits *-D* 
+   This option instructs *gstdvbbackend* to run in debug mode. It implicits *-D*
    (don't daemonize) and adds a log target with the configuration
    *stdout:5* (logging with maximum level). In future releases there might
    be additional output when this option is supplied.
@@ -80,7 +80,7 @@ The following options can be passed to the *gstdvbbackend* daemon:
 BUGS
 ----
 Most likely there are some bugs in *gstdvbbackend*. If you find a bug, please let
-the developers know at equinox@helsinki.at. Of course, patches are preferred.
+the developers know at equinox@spreadspace.org. Of course, patches are preferred.
 
 
 SEE ALSO
@@ -103,7 +103,7 @@ Project Page: http://www.spreadspace.org/gstdvbbackend
 COPYING
 -------
 
-Copyright \(C) 2011-2016 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 
+Copyright \(C) 2011-2016 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 1fac122..7a8e060 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -22,6 +22,12 @@
 ##  You should have received a copy of the GNU General Public License
 ##  along with gstdvbbackend. 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 gstdvbbackend.
+##  This permission goes above and beyond the permissions granted by the
+##  GPL license sydra is covered by.
+##
 
 ifneq ($(MAKECMDGOALS),distclean)
 include include.mk
diff --git a/src/configure b/src/configure
index 0bbd66c..c9fc65a 100755
--- a/src/configure
+++ b/src/configure
@@ -23,6 +23,12 @@
 #  You should have received a copy of the GNU General Public License
 #  along with gstdvbbackend. 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 gstdvbbackend.
+#  This permission goes above and beyond the permissions granted by the
+#  GPL license sydra is covered by.
+#
 
 set -e
 
diff --git a/src/daemon.h b/src/daemon.h
index f362e07..81f715f 100644
--- a/src/daemon.h
+++ b/src/daemon.h
@@ -21,6 +21,12 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with gstdvbbackend. 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 gstdvbbackend.
+ *  This permission goes above and beyond the permissions granted by the
+ *  GPL license sydra is covered by.
  */
 
 #ifndef GSTDVBBACKEND_daemon_h_INCLUDED
diff --git a/src/datatypes.h b/src/datatypes.h
index bf9616d..4a83c42 100644
--- a/src/datatypes.h
+++ b/src/datatypes.h
@@ -21,6 +21,12 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with gstdvbbackend. 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 gstdvbbackend.
+ *  This permission goes above and beyond the permissions granted by the
+ *  GPL license sydra is covered by.
  */
 
 #ifndef GSTDVBBACKEND_datatypes_h_INCLUDED
diff --git a/src/gstdvbbackend.c b/src/gstdvbbackend.c
index a58d570..0732f57 100644
--- a/src/gstdvbbackend.c
+++ b/src/gstdvbbackend.c
@@ -21,6 +21,12 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with gstdvbbackend. 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 gstdvbbackend.
+ *  This permission goes above and beyond the permissions granted by the
+ *  GPL license sydra is covered by.
  */
 
 #define _GNU_SOURCE
diff --git a/src/log.c b/src/log.c
index 47e018d..5eeaec7 100644
--- a/src/log.c
+++ b/src/log.c
@@ -21,6 +21,12 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with gstdvbbackend. 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 gstdvbbackend.
+ *  This permission goes above and beyond the permissions granted by the
+ *  GPL license sydra is covered by.
  */
 
 #include "datatypes.h"
diff --git a/src/log.h b/src/log.h
index 350014d..2f9d369 100644
--- a/src/log.h
+++ b/src/log.h
@@ -21,6 +21,12 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with gstdvbbackend. 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 gstdvbbackend.
+ *  This permission goes above and beyond the permissions granted by the
+ *  GPL license sydra is covered by.
  */
 
 #ifndef GSTDVBBACKEND_log_h_INCLUDED
diff --git a/src/log_targets.h b/src/log_targets.h
index 7a8f6be..fece03b 100644
--- a/src/log_targets.h
+++ b/src/log_targets.h
@@ -21,6 +21,12 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with gstdvbbackend. 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 gstdvbbackend.
+ *  This permission goes above and beyond the permissions granted by the
+ *  GPL license sydra is covered by.
  */
 
 #ifndef GSTDVBBACKEND_log_targets_h_INCLUDED
diff --git a/src/options.c b/src/options.c
index e730073..57a38bf 100644
--- a/src/options.c
+++ b/src/options.c
@@ -21,6 +21,12 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with gstdvbbackend. 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 gstdvbbackend.
+ *  This permission goes above and beyond the permissions granted by the
+ *  GPL license sydra is covered by.
  */
 
 #include "datatypes.h"
@@ -123,7 +129,7 @@ int options_parse(options_t* opt, int argc, char* argv[])
     { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_CALLBACK, options_parse_remaining, NULL, NULL},
     { NULL }
   };
-  GOptionContext *ctx = g_option_context_new("- spreadspace streaming hydra ");
+  GOptionContext *ctx = g_option_context_new("- simple DVB to HTTP Streamer ");
   GOptionGroup* main_group = g_option_group_new ("main", "Application Options",
                                                  "Show Application Options", opt, NULL);
   if(main_group)
diff --git a/src/options.h b/src/options.h
index a170df6..9337927 100644
--- a/src/options.h
+++ b/src/options.h
@@ -21,6 +21,12 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with gstdvbbackend. 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 gstdvbbackend.
+ *  This permission goes above and beyond the permissions granted by the
+ *  GPL license sydra is covered by.
  */
 
 #ifndef GSTDVBBACKEND_options_h_INCLUDED
diff --git a/src/streamer.c b/src/streamer.c
index 1d49fcb..b9b20c0 100644
--- a/src/streamer.c
+++ b/src/streamer.c
@@ -21,6 +21,12 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with gstdvbbackend. 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 gstdvbbackend.
+ *  This permission goes above and beyond the permissions granted by the
+ *  GPL license sydra is covered by.
  */
 
 #include <gst/gst.h>
diff --git a/src/streamer.h b/src/streamer.h
index f7f11f3..13a4109 100644
--- a/src/streamer.h
+++ b/src/streamer.h
@@ -21,10 +21,16 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with gstdvbbackend. 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 gstdvbbackend.
+ *  This permission goes above and beyond the permissions granted by the
+ *  GPL license sydra is covered by.
  */
 
-#ifndef RHARCHIVE_streamer_h_INCLUDED
-#define RHARCHIVE_streamer_h_INCLUDED
+#ifndef GSTDVBBACKEND_streamer_h_INCLUDED
+#define GSTDVBBACKEND_streamer_h_INCLUDED
 
 #include <gst/gst.h>
 #include <glib.h>