(Imported from Automake.)

* build-aux/gnupload: Update to version 1.1 of directive file.

diff --git a/ChangeLog b/ChangeLog
index b7fe9db0ee901f2f0b547967751076f2666f47b4..addf6ef8d75cb6066721db02f933ad7bdea0d3cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-16  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       (Imported from Automake.)
+       * build-aux/gnupload: Update to version 1.1 of directive file.
+
 2006-10-16  Eric Blake  <ebb9@byu.net>
 
        * modules/configmake (Makefile.am): Add pkglibexecdir support, to

diff --git a/build-aux/gnupload b/build-aux/gnupload
index 9949157d1321890baf43ee17d601efa781bdc0d8..0bee2102c45e8742bd332f315120440837caa32e 100755 (executable)
--- a/build-aux/gnupload
+++ b/build-aux/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