Remove references to Tvheadend Foundation.

diff --git a/LICENSE.md b/LICENSE.md
index 4714977de41944b4079575913512e16322e274fa..1edc2dced00215b709e5e4679a9513b757d19032 100644 (file)
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -6,26 +6,12 @@ The project is currently licensed using GPLv3. For full text see:
 > http://www.gnu.org/licenses/gpl-3.0.txt   
 > [GPLv3](licenses/gpl-3.0.txt)
 
-However we are currently in the process of seeking CLAs from all contributors. This will provide the project with the potential to re-license under any OSI approved license.
-
-The intention is that once agreements have been received from all members we will begin to re-license the code under GPLv2.
-
 Should you be interested in using Tvheadend and wish to use another OSI license, then please contact admin at tvheadend dot org.
 
 Code not Covered
 ----------------
 
-Code in the "vendor" directory is not covered by our license, it is 3rd party
-provided code and as such is governed by individual licenses.
-
-Code that is not yet covered by the CLAs will retain the original copyright header and GPLv3 license. However as things are migrated the headers and in-line license details will be updated.
-
-Contributor License Agreement (CLA)
------------------------------------
-
-All contributors to Tvheadend are required to sign a CLA, which gives the
-project a perpetual license to use the contribution as the project deems best
-(within the terms of the agreement).
+Code in the "vendor" directory is not covered by our license, it is 3rd party provided code and as such is governed by individual licenses.
 
 Further Information
 -------------------
@@ -33,4 +19,3 @@ Further Information
 For more information regarding licensing and contributions, please see:
 
 > https://tvheadend.org/projects/tvheadend/wiki/Contributors    
-> https://tvheadend.org/projects/tvheadend/wiki/CLA   

diff --git a/Makefile.static b/Makefile.static
index 803216c85c1a350f24a318ac0a13ac1225e7c330..e6cd33d985b9b24ec874cf246010c428376a1e82 100644 (file)
--- a/Makefile.static
+++ b/Makefile.static
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008-2014 Tvheadend Foundation CIC
+# Copyright (C) 2008-2018 Tvheadend Project (https://tvheadend.org)
 #
 # This file is part of Tvheadend
 #

diff --git a/README.md b/README.md
index 925fd3f280e402ea301c1af67cf48f267ab0cd34..f54059bbad4d2b327c7d599b0340c86a2e4c928d 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ![TVHeadend Logo](https://github.com/tvheadend/tvheadend/raw/master/src/webui/static/img/satip-icon120.png)
 Tvheadend
 ========================================
-(c) 2006 - 2022 Tvheadend Foundation CIC
+(c) 2006 - 2022 Tvheadend Project (https://tvheadend.org)
 
 Status
 ------

diff --git a/lib/api/python/README.md b/lib/api/python/README.md
index 394f50761b68417fa965cdc534dd169df0eb066a..e3a5392ef3ccc2addc4cc3f6afe8de8c2a1b8e2c 100644 (file)
--- a/lib/api/python/README.md
+++ b/lib/api/python/README.md
@@ -1,6 +1,6 @@
 tvh-json.py
 =================================
-(c) 2017 Tvheadend Foundation CIC
+(c) 2017-2020 Tvheadend Project (https://tvheadend.org)
 
 The json import / export tool written in the python language.
 

diff --git a/src/string_list.c b/src/string_list.c
index 2d851bf28d6549cc16651f47e7fa0f28d6020542..cfe0fa03415abf649c94737d599561556b5e0a76 100644 (file)
--- a/src/string_list.c
+++ b/src/string_list.c
@@ -1,6 +1,6 @@
 /*
  *  Sorted String List Functions
- *  Copyright (C) 2017 Tvheadend Foundation CIC
+ *  Copyright (C) 2017 Tvheadend Project (https://tvheadend.org)
  *
  *  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

diff --git a/src/string_list.h b/src/string_list.h
index cc188d6eb2cee31a45140e3cbef47a5f13b0f3c1..e60ead66ea24207ab9566c5089ba6dc28912dabd 100644 (file)
--- a/src/string_list.h
+++ b/src/string_list.h
@@ -1,6 +1,6 @@
 /*
  *  Sorted String List Functions
- *  Copyright (C) 2017 Tvheadend Foundation CIC
+ *  Copyright (C) 2017 Tvheadend Project (https://tvheadend.org)
  *
  *  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

diff --git a/src/webui/static/app/epgevent.js b/src/webui/static/app/epgevent.js
index c79db65a64c753462a6b6119d0c7cd7dc7d37ce6..d217a1d7c3fb90f4b4dc3be9d924a593fe75fd8d 100644 (file)
--- a/src/webui/static/app/epgevent.js
+++ b/src/webui/static/app/epgevent.js
@@ -1,7 +1,7 @@
 /*
  * epgevent.js
  * EPG dialogs for broadcast events.
- * Copyright (C) 2018 Tvheadend Foundation CIC
+ * Copyright (C) 2018 Tvheadend Project (https://tvheadend.org)
  */
 
 /// Display dialog showing alternative showings for a broadcast event.

diff --git a/support/eitscrape_test.py b/support/eitscrape_test.py
index d90f04157ef1e3eb387f2027041cfabaf29af118..f177b9fcdc2d871ab4c9792932246a048d350cd9 100755 (executable)
--- a/support/eitscrape_test.py
+++ b/support/eitscrape_test.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (C) 2017, 2018 Tvheadend Foundation CIC
+# Copyright (C) 2017, 2018 Tvheadend Project (https://tvheadend.org)
 #
 # 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

diff --git a/support/lib.sh b/support/lib.sh
index 417f78dfad6a0fe2c396cfe423b8e2f448a970ca..3921685bdd0f5becc2da99302fd4f64377c355d4 100755 (executable)
--- a/support/lib.sh
+++ b/support/lib.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (C) 2008-2014 Tvheadend Foundation CIC
+# Copyright (C) 2008-2014 Tvheadend Project (https://tvheadend.org)
 #
 # This file is part of Tvheadend
 #

diff --git a/support/template/header.c b/support/template/header.c
index 1006839e4be2b144cf08bdff96f9812a75c93d75..310bc7bf53bd0041e60ff3274ea13dcf8d7b3695 100644 (file)
--- a/support/template/header.c
+++ b/support/template/header.c
@@ -1,6 +1,6 @@
 /* ****************************************************************************
  *
- * Copyright (C) 2016- Tvheadend Foundation CIC
+ * Copyright (C) 2016- Tvheadend Project (https://tvheadend.org)
  *
  * This file is part of Tvheadend
  *

diff --git a/support/template/header.h b/support/template/header.h
index 83c40ad5e7c4d1b1ec84671b42623be7af7ee516..48ffda672b6c4f28cfebff9335a31fd0317d38e4 100644 (file)
--- a/support/template/header.h
+++ b/support/template/header.h
@@ -1,6 +1,6 @@
 /* ****************************************************************************
  *
- * Copyright (C) 2016- Tvheadend Foundation CIC
+ * Copyright (C) 2016- Tvheadend Project (https://tvheadend.org)
  *
  * This file is part of Tvheadend
  *

diff --git a/support/template/header.py b/support/template/header.py
index 9032b6928ea36607fdf3f28961dce5c76f3420a3..d366a4757f16113760919de453e85b98958f88b7 100644 (file)
--- a/support/template/header.py
+++ b/support/template/header.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (C) 2008-2014 Tvheadend Foundation CIC
+# Copyright (C) 2008-2014 Tvheadend Project (https://tvheadend.org)
 #
 # This file is part of Tvheadend
 #

diff --git a/support/template/header.sh b/support/template/header.sh
index 14382e8ad6ab52f577434eb4fc6132a7579ecce8..cb78bd3a89d2d70b022c521a1e5f689cda850073 100644 (file)
--- a/support/template/header.sh
+++ b/support/template/header.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (C) 2008-2014 Tvheadend Foundation CIC
+# Copyright (C) 2008-2014 Tvheadend Project (https://tvheadend.org)
 #
 # This file is part of Tvheadend
 #