Skip to content

Commit

Permalink
Use separate copyright file
Browse files Browse the repository at this point in the history
  • Loading branch information
asardaes committed Jun 5, 2017
1 parent f059b11 commit 8880c68
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 27 deletions.
9 changes: 5 additions & 4 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
^.*\.Rproj$
^\.Rproj\.user$
^\..*
^appveyor\.yml$

^man-roxygen

^\..*
.*\.md
^README.*
^appveyor\.yml$
^codecov\.R
^LICENSE$

^inst/.*\.R$

Expand All @@ -16,6 +19,4 @@
^vignettes/cache/.*
^vignettes/figure/.*

^README.*

# ^tests/.*\.rds$
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 0 additions & 22 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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 <http://www.gnu.org/licenses/>.

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

Expand Down
1 change: 1 addition & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
18 changes: 18 additions & 0 deletions inst/COPYRIGHT.txt
Original file line number Diff line number Diff line change
@@ -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 <http://www.gnu.org/licenses/>.

The years in the copyright notice above are to be understood as a
range, including the years on both ends.

0 comments on commit 8880c68

Please sign in to comment.