Implement upload directives version 1.2

* NEWS: Update.
* README: Update.
* doc/wydawca.texi: Document changes.
* src/cmdline.opt: Update copyright years.
* src/config.c: Update for new grecs version.
New keywords: min-version and max-version.
* src/directive.c (directive_unpack_version): New function.
(directive_version_in_range_p): Set trp->version and print it.
(directive) <replace_dir>: New directive.
(directive_table): New directive "replace".
(verify_directive_format): Use globals min_directive_version
and max_directive_version.
(process_directives): Handle replace_dir
* src/diskio.c (dir_move_file): Use the "replace"
directive to act on existing files.
* src/wydawca.c (min_directive_version)
(max_directive_version): New globals.
(main): Loosen gpgme requirement: version 1.1.0 is Ok.
* src/wydawca.h (MAX_DIRECTIVE_VERSION): Set to 102
(file_triplet) <version>: New member.
(min_directive_version)
(max_directive_version): New globals.
(directive_unpack_version): New proto.
* tests/upl11.at: New file.
* tests/upl12f.at: New file.
* tests/upl12t.at: New file.
* tests/Makefile.am (TESTSUITE_AT): Add new files.
* tests/atlocal.in (wydawca_upload): Change invocation. All uses updated.
(wydawca_cmparc): New function.
* tests/check-fail.at: Update.
* tests/check-notify.at: Update.
* tests/check-ok.at: Update.
* tests/dist/file12f.directive.asc: New file.
* tests/dist/file12t.directive.asc: New file.
* tests/etc/wydawca.rcin (test): Define "archive" clause.
* tests/mailstats.at: Update.
* tests/notify-upl.at: Update.
* tests/testsuite.at: Include new files.
* tests/upload-dry.at: Update.
* tests/upload.at: Update.

16 files changed, 274 insertions, 22 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index aa85c51..c4d861f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 # This file is part of Wydawca
-# Copyright (C) 2009-2011 Sergey Poznyakoff
+# Copyright (C) 2009-2012 Sergey Poznyakoff
 #
 # Wydawca is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -53,6 +53,9 @@ TESTSUITE_AT = \
   testsuite.at\
   upload.at\
   upload-dry.at\
+  upl11.at\
+  upl12f.at\
+  upl12t.at\
   version.at\
   wordsplit.at
 
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 9a560a8..50c5a60 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,6 +1,6 @@
 # @configure_input@                                     -*- shell-script -*-
 # Configurable variable values for Wydawca test suite.
-# Copyright (C) 2009-2011 Sergey Poznyakoff
+# Copyright (C) 2009-2012 Sergey Poznyakoff
 
 PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:$PATH
 
@@ -12,6 +12,7 @@ WD_CONFSRC=@abs_top_srcdir@/tests/etc
 WD_DISTDIR=@abs_top_srcdir@/tests/dist
 WD_SRC=@abs_top_builddir@/tests/source
 WD_DST=@abs_top_builddir@/tests/dest
+MKDIR_P="@MKDIR_P@"
 
 wydawca_init_testdirs() {
 	for dir in "$WD_SRC" "$WD_SRC/test" "${WD_SRC}/fail" "${WD_SRC}/ok" "$WD_DST"
@@ -39,17 +40,31 @@ wydawca_config() {
 wydawca_upload() {
 	dir="$WD_SRC/$1"
 	shift
+	file=$1
+	shift
+	cp "$WD_DISTDIR/$file" "$dir"
+	cp "$WD_DISTDIR/$file.sig" "$dir"
+	if test -n "$1"; then
+	  cp "$WD_DISTDIR/$1" "$dir/$file.directive.asc"
+	else
+	  cp "$WD_DISTDIR/$file.directive.asc" "$dir"
+	fi
+}
+
+wydawca_cmp() {
+	p=$1
+	shift
 	for file in $@
 	do
-		cp "$WD_DISTDIR/$file" "$dir"
+		cmp "$WD_DISTDIR/$file" "$WD_DST/$p/$file" || exit 1
 	done
 }
 
-wydawca_cmp() {
+wydawca_cmparc() {
 	p=$1
 	shift
 	for file in $@
 	do
-		cmp "$WD_DISTDIR/$file" "$WD_DST/$p/$file" || exit 1
+		cmp "$WD_DISTDIR/$file" "$WD_DST/$p/archive/$file" || exit 1
 	done
 }
diff --git a/tests/check-fail.at b/tests/check-fail.at
index abe8686..8e2cff4 100644
--- a/tests/check-fail.at
+++ b/tests/check-fail.at
@@ -1,5 +1,5 @@
 # Check distribution verification tests - failure    -*- Autotest -*-
-# Copyright (C) 2010-2011 Sergey Poznyakoff
+# Copyright (C) 2010-2012 Sergey Poznyakoff
 #
 # Wydawca is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@ AT_KEYWORDS([uploads check-test check-fail])
 
 AT_DATA([template],
 [wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) started
+wydawca: [[NOTICE]] file.directive.asc: VERSION: 1.1
 wydawca: [[NOTICE]] file.directive.asc: COMMENT: Gnupload for Wydawca testsuite
 wydawca: [[ERR]] spool check script for file@ckfail returned 1
 wydawca: [[NOTICE]] removing file
@@ -44,7 +45,7 @@ wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) fini
 AT_CHECK([
 wydawca_init_testdirs
 wydawca_config wydawca.rc
-wydawca_upload fail file file.directive.asc file.sig
+wydawca_upload fail file 
 
 wydawca_expandmeta template experr
 
diff --git a/tests/check-notify.at b/tests/check-notify.at
index 136ddbb..7be4741 100644
--- a/tests/check-notify.at
+++ b/tests/check-notify.at
@@ -1,5 +1,5 @@
 # Check distribution verification tests - failure notification -*- Autotest -*-
-# Copyright (C) 2010-2011 Sergey Poznyakoff
+# Copyright (C) 2010-2012 Sergey Poznyakoff
 #
 # Wydawca is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@ AT_KEYWORDS([uploads check-test check-fail check-fail-notify notify])
 
 AT_DATA([template],
 [wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) started
+wydawca: [[NOTICE]] file.directive.asc: VERSION: 1.1
 wydawca: [[NOTICE]] file.directive.asc: COMMENT: Gnupload for Wydawca testsuite
 wydawca: [[ERR]] spool check script for file@ckfail returned 1
 wydawca: [[NOTICE]] removing file
@@ -72,7 +73,7 @@ wydawca_config wydawca.rc
 mv wydawca.rc simple.rc
 cat $WD_CONFSRC/notify.rc simple.rc > wydawca.rc
 
-wydawca_upload fail file file.directive.asc file.sig
+wydawca_upload fail file
 
 wydawca_expandmeta outtmpl expout
 wydawca_expandmeta template experr
diff --git a/tests/check-ok.at b/tests/check-ok.at
index 7b641a2..d09a713 100644
--- a/tests/check-ok.at
+++ b/tests/check-ok.at
@@ -1,5 +1,5 @@
 # Check distribution verification tests - success    -*- Autotest -*-
-# Copyright (C) 2010-2011 Sergey Poznyakoff
+# Copyright (C) 2010-2012 Sergey Poznyakoff
 #
 # Wydawca is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@ AT_KEYWORDS([uploads check-test check-success check-ok])
 
 AT_DATA([template],
 [wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) started
+wydawca: [[NOTICE]] file.directive.asc: VERSION: 1.1
 wydawca: [[NOTICE]] file.directive.asc: COMMENT: Gnupload for Wydawca testsuite
 wydawca: [[INFO]] errors: 0
 wydawca: [[INFO]] warnings: 0
@@ -40,7 +41,7 @@ wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) fini
 AT_CHECK([
 wydawca_init_testdirs
 wydawca_config wydawca.rc
-wydawca_upload ok file file.directive.asc file.sig
+wydawca_upload ok file 
 
 wydawca_expandmeta template experr
 
diff --git a/tests/dist/file12f.directive.asc b/tests/dist/file12f.directive.asc
new file mode 100644
index 0000000..11b206d
--- /dev/null
+++ b/tests/dist/file12f.directive.asc
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+version: 1.2
+directory: proj
+comment: Gnupload for Wydawca testsuite
+filename: file
+replace: false
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAk/B+FwACgkQCZA3/2YT9iN1CQCgh9sbdy1zz6o6jTJRGXAbjClq
+jvoAn3wcsnvIzx2vZchPMSfpJ3ZaPV1f
+=g4s4
+-----END PGP SIGNATURE-----
diff --git a/tests/dist/file12t.directive.asc b/tests/dist/file12t.directive.asc
new file mode 100644
index 0000000..921ca1e
--- /dev/null
+++ b/tests/dist/file12t.directive.asc
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+version: 1.2
+directory: proj
+comment: Gnupload for Wydawca testsuite
+filename: file
+replace: true
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAk/B+GAACgkQCZA3/2YT9iMwzgCgzIWjeAwRlI0aLgUAo8XafrId
+qLsAoIQp2r63b+WxDdvwDrvXBwtQJq1x
+=t6tj
+-----END PGP SIGNATURE-----
diff --git a/tests/etc/wydawca.rcin b/tests/etc/wydawca.rcin
index 752b957..ec87a7b 100644
--- a/tests/etc/wydawca.rcin
+++ b/tests/etc/wydawca.rcin
@@ -1,5 +1,5 @@
 # This file is part of Wydawca testsuite
-# Copyright (C) 2009-2011 Sergey Poznyakoff
+# Copyright (C) 2009-2012 Sergey Poznyakoff
 #
 # Wydawca is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -67,7 +67,9 @@ spool test {
   url ftp://wydawca.test;
   source "@WD_SRC@/test";
   destination "@WD_DST@";
-  archive none;
+  archive directory {
+    name "archive";
+  };
 }
 
 spool ckfail {
diff --git a/tests/mailstats.at b/tests/mailstats.at
index 0c772b6..59f8e0c 100644
--- a/tests/mailstats.at
+++ b/tests/mailstats.at
@@ -1,5 +1,5 @@
 # Check mailing statistics                              -*- Autotest -*-
-# Copyright (C) 2009-2011 Sergey Poznyakoff
+# Copyright (C) 2009-2012 Sergey Poznyakoff
 #
 # Wydawca is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@ AT_SETUP([Simple upload statistics])
 
 AT_DATA([errtmpl],
 [wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) started
+wydawca: [[NOTICE]] file.directive.asc: VERSION: 1.1
 wydawca: [[NOTICE]] file.directive.asc: COMMENT: Gnupload for Wydawca testsuite
 wydawca: [[INFO]] errors: 0
 wydawca: [[INFO]] warnings: 0
@@ -69,7 +70,7 @@ AT_CHECK([
 wydawca_init_testdirs
 wydawca_config wydawca.rc
 cat $WD_CONFSRC/mailstats.rc >> wydawca.rc
-wydawca_upload test file file.directive.asc file.sig
+wydawca_upload test file
 
 wydawca_expandmeta errtmpl experr
 ulimit -c unlimited
diff --git a/tests/notify-upl.at b/tests/notify-upl.at
index f070733..ee35056 100644
--- a/tests/notify-upl.at
+++ b/tests/notify-upl.at
@@ -1,5 +1,5 @@
 # Check success notifications                              -*- Autotest -*-
-# Copyright (C) 2009-2011 Sergey Poznyakoff
+# Copyright (C) 2009-2012 Sergey Poznyakoff
 #
 # Wydawca is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@ AT_KEYWORDS([notify])
 
 AT_DATA([errtmpl],
 [wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) started
+wydawca: [[NOTICE]] file.directive.asc: VERSION: 1.1
 wydawca: [[NOTICE]] file.directive.asc: COMMENT: Gnupload for Wydawca testsuite
 wydawca: [[INFO]] errors: 0
 wydawca: [[INFO]] warnings: 0
@@ -82,7 +83,7 @@ wydawca_init_testdirs
 wydawca_config wydawca.rc
 mv wydawca.rc simple.rc
 cat $WD_CONFSRC/notify.rc simple.rc > wydawca.rc
-wydawca_upload test file file.directive.asc file.sig
+wydawca_upload test file
 
 wydawca_expandmeta errtmpl experr
 wydawca_expandmeta outtmpl expout
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 9287630..3821985 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,6 +1,6 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 # This file is part of Wydawca
-# Copyright (C) 2009-2011 Sergey Poznyakoff
+# Copyright (C) 2009-2012 Sergey Poznyakoff
 #
 # Wydawca is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,6 +31,9 @@ m4_include([backup03.at])
 
 m4_include([upload-dry.at])
 m4_include([upload.at])
+m4_include([upl11.at])
+m4_include([upl12f.at])
+m4_include([upl12t.at])
 m4_include([notify-upl.at])
 m4_include([mailstats.at])
 
diff --git a/tests/upl11.at b/tests/upl11.at
new file mode 100644
index 0000000..b5200b0
--- /dev/null
+++ b/tests/upl11.at
@@ -0,0 +1,63 @@
+# Check working uploads                              -*- Autotest -*-
+# Copyright (C) 2009-2012 Sergey Poznyakoff
+#
+# Wydawca 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, or (at your option)
+# any later version.
+#
+# Wydawca 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 Wydawca.  If not, see <http://www.gnu.org/licenses/>.
+
+AT_SETUP([Implicit archivation (version 1.1)])
+AT_KEYWORDS([upl11])
+
+AT_DATA([template],
+[wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) started
+wydawca: [[NOTICE]] file.directive.asc: VERSION: 1.1
+wydawca: [[NOTICE]] file.directive.asc: COMMENT: Gnupload for Wydawca testsuite
+wydawca: [[INFO]] errors: 0
+wydawca: [[INFO]] warnings: 0
+wydawca: [[INFO]] bad signatures: 0
+wydawca: [[INFO]] access violation attempts: 0
+wydawca: [[INFO]] complete triplets: 1
+wydawca: [[INFO]] incomplete triplets: 0
+wydawca: [[INFO]] bad triplets: 0
+wydawca: [[INFO]] expired triplets: 0
+wydawca: [[INFO]] triplet successes: 1
+wydawca: [[INFO]] files uploaded: 2
+wydawca: [[INFO]] files archived: 2
+wydawca: [[INFO]] symlinks created: 0
+wydawca: [[INFO]] symlinks removed: 0
+wydawca: [[INFO]] check failures: 0
+wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) finished
+])
+
+AT_CHECK([
+wydawca_init_testdirs
+wydawca_config wydawca.rc
+destdir=$WD_DST/proj
+test -d $destdir || $MKDIR_P -p $destdir
+cp "$WD_DISTDIR/file" "$destdir"
+cp "$WD_DISTDIR/file.sig" "$destdir"
+
+wydawca_upload test file
+
+wydawca_expandmeta template experr
+
+wydawca --no-preproc -c wydawca.rc || exit $?
+wydawca_cmp proj file file.sig
+wydawca_cmparc proj file file.sig
+],
+[0],
+[],
+[experr])
+
+wydawca_clean_testdirs
+
+AT_CLEANUP
diff --git a/tests/upl12f.at b/tests/upl12f.at
new file mode 100644
index 0000000..f3d96e5
--- /dev/null
+++ b/tests/upl12f.at
@@ -0,0 +1,66 @@
+# Check working uploads                              -*- Autotest -*-
+# Copyright (C) 2009-2012 Sergey Poznyakoff
+#
+# Wydawca 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, or (at your option)
+# any later version.
+#
+# Wydawca 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 Wydawca.  If not, see <http://www.gnu.org/licenses/>.
+
+AT_SETUP([Implicit archivation disabled (version 1.2)])
+AT_KEYWORDS([upl12f])
+
+AT_DATA([template],
+[wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) started
+wydawca: [[NOTICE]] file.directive.asc: VERSION: 1.2
+wydawca: [[NOTICE]] file.directive.asc: COMMENT: Gnupload for Wydawca testsuite
+wydawca: [[ERR]] refusing to upload file because it already exists and replace is not allowed
+wydawca: [[NOTICE]] removing file
+wydawca: [[NOTICE]] removing file.sig
+wydawca: [[NOTICE]] removing file.directive.asc
+wydawca: [[INFO]] errors: 1
+wydawca: [[INFO]] warnings: 0
+wydawca: [[INFO]] bad signatures: 0
+wydawca: [[INFO]] access violation attempts: 0
+wydawca: [[INFO]] complete triplets: 1
+wydawca: [[INFO]] incomplete triplets: 0
+wydawca: [[INFO]] bad triplets: 0
+wydawca: [[INFO]] expired triplets: 0
+wydawca: [[INFO]] triplet successes: 0
+wydawca: [[INFO]] files uploaded: 0
+wydawca: [[INFO]] files archived: 0
+wydawca: [[INFO]] symlinks created: 0
+wydawca: [[INFO]] symlinks removed: 0
+wydawca: [[INFO]] check failures: 0
+wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) finished
+])
+
+AT_CHECK([
+wydawca_init_testdirs
+wydawca_config wydawca.rc
+destdir=$WD_DST/proj
+test -d $destdir || $MKDIR_P $destdir
+cp "$WD_DISTDIR/file" "$destdir"
+cp "$WD_DISTDIR/file.sig" "$destdir"
+
+wydawca_upload test file file12f.directive.asc
+
+wydawca_expandmeta template experr
+
+wydawca --no-preproc -c wydawca.rc || exit $?
+wydawca_cmp proj file file.sig
+],
+[0],
+[],
+[experr])
+
+wydawca_clean_testdirs
+
+AT_CLEANUP
diff --git a/tests/upl12t.at b/tests/upl12t.at
new file mode 100644
index 0000000..faab877
--- /dev/null
+++ b/tests/upl12t.at
@@ -0,0 +1,63 @@
+# Check working uploads                              -*- Autotest -*-
+# Copyright (C) 2009-2012 Sergey Poznyakoff
+#
+# Wydawca 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, or (at your option)
+# any later version.
+#
+# Wydawca 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 Wydawca.  If not, see <http://www.gnu.org/licenses/>.
+
+AT_SETUP([Implicit archivation enabled (version 1.2)])
+AT_KEYWORDS([upl12t])
+
+AT_DATA([template],
+[wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) started
+wydawca: [[NOTICE]] file.directive.asc: VERSION: 1.2
+wydawca: [[NOTICE]] file.directive.asc: COMMENT: Gnupload for Wydawca testsuite
+wydawca: [[INFO]] errors: 0
+wydawca: [[INFO]] warnings: 0
+wydawca: [[INFO]] bad signatures: 0
+wydawca: [[INFO]] access violation attempts: 0
+wydawca: [[INFO]] complete triplets: 1
+wydawca: [[INFO]] incomplete triplets: 0
+wydawca: [[INFO]] bad triplets: 0
+wydawca: [[INFO]] expired triplets: 0
+wydawca: [[INFO]] triplet successes: 1
+wydawca: [[INFO]] files uploaded: 2
+wydawca: [[INFO]] files archived: 2
+wydawca: [[INFO]] symlinks created: 0
+wydawca: [[INFO]] symlinks removed: 0
+wydawca: [[INFO]] check failures: 0
+wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) finished
+])
+
+AT_CHECK([
+wydawca_init_testdirs
+wydawca_config wydawca.rc
+destdir=$WD_DST/proj
+test -d $destdir || $MKDIR_P $destdir
+cp "$WD_DISTDIR/file" "$destdir"
+cp "$WD_DISTDIR/file.sig" "$destdir"
+
+wydawca_upload test file file12t.directive.asc
+
+wydawca_expandmeta template experr
+
+wydawca --no-preproc -c wydawca.rc || exit $?
+wydawca_cmp proj file file.sig
+wydawca_cmparc proj file file.sig
+],
+[0],
+[],
+[experr])
+
+wydawca_clean_testdirs
+
+AT_CLEANUP
diff --git a/tests/upload-dry.at b/tests/upload-dry.at
index 232f463..2116af2 100644
--- a/tests/upload-dry.at
+++ b/tests/upload-dry.at
@@ -1,5 +1,5 @@
 # Check dry-run uploads                        -*- Autotest -*-
-# Copyright (C) 2009-2011 Sergey Poznyakoff
+# Copyright (C) 2009-2012 Sergey Poznyakoff
 #
 # Wydawca is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@ wydawca: [[DEBUG]] processing spool test (@WD_DST@)
 wydawca: [[DEBUG]] FILE file, DIST=file, SIG=file.sig, DIRECTIVE=file.directive.asc
 wydawca: [[NOTICE]] Good signature from Wydawca (Testsuite) <bug-wydawca@gnu.org.ua>
 wydawca: [[DEBUG]] file: directive file signature OK
+wydawca: [[NOTICE]] file.directive.asc: VERSION: 1.1
 wydawca: [[DEBUG]] processing triplet `file'
 wydawca: [[NOTICE]] file.directive.asc: COMMENT: Gnupload for Wydawca testsuite
 wydawca: [[DEBUG]] good detached signature for file
@@ -53,7 +54,7 @@ wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) fini
 AT_CHECK([
 wydawca_init_testdirs
 wydawca_config wydawca.rc
-wydawca_upload test file file.directive.asc file.sig
+wydawca_upload test file
 
 wydawca_expandmeta template experr
 
diff --git a/tests/upload.at b/tests/upload.at
index bf669a8..cd76362 100644
--- a/tests/upload.at
+++ b/tests/upload.at
@@ -1,5 +1,5 @@
 # Check working uploads                              -*- Autotest -*-
-# Copyright (C) 2009-2011 Sergey Poznyakoff
+# Copyright (C) 2009-2012 Sergey Poznyakoff
 #
 # Wydawca is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@ AT_SETUP([Simple upload])
 
 AT_DATA([template],
 [wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) started
+wydawca: [[NOTICE]] file.directive.asc: VERSION: 1.1
 wydawca: [[NOTICE]] file.directive.asc: COMMENT: Gnupload for Wydawca testsuite
 wydawca: [[INFO]] errors: 0
 wydawca: [[INFO]] warnings: 0
@@ -39,7 +40,7 @@ wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) fini
 AT_CHECK([
 wydawca_init_testdirs
 wydawca_config wydawca.rc
-wydawca_upload test file file.directive.asc file.sig
+wydawca_upload test file
 
 wydawca_expandmeta template experr