Skip to content

Commit

Permalink
Fix the identified problems and make recommended changes
Browse files Browse the repository at this point in the history
* Referred in the DESCRIPTION to other packages and external libraries in single quotes.
* Made clear in the DESCRIPTION that this package includes the 'jscolor.js' library.
* Removed the LICENSE file and the reference in the DESCRIPTION
* Added a LICENSE.note file to include comments on the licensing
  • Loading branch information
tzerk authored and tzerk committed Mar 31, 2015
1 parent f1b1a32 commit 1b59067
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 1,054 deletions.
3 changes: 2 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
README.md$
^.Rprofile$
^\.Rprofile$
.Rprofile
.Rprofile
cran-comments.md$
13 changes: 7 additions & 6 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
Package: RLumShiny
Type: Package
Title: Shiny Applications for the R Package Luminescence
Title: 'Shiny' Applications for the R Package 'Luminescence'
Version: 0.1.0
Date: 2015-03-30
Date: 2015-03-31
Authors@R: c(
person("Christoph", "Burow", role = c("aut", "cre"), email = "christoph.burow@uni-koeln.de"),
person("Jan", "Odvarko", role = "cph", comment = "JSColor library"),
person("Jan", "Odvarko", role = "cph", comment = "jscolor.js in www/jscolor"),
person(family = "AnalytixWare", role = "cph", comment = "ShinySky package" )
)
Maintainer: Christoph Burow <christoph.burow@uni-koeln.de>
Description: A collection of shiny applications for the R package Luminescence.
Description: A collection of 'shiny' applications for the R package 'Luminescence'.
These mainly, but not exclusively, include applications for plotting chronometric
data from e.g. luminescence or radiocarbon dating. It further provides access to
bootstraps tooltip and popover functionality as well as a binding to JSColor.
License: GPL-3 | file LICENSE
bootstraps tooltip and popover functionality and contains the 'jscolor.js' library
with a custom 'shiny' output binding.
License: GPL-3
Depends:
R (>= 3.1.2)
Imports:
Expand Down
881 changes: 0 additions & 881 deletions LICENSE

This file was deleted.

8 changes: 8 additions & 0 deletions LICENSE.note
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
The RLumShiny package as a whole is distributed under GPL-3 (GNU GENERAL PUBLIC
LICENSE version 3).

The RLumShiny package includes other open source software components. The following
is a list of these components:

- JSColor, https://github.com/odvarko/jscolor, LGPL License
- ShinySky, https://github.com/AnalytixWare/ShinySky, MIT license (YEAR: 2015, COPYRIGHT HOLDER: AnalytixWare)
2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RLumShiny 0.1.0 (Release date: 2015-03-30)
RLumShiny 0.1.0 (Release date: 2015-03-31)
==============

* Initial release
25 changes: 25 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
## Resubmission
This is a resubmission. In this version I have:

* Referred in the DESCRIPTION to other packages and external libraries in single quotes.

* Made clear in the DESCRIPTION that this package includes the 'jscolor.js' library.

* Removed the LICENSE file and the reference in the DESCRIPTION

* Added a LICENSE.note file to include comments on the licensing

## Test environments
* local Windows 8 x64 install, R-devel (2015-03-27 r68108)
* ubuntu 14.04 (VM), R 3.1.3

## R CMD check results
There were no ERRORs or WARNINGs.

There was 1 NOTE:

* checking CRAN incoming feasibility ... NOTE
Maintainer: 'Christoph Burow <christoph.burow@uni-koeln.de>'
New submission

This is a new submission.
165 changes: 0 additions & 165 deletions inst/www/jscolor/LICENSE

This file was deleted.

0 comments on commit 1b59067

Please sign in to comment.