added gstreamer exception to License

further cleanups

12 files changed, 75 insertions, 3 deletions

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>