Skip to content

Commit b83bf3f

Browse files
committed
Pre-merge build
1 parent 82a49f4 commit b83bf3f

14 files changed

+21
-12
lines changed

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Package: RLumBuild
22
Type: Package
33
Title: RLum Universe Package Building
44
Version: 0.1.7
5-
Date: 2024-02-11
5+
Date: 2024-02-12
66
Author: Sebastian Kreutzer [aut, cre] (<https://orcid.org/0000-0002-0734-2199>),
77
Christoph Burow [aut] (<https://orcid.org/0000-0002-5023-4046>)
88
Authors@R: c(
@@ -25,7 +25,7 @@ Imports:
2525
devtools (>= 2.4.5),
2626
jsonlite (>= 1.8.8),
2727
miniCRAN (>= 0.2.16),
28-
pander (>= 0.6.6),
28+
pander (>= 0.6.5),
2929
pkgbuild (>= 1.4.3),
3030
roxygen2 (>= 7.3.1),
3131
Rcpp (>= 1.0.12),

NEWS.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
# News for package ‘RLumBuild’
99

10-
## Changes in version 0.1.7.9000-10 (2024-02-11)
10+
## Changes in version 0.1.7 (2024-02-12)
1111

1212
- `module_add_HowToCite()`: remove argument defunct by `stringi`
13+
- `module_add_HowToCite()`: exclude `-package` file from parsing
14+
- `module_add_RLumTeam()`: exclude `-package` file from parsing

README.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ any later version.
114114
## <span class="glyphicon glyphicon-euro"></span> Funding
115115

116116
* In 2019, the work of Sebastian Kreutzer as maintainer of the package was supported
117-
by [LabEx LaScArBx (ANR - n. ANR-10-LABX-52)](https://lascarbx.labex.u-bordeaux.fr/en/).
117+
by [LabEx LaScArBx (ANR - n. ANR-10-LABX-52)](https://lascarbx.labex.u-bordeaux.fr/en/).
118118

119119
* 01/2020-04/2022: Sebastian Kreutzer as maintainer of the package has
120120
received funding from the European Union’s Horizon 2020 research and

README.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,15 @@ more details.
124124
## <span class="glyphicon glyphicon-euro"></span> Funding
125125

126126
- In 2019, the work of Sebastian Kreutzer as maintainer of the package
127-
was supported by LabEx LaScArBxSK (ANR - n. ANR-10-LABX-52).
128-
129-
- From 2020, Sebastian Kreutzer as maintainer of the package received
130-
funding from the European Union’s Horizon 2020 research and innovation
131-
programme under the Marie Skłodowska-Curie grant agreement No 844457.
127+
was supported by [LabEx LaScArBx (ANR -
128+
n. ANR-10-LABX-52)](https://lascarbx.labex.u-bordeaux.fr/en/).
129+
130+
- 01/2020-04/2022: Sebastian Kreutzer as maintainer of the package has
131+
received funding from the European Union’s Horizon 2020 research and
132+
innovation programme under the Marie Skłodowska-Curie grant agreement
133+
[No 844457 (CREDit)](https://cordis.europa.eu/project/id/844457), and
134+
could continue maintaining the package.
135+
136+
- since 03/2023: Sebastian Kreutzer as maintainer of the package
137+
receives funding from the DFG Heisenberg programme [No
138+
505822867](https://gepris.dfg.de/gepris/projekt/505822867).

RLumBuild.BuildResults/RLumBuild_0.1.7.9000-10-Functions.html renamed to RLumBuild.BuildResults/RLumBuild_0.1.7-Functions.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
<p class='character'><h2 align="center">Major functions in the R package 'Luminescence'</h2>
3-
<h4 align="center"> [version: 0.1.7.9000-10 ]</h4>
3+
<h4 align="center"> [version: 0.1.7 ]</h4>
44
<style type="text/css">
55
<!--
66

@@ -435,7 +435,7 @@ <h4 align="center"> [version: 0.1.7.9000-10 ]</h4>
435435
<br>
436436

437437
<p class='character'><h2 align="center">Major functions in the R package 'Luminescence'</h2>
438-
<h4 align="center"> [version: 0.1.7.9000-10 ]</h4>
438+
<h4 align="center"> [version: 0.1.7 ]</h4>
439439
<style type="text/css">
440440
<!--
441441

0 commit comments

Comments
 (0)