Use wordsplit to expand variables in strings.

* NEWS: Raise version number.
* configure.ac: Link wydawca.h to include/wydawca
Raise version number
* doc/wydawca.texi: Document changes.
* etc/wydawca.rc: Fix the syntax.
* grecs: Upgrace.
* include/wydawca/wydawca.h (wy_vlog): New proto.
(wy_log, wy_dbg): Format is const char *.
(wy_triplet_t): Change typedef.
(wy_metadef): Remove struct.
(wy_vardef): New struct.
(wy_triplet_expand_param)
(wy_expand_copy): New protos.
* modules/logstat/mod_logstat.c: Update.
* modules/mailutils/Makefile.am (AM_CPPFLAGS): Modify,
* modules/mailutils/mod_mailutils.c: Update.
* src/Makefile.am (wydawca_SOURCES): Remove meta.c
* src/dictionary.c: Fix comment.
* src/directive.c (directive_get_value): Triplet pointer is const.
* src/meta.c: Remove.
* src/timer.c: (timer_fill_meta)
(timer_free_meta): Remove.
* src/triplet.c: Use wordsplit for expansions.
* src/wydawca.c (wy_vlog): New function.
(wy_stat_expansion): New function.
* src/wydawca.h: Remove metadef protos.
* tests/etc/notify.rcin: Update variable reference syntax.

1 files changed, 13 insertions, 12 deletions

diff --git a/etc/wydawca.rc b/etc/wydawca.rc
index 22800b2..6790926 100644
--- a/etc/wydawca.rc
+++ b/etc/wydawca.rc
@@ -108,6 +108,7 @@ files uploaded ..................... ${stat:uploads}
 files archived ..................... ${stat:archives}             
 symlinks created ................... ${stat:symlinks}             
 symlinks removed ................... ${stat:rmsymlinks}           
+verification failures .............. ${stat:check_failures}
 
 Regards,
 Wydawca
@@ -125,7 +126,7 @@ Subject: Upload of ${project} successful
 
 Upload of ${project} to ${dir} finished successfully. Files uploaded:
 
-${triplet:upload}$-
+${triplet:upload}
 
 Regards,
 Wydawca
@@ -140,10 +141,10 @@ notify-event {
 To: ${email:owner}
 Subject: Upload of ${project} successful
 
-${user:real-name} (${user:email}) successfully uploaded files
+${user:real_name} (${user:email}) successfully uploaded files
 for ${project} to ${dir}. Files uploaded:
 
-${triplet:upload}$-
+${triplet:upload}
 
 Regards,
 Wydawca
@@ -163,10 +164,10 @@ Subject: Suspicious upload of ${project}
 Someone not authorized to make releases for ${project}
 has attempted to upload the following files to ${dir}:
 
-${triplet:full}$-
+${triplet:full}
 
 This upload has been ignored and the files removed. The person who attempted
-the upload was ${user:real-name}, user name ${user:name}, email ${user:email}.
+the upload was ${user:real_name}, user name ${user:name}, email ${user:email}.
 If you think this is an error and wish this user to be authorized to make
 releases for ${project}, please contact <puszcza-hackers@gnu.org.ua>.
 Otherwise, let us know so we could undertake appropriate measures.
@@ -186,11 +187,11 @@ notify-event {
 To: ${email:owner}
 Subject: Suspicious upload of ${project}
 
-${user:real-name} (${user:email}) has tried to make a release
+${user:real_name} (${user:email}) has tried to make a release
 for ${project}. However, the signature of the directive file was wrong,
 which looks suspicious. The person uploaded the following files:
 
-${triplet:full}$-
+${triplet:full}
 
 This upload has been ignored and the files removed.
 
@@ -216,7 +217,7 @@ Someone (apparently you), has tried to make a release for ${project}.
 However, the detached signature signature was wrong, which looks
 suspicious. The person uploaded the following files:
 
-${triplet:full}$-
+${triplet:full}
 
 This upload has been ignored and the files removed. If it was you who
 attempted this upload, please make sure you use the right PGP key and
@@ -238,11 +239,11 @@ notify-event {
 To: ${email:owner}
 Subject: Suspicious upload of ${project}
 
-${user:real-name} (${user:email}) has tried to make a release
+${user:real_name} (${user:email}) has tried to make a release
 for ${project}. However, the detached signature file was wrong,
 which looks suspicious. The person uploaded the following files:
 
-${triplet:full}$-
+${triplet:full}
 
 This upload has been ignored and the files removed.
 
@@ -263,12 +264,12 @@ notify-event {
 To: ${email:user}
 Cc: ${email:owner}
 Subject: ${triplet:dist} rejected
-X-Wydawca-Uploader: "${user:real-name}" (${user:name}) <${user:email}>
+X-Wydawca-Uploader: "${user:real_name}" (${user:name}) <${user:email}>
 
 Your upload of ${triplet:dist} has been rejected by the distribution
 verification procedure with the following diagnostics:
 
-${check:diagn}$-
+${check:diagn}
 
 Please fix the tarball and resubmit.