From 05c02989174d490b842c46cb8f25fb8b601a7c4f Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sun, 15 Jan 2012 17:14:04 +0100 Subject: [PATCH] gnupload: moved to gnulib Since the gnupload script is not required by automake-generated code (be it configure or Makefile content), and is not specifically tied to automake in any way, it is better to have its master copy installed in the gnulib repository, as is already done for similar generally-useful, maintainer-oriented scripts. We can them sync it from there. See also gnulib commit v0.0-6822-gf8b7120, and: * Makefile.am (FETCHFILES): Added 'gnupload'. (fetch): Also sync 'gnupload' from the gnulib repository. * lib/gnupload: Synced from gnulib. * NEWS: Update. --- Makefile.am | 2 ++ NEWS | 3 +++ lib/gnupload | 28 ++++++++++++++-------------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8fe9c0f..ae07898 100644 --- a/Makefile.am +++ b/Makefile.am @@ -729,6 +729,7 @@ INSTALL \ config-ml.in \ config.guess \ config.sub \ +gnupload \ gitlog-to-changelog \ symlink-tree \ texinfo.tex @@ -743,6 +744,7 @@ fetch: $(WGET_SV_GIT_CF)config.sub -O config.sub && \ $(WGET_SV_CVS)texinfo/texinfo/doc/texinfo.tex -O texinfo.tex && \ $(WGET_SV_GIT_GL)doc/INSTALL -O INSTALL && \ + $(WGET_SV_GIT_GL)build-aux/gnupload -O gnupload && \ $(WGET_SV_GIT_GL)build-aux/gitlog-to-changelog -O gitlog-to-changelog && \ $(WGET_GCC)config-ml.in -O config-ml.in && \ $(WGET_GCC)symlink-tree -O symlink-tree) diff --git a/NEWS b/NEWS index 9f2c6a1..5c9a91e 100644 --- a/NEWS +++ b/NEWS @@ -32,6 +32,9 @@ New in 1.11.0a: * Miscellaneous changes: + - The master copy of the `gnupload' script is now maintained in gnulib, + not in automake. + - The `missing' script don't try to wrap calls to `tar' anymore. - "make dist" doesn't wrap `tar' invocations with the `missing' script diff --git a/lib/gnupload b/lib/gnupload index 5036752..51e17c6 100755 --- a/lib/gnupload +++ b/lib/gnupload @@ -1,10 +1,9 @@ #!/bin/sh # Sign files and upload them. -scriptversion=2010-05-23.15; # UTC +scriptversion=2012-01-15.15; # UTC -# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2010, 2012 Free Software Foundation, Inc. # # 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 @@ -20,6 +19,8 @@ scriptversion=2010-05-23.15; # UTC # along with this program. If not, see . # Originally written by Alexandre Duret-Lutz . +# The master copy of this file is maintained in the gnulib Git repository. +# Please send bug reports and feature requests to bug-gnulib@gnu.org. set -e @@ -57,7 +58,7 @@ Options: --version output version information and exit If --symlink-regex is given without EXPR, then the link target name -is created by replacing the version information with \`-latest', e.g.: +is created by replacing the version information with '-latest', e.g.: foo-1.3.4.tar.gz -> foo-latest.tar.gz @@ -105,8 +106,7 @@ happen to have an ncftp package installed, the ncftpput-ftp script in the build-aux/ directory of the gnulib package (http://savannah.gnu.org/projects/gnulib) may serve as a replacement. -Report bugs to . -Send patches to ." +Send patches and bug reports to ." # Read local configuration file if test -r "$conffile"; then @@ -170,7 +170,7 @@ while test -n "$1"; do break ;; -*) - echo "$0: Unknown option \`$1', try \`$0 --help'" 1>&2 + echo "$0: Unknown option '$1', try '$0 --help'" 1>&2 exit 1 ;; esac @@ -188,7 +188,7 @@ done dprint() { - echo "Running $*..." + echo "Running $* ..." } if $dry_run; then @@ -219,7 +219,7 @@ else for file do if test ! -f $file; then - echo "$0: Cannot find \`$file'" 1>&2 + echo "$0: Cannot find '$file'" 1>&2 exit 1 elif test -n "$symlink_expr"; then linkname=`echo $file | sed "$symlink_expr"` @@ -238,10 +238,10 @@ fi unset passphrase # Reset PATH to be sure that echo is a built-in. We will later use -# `echo $passphrase' to output the passphrase, so it is important that -# it is a built-in (third-party programs tend to appear in `ps' +# 'echo $passphrase' to output the passphrase, so it is important that +# it is a built-in (third-party programs tend to appear in 'ps' # listings with their arguments...). -# Remember this script runs with `set -e', so if echo is not built-in +# Remember this script runs with 'set -e', so if echo is not built-in # it will exit now. PATH=/empty echo -n "Enter GPG passphrase: " stty -echo @@ -252,7 +252,7 @@ echo if test $# -ne 0; then for file do - echo "Signing $file..." + echo "Signing $file ..." rm -f $file.sig echo "$passphrase" | $dbg $GPG --passphrase-fd 0 -ba -o $file.sig $file done @@ -391,7 +391,7 @@ for dest in $to do for file do - echo "Uploading $file to $dest..." + echo "Uploading $file to $dest ..." stmt= files="$file $file.sig" destdir=`echo $dest | sed 's/[^:]*://'` -- 2.7.4