diff --git a/.Rbuildignore b/.Rbuildignore index 98596361..67e2b476 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,11 +1,14 @@ ^.*\.Rproj$ ^\.Rproj\.user$ -^\..* -^appveyor\.yml$ + ^man-roxygen +^\..* .*\.md +^README.* +^appveyor\.yml$ ^codecov\.R +^LICENSE$ ^inst/.*\.R$ @@ -16,6 +19,4 @@ ^vignettes/cache/.* ^vignettes/figure/.* -^README.* - # ^tests/.*\.rds$ diff --git a/DESCRIPTION b/DESCRIPTION index a7da95c5..33bee2b7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -40,7 +40,7 @@ Description: Time series clustering along with optimized techniques related custom distance measures and centroid definitions. URL: https://github.com/asardaes/dtwclust BugReports: https://github.com/asardaes/dtwclust/issues -License: GPL-3 + file LICENSE +License: GPL-3 LazyData: TRUE NeedsCompilation: yes SystemRequirements: C++11 diff --git a/LICENSE b/LICENSE index 7e687378..94a9ed02 100644 --- a/LICENSE +++ b/LICENSE @@ -1,25 +1,3 @@ -dtwclust: Time Series Clustering Along With Optimizations for DTW -Copyright (C) 2015-2017 Alexis Sarda-Espinosa - -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 -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - -The years in the copyright notice above are to be understood as a -range, including the years on both ends. - -GPLv3 -========================== - GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/cran-comments.md b/cran-comments.md index f327bea0..bead6044 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,4 +1,5 @@ ## Update to version 4.0.0 +RESUBMIT: removed "file LICENSE" directive from description. Several optimizations and bug fixes. Some of the new functionality requires new dependencies, and some previous dependencies were dropped. diff --git a/inst/COPYRIGHT.txt b/inst/COPYRIGHT.txt new file mode 100644 index 00000000..3290f0b2 --- /dev/null +++ b/inst/COPYRIGHT.txt @@ -0,0 +1,18 @@ +dtwclust: Time Series Clustering Along With Optimizations for DTW +Copyright (C) 2015-2017 Alexis Sarda-Espinosa + +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 +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . + +The years in the copyright notice above are to be understood as a +range, including the years on both ends.