correct license

dipterix · Nov 2, 2019 · 5fd54c4 · 5fd54c4
1 parent ff14710
commit 5fd54c4
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 49 deletions.
diff --git a/CRAN-RELEASE b/CRAN-RELEASE
@@ -1,2 +1,2 @@
-This package was submitted to CRAN on 2019-10-29.
-Once it is accepted, delete this file and tag the release (commit 6b91481b94).
+This package was submitted to CRAN on 2019-11-01.
+Once it is accepted, delete this file and tag the release (commit ff1471097f).
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -19,7 +19,7 @@ Description: Works as "add-ons" to packages like 'shiny', 'future', as well as
     limit, etc.
 URL: https://github.com/dipterix/dipsaus
 BugReports: https://github.com/dipterix/dipsaus/issues
-License: GPL-3 | file LICENSE
+License: GPL-3
 Encoding: UTF-8
 LazyData: true
 Language: en-US

diff --git a/LICENSE b/LICENSE
diff --git a/cran-comments.md b/cran-comments.md
@@ -1,15 +1,15 @@
-# Resubmission - 2019-11-01
+# Resubmission - 2019-11-02
+
 
 #### Changes:
 
 1. Removed commented example code lines in `queue.Rd`
-2. Replaced `utils-filesystem.R` with my previous implementations and abandon 
-the licensed functions from package `txtq`. These functions are non-critical 
-and are just wrappers of the base functions for convenience.
-3. Added `LICENSE` file.
+2. Replaced `utils-filesystem.R` with my previous implementations and abandon the licensed functions from package `txtq`. These functions are non-critical and are just wrappers of the base functions for convenience.
+3. Corrected license in DESCRIPTION from `License: GPL-3 | file LICENSE` to `License: GPL-3`
 
-**Original feedback from `Martina Schmirl`:**
+**Original feedback from `Martina Schmirl` and `Uwe Ligges`:**
 
+* Feedback from `Martina Schmirl`.
 ```
 Thanks,
 
@@ -40,6 +40,18 @@ e.g. in queue.Rd
 Please fix and resubmit.
 ```
 
+* Feedback from `Uwe Ligges`.
+```
+> License: GPL-3 | file LICENSE
+
+Wrong as file KICENSE does not contain an alternative to the GPL-3.
+
+Also note, that you have to license the whole package under one license,
+so the text below is not useful. Decide on a license, if the former
+licneses of the components do not permit the new license, you have o ask
+all copyright holders for permission.
+```
+
 
 # Previous Records:
 

diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/reference/collapse.html b/docs/reference/collapse.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/queue.html b/docs/reference/queue.html
diff --git a/docs/reference/time_delta.html b/docs/reference/time_delta.html