Skip to content

Commit 794c9a3

Browse files
Merge commit '964ce54383039af046f05ca80c61af6a87a15a8f'
2 parents 2897c91 + 964ce54 commit 794c9a3

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

IPhreeqcMMS/IPhreeqc/R/DESCRIPTION.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Authors@R:
88
c(person(given = "S.R.",
99
family = "Charlton",
1010
role = c("aut", "cre"),
11-
email = "charlton@usgs.gov"),
11+
email = "charlton[email protected]"),
1212
person(given = "D.L.",
1313
family = "Parkhurst",
1414
role = "aut"),
@@ -38,7 +38,7 @@ Description: A geochemical modeling program developed by the US Geological
3838
Survey that is designed to perform a wide variety of aqueous geochemical
3939
calculations, including speciation, batch-reaction, one-dimensional
4040
reactive-transport, and inverse geochemical calculations.
41-
Maintainer: S.R. Charlton <charlton@usgs.gov>
41+
Maintainer: S.R. Charlton <charlton[email protected]>
4242
BugReports: https://github.com/usgs-coupled/iphreeqc/issues
4343
LazyData: yes
4444
Encoding: UTF-8

IPhreeqcMMS/IPhreeqc/configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Process this file with autoconf to produce a configure script.
33

44
AC_PREREQ([2.61])
5-
AC_INIT([IPhreeqc], [3.7.6-16410], [charlton@usgs.gov])
5+
AC_INIT([IPhreeqc], [3.7.6-16410], [charlton[email protected]])
66
AC_CONFIG_AUX_DIR([config])
77
AC_CONFIG_MACRO_DIR([m4])
88

IPhreeqcMMS/IPhreeqc/jenkins-dist.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ do
166166
if [ -e "$vsn_file" ]; then
167167
sed \
168168
-e "s/^ VERSION \(\([0]\|[1-9]\d*\)\.\([0]\|[1-9]\d*\.\)\([0]\|[1-9]\d*\).*\)/ VERSION $VERSION/g" \
169-
-e "s/AC_INIT(.*)/AC_INIT([$NAME], [$VERSION-$REVISION], [charlton@usgs.gov])/g" \
169+
-e "s/AC_INIT(.*)/AC_INIT([$NAME], [$VERSION-$REVISION], [charlton[email protected]])/g" \
170170
-e "s/AM_LDFLAGS=-release.*/AM_LDFLAGS=-release $ver_major.$ver_minor.$ver_patch/g" \
171171
-e "/#define *VER_MAJOR/s/[0-9]\+/$ver_major/" \
172172
-e "/#define *VER_MINOR/s/[0-9]\+/$ver_minor/" \

IPhreeqcMMS/IPhreeqc/packages/dist.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ SED_FILES="$DISTPATH/configure.ac \
208208
for vsn_file in $SED_FILES
209209
do
210210
sed \
211-
-e "s/AC_INIT(.*)/AC_INIT([IPhreeqc], [$VERSION-$REVISION], [charlton@usgs.gov])/g" \
211+
-e "s/AC_INIT(.*)/AC_INIT([IPhreeqc], [$VERSION-$REVISION], [charlton[email protected]])/g" \
212212
-e "s/AM_LDFLAGS=-release.*/AM_LDFLAGS=-release $ver_major.$ver_minor.$ver_patch/g" \
213213
-e "/#define *VER_MAJOR/s/[0-9]\+/$ver_major/" \
214214
-e "/#define *VER_MINOR/s/[0-9]\+/$ver_minor/" \

IPhreeqcMMS/IPhreeqc/unit/configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Process this file with autoconf to produce a configure script.
33

44
AC_PREREQ([2.64])
5-
AC_INIT([IPhreeqc-unit], [2.17.1-4466], [charlton@usgs.gov])
5+
AC_INIT([IPhreeqc-unit], [2.17.1-4466], [charlton[email protected]])
66
AC_CONFIG_AUX_DIR([config])
77
AC_CONFIG_MACRO_DIR([m4])
88

0 commit comments

Comments
 (0)