From 2d0a8778a8c38d752be7480998a3f81b46ecb27b Mon Sep 17 00:00:00 2001 From: brodieG Date: Sun, 5 Nov 2017 21:14:44 -0500 Subject: [PATCH 1/3] harmonize copyrights --- DESCRIPTION | 2 +- inst/COPYRIGHTS | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 54491ac2..05dc3ae4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -3,7 +3,7 @@ Type: Package Title: Diffs for R Objects Description: Generate a colorized diff of two R objects for an intuitive visualization of their differences. -Version: 0.1.6.9005 +Version: 0.1.6.9006 Date: 2017-11-05 Authors@R: c( person( diff --git a/inst/COPYRIGHTS b/inst/COPYRIGHTS index d56d7a0b..30411870 100644 --- a/inst/COPYRIGHTS +++ b/inst/COPYRIGHTS @@ -10,8 +10,8 @@ The original source code is available at: The adapted and heavily modified code is available in src/diff.c, src/diff.h. See those files for additional details. -This package is released under the GPL-3 license: +This package is released under the GPL (>= 2) or greater license: diffobj - Compare R Objects with a Diff Copyright (C) 2016 Brodie Gaslam - License: GPL-3 + License: GPL (>= 2) From af1fda1138ae39ef28326b12facd9c7bd27e9fae Mon Sep 17 00:00:00 2001 From: brodieG Date: Sun, 5 Nov 2017 21:18:03 -0500 Subject: [PATCH 2/3] change copyrights to 2017 --- R/capt.R | 2 +- R/check.R | 2 +- R/core.R | 2 +- R/diff.R | 2 +- R/finalizer.R | 2 +- R/get.R | 2 +- R/guides.R | 2 +- R/html.R | 2 +- R/hunks.R | 2 +- R/layout.R | 2 +- R/misc.R | 2 +- R/myerssimple.R | 2 +- R/pager.R | 2 +- R/rdiff.R | 2 +- R/rds.R | 2 +- R/s4.R | 2 +- R/set.R | 2 +- R/styles.R | 2 +- R/subset.R | 2 +- R/summmary.R | 2 +- R/system.R | 2 +- R/text.R | 2 +- R/tochar.R | 2 +- R/trim.R | 2 +- R/word.R | 2 +- inst/COPYRIGHTS | 2 +- src/diff.c | 2 +- src/diff.h | 2 +- src/diffobj.c | 2 +- src/diffobj.h | 2 +- src/init.c | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/R/capt.R b/R/capt.R index 7a4eb6cf..9d9adb1f 100644 --- a/R/capt.R +++ b/R/capt.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/check.R b/R/check.R index 0b114fd4..4697957c 100644 --- a/R/check.R +++ b/R/check.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/core.R b/R/core.R index 654d810a..9a9dba55 100644 --- a/R/core.R +++ b/R/core.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/diff.R b/R/diff.R index b8997e7e..c94fbc60 100644 --- a/R/diff.R +++ b/R/diff.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/finalizer.R b/R/finalizer.R index 7804bf88..bbe446b1 100644 --- a/R/finalizer.R +++ b/R/finalizer.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/get.R b/R/get.R index df60670f..50ab28bc 100644 --- a/R/get.R +++ b/R/get.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/guides.R b/R/guides.R index 10733983..db297eaa 100644 --- a/R/guides.R +++ b/R/guides.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/html.R b/R/html.R index c372569d..a87c876a 100644 --- a/R/html.R +++ b/R/html.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/hunks.R b/R/hunks.R index 82687e8c..ca5bd18f 100644 --- a/R/hunks.R +++ b/R/hunks.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/layout.R b/R/layout.R index 237ebdfe..952be2e0 100644 --- a/R/layout.R +++ b/R/layout.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/misc.R b/R/misc.R index 77c580c9..fc2bf00b 100644 --- a/R/misc.R +++ b/R/misc.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/myerssimple.R b/R/myerssimple.R index e5b1fd74..58abdc50 100644 --- a/R/myerssimple.R +++ b/R/myerssimple.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/pager.R b/R/pager.R index 8b85c292..bd5669f8 100644 --- a/R/pager.R +++ b/R/pager.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/rdiff.R b/R/rdiff.R index 1d89b642..7262db65 100644 --- a/R/rdiff.R +++ b/R/rdiff.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/rds.R b/R/rds.R index bd3091e1..210f5341 100644 --- a/R/rds.R +++ b/R/rds.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/s4.R b/R/s4.R index 72d5ef6a..f64ff95c 100644 --- a/R/s4.R +++ b/R/s4.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/set.R b/R/set.R index f9439a16..43ceb2ed 100644 --- a/R/set.R +++ b/R/set.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/styles.R b/R/styles.R index 119a3173..c82375ab 100644 --- a/R/styles.R +++ b/R/styles.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/subset.R b/R/subset.R index b46234e2..160d3bf0 100644 --- a/R/subset.R +++ b/R/subset.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/summmary.R b/R/summmary.R index 9e710e0c..0bd4136e 100644 --- a/R/summmary.R +++ b/R/summmary.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/system.R b/R/system.R index 626396ce..9a6793af 100644 --- a/R/system.R +++ b/R/system.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/text.R b/R/text.R index f231e106..cd58b0d5 100644 --- a/R/text.R +++ b/R/text.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/tochar.R b/R/tochar.R index 4a712532..624ad5bb 100644 --- a/R/tochar.R +++ b/R/tochar.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/trim.R b/R/trim.R index e1e3a01a..c881f971 100644 --- a/R/trim.R +++ b/R/trim.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/R/word.R b/R/word.R index 4d9e64e6..04ea09bf 100644 --- a/R/word.R +++ b/R/word.R @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Brodie Gaslam +# Copyright (C) 2017 Brodie Gaslam # # This file is part of "diffobj - Diffs for R Objects" # diff --git a/inst/COPYRIGHTS b/inst/COPYRIGHTS index 30411870..f3493af8 100644 --- a/inst/COPYRIGHTS +++ b/inst/COPYRIGHTS @@ -13,5 +13,5 @@ The adapted and heavily modified code is available in src/diff.c, src/diff.h. S This package is released under the GPL (>= 2) or greater license: diffobj - Compare R Objects with a Diff - Copyright (C) 2016 Brodie Gaslam + Copyright (C) 2017 Brodie Gaslam License: GPL (>= 2) diff --git a/src/diff.c b/src/diff.c index f83b67a1..acd6c4df 100644 --- a/src/diff.c +++ b/src/diff.c @@ -4,7 +4,7 @@ * implementation is not compatible with the original one. See next * comment blocks for original copyright and license information. * - * Copyright (C) 2016 Brodie Gaslam + * Copyright (C) 2017 Brodie Gaslam * * This file is part of "diffobj - Diffs for R Objects" * diff --git a/src/diff.h b/src/diff.h index bf47bd5a..55733c90 100644 --- a/src/diff.h +++ b/src/diff.h @@ -4,7 +4,7 @@ * implementation is not compatible with the original one. See next * comment blocks for original copyright and license information. * - * Copyright (C) 2016 Brodie Gaslam + * Copyright (C) 2017 Brodie Gaslam * * This file is part of "diffobj - Diffs for R Objects" * diff --git a/src/diffobj.c b/src/diffobj.c index 37ebacbf..69adcbf7 100644 --- a/src/diffobj.c +++ b/src/diffobj.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Brodie Gaslam + * Copyright (C) 2017 Brodie Gaslam * * This file is part of "diffobj - Diffs for R Objects" * diff --git a/src/diffobj.h b/src/diffobj.h index 13b85208..263c0966 100644 --- a/src/diffobj.h +++ b/src/diffobj.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Brodie Gaslam + * Copyright (C) 2017 Brodie Gaslam * * This file is part of "diffobj - Diffs for R Objects" * diff --git a/src/init.c b/src/init.c index bb37253d..ee0f6ed6 100644 --- a/src/init.c +++ b/src/init.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Brodie Gaslam + * Copyright (C) 2017 Brodie Gaslam * * This file is part of "diffobj - Diffs for R Objects" * From 851f55997288c4d27aa139c9f672cc8a89326142 Mon Sep 17 00:00:00 2001 From: brodieG Date: Sun, 5 Nov 2017 21:19:02 -0500 Subject: [PATCH 3/3] news --- NEWS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.md b/NEWS.md index 87ddea03..a73d3f6c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -9,6 +9,8 @@ copying `crayon` functions ([@seulki-choi](https://stackoverflow.com/users/7788015/seulki-choi), @gaborcsardi) +* [#100](https://github.com/brodieG/diffobj/issues/100): R_useDynamicSymbols +* [#105](https://github.com/brodieG/diffobj/issues/105): Copyright tweaks ## v0.1.6