* lib/gnupload: Update to version 1.1 of directive file.

diff --git a/ChangeLog b/ChangeLog
index c19738cbd8d1ef229e3b6c9ef6eadb1ab111f052..c197cc9b7783c551ed1c2b5dd84e1efcbfec4bd8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-16  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * lib/gnupload: Update to version 1.1 of directive file.
+
 2006-10-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * lib/am/depend2.am (%SOURCEFLAG%): New substitution, goes
@@ -37,6 +41,8 @@
 
 2006-10-15  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * lib/gnupload: Update to version 1.1 of directive file.
+
        * configure.ac, NEWS: Bump version to 1.10a.
 
        * configure.ac, NEWS: Bump version to 1.10.

diff --git a/lib/gnupload b/lib/gnupload
index 9949157d1321890baf43ee17d601efa781bdc0d8..0bee2102c45e8742bd332f315120440837caa32e 100755 (executable)
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2006-05-11.09
+scriptversion=2006-10-15.21
 
 # Copyright (C) 2004, 2005, 2006  Free Software Foundation
 #
@@ -143,14 +143,22 @@ do
     case $dest in
       alpha.gnu.org:*)
        rm -f $file.directive $file.directive.asc
-       echo directory: $destdir >$file.directive
+       cat >$file.directive<<EOF
+version: 1.1
+directory: $destdir
+filename: $file
+EOF
        echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $file.directive
         ncftpput ftp-upload.gnu.org /incoming/alpha $files $file.directive.asc
        rm -f $file.directive $file.directive.asc
        ;;
       ftp.gnu.org:*)
        rm -f $file.directive $file.directive.asc
-       echo directory: $destdir >$file.directive
+       cat >$file.directive<<EOF
+version: 1.1
+directory: $destdir
+filename: $file
+EOF
        echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $file.directive
         ncftpput ftp-upload.gnu.org /incoming/ftp $files $file.directive.asc
        rm -f $file.directive $file.directive.asc