From 6d9e72fce4900cf5e4940807679b5184932a3ee2 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 16 Oct 2006 21:05:39 +0000
Subject: [PATCH] (Imported from Automake.) * build-aux/gnupload: Update to
 version 1.1 of directive file.

---
 ChangeLog          |  5 +++++
 build-aux/gnupload | 14 +++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b7fe9db0ee..addf6ef8d7 100644
--- 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 9949157d13..0bee2102c4 100755
--- 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
-- 
2.30.2