X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=build-aux%2Fgnupload;h=a8e6d66e3863b1be0762456bb5915aadd0e750e5;hb=b566a1cae5310716bad3151cee69f943915b2d31;hp=04363faa64d75b4fb8de844dfe6badc45bb47fe0;hpb=4294e57788932e47171d553d40b85feb98795685;p=gnulib.git

diff --git a/build-aux/gnupload b/build-aux/gnupload
index 04363faa6..a8e6d66e3 100755
--- a/build-aux/gnupload
+++ b/build-aux/gnupload
@@ -1,9 +1,9 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2006-05-20.00
+scriptversion=2006-11-12.11
 
-# Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006  Free Software Foundation
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,7 +29,8 @@ to=
 
 usage="Usage: $0 [OPTIONS]... FILES...
 
-Sign all FILES, and upload them to selected destinations.
+Sign all FILES, and upload them to selected destinations, according to
+<http://www.gnu.org/prep/maintain/html_node/Automated-FTP-Uploads.html>.
 
 Options:
   --help                   print this help text and exit
@@ -48,7 +49,7 @@ Recognized destinations are:
 
 Example:
   gnupload --to sources.redhat.com:~ftp/pub/automake \\
-           ""--to alpha.gnu.org:automake \\
+           --to alpha.gnu.org:automake \\
            automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2
 
 Report bugs to <bug-automake@gnu.org>.
@@ -143,14 +144,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