Hi Jim, thanks for the quick reply. On 01/15/2012 04:20 PM, Jim Meyering wrote: > Stefano Lattarini wrote: >> Hello Gnulibers. >> >> I've recently noticed that the gnupload script present in the automake >> repository is *not* synced from an external source like I thought, and >> like is done for other maintainer-oriented scripts and files that are >> not automake-specific (such as 'INSTALL', 'gitlog-to-changelog' or >> 'config.guess'). Since gnupload is not required by automake-generated >> code (be it configure or Makefile content), and is not specifically >> tied to automake in any way, I propose it to be instead moved to gnulib, >> which already contains the master copy of similar generally-useful, >> maintainer-oriented files (e.g., 'vc-list-files', 'update-copyright', >> or the aforementioned 'gitlog-to-changelog'). >> >> If you agree, I can prepare a patch for both gnulib and automake to >> implement the moving. WDYT? > > I agree. Thanks. > Attached is the proposed patch. I will push as soon as I have an ACK.
Regards, Stefano
>From 7bb34ef4399a77165fd42639ec7f4655edfa9365 Mon Sep 17 00:00:00 2001 Message-Id: <7bb34ef4399a77165fd42639ec7f4655edfa9365.1326642561.git.stefano.lattar...@gmail.com> From: Stefano Lattarini <[email protected]> Date: Sun, 15 Jan 2012 16:49:11 +0100 Subject: [PATCH] gnupload: we hold the master copy of this script now For motivation and more information, see: <http://lists.gnu.org/archive/html/bug-gnulib/2012-01/msg00222.html> * build-aux/gnupload: Make it clear in the heading comments that the master copy of this file is maintained by gnulib. Since we are at it, bump its copyright year and ... ($scriptversion): ... the date in its version. ($usage): Patches and bug reports should be sent to the gnulib list, not the automake one. * config/srclist.txt: Don't try to sync 'gnupload' from automake anymore. --- ChangeLog | 14 ++++++++++++++ build-aux/gnupload | 29 +++++++++++++++-------------- config/srclist.txt | 1 - 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index a2dcf16..8b82eed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2011-01-15 Stefano Lattarini <[email protected]> + + gnupload: we hold the master copy of this script now + For motivation and more information, see: + <http://lists.gnu.org/archive/html/bug-gnulib/2012-01/msg00222.html> + * build-aux/gnupload: Make it clear in the heading comments that the + master copy of this file is maintained by gnulib. Since we are at + it, bump its copyright year and ... + ($scriptversion): ... the date in its version. + ($usage): Patches and bug reports should be sent to the gnulib list, + not the automake one. + * config/srclist.txt: Don't try to sync 'gnupload' from automake + anymore. + 2012-01-15 Bruno Haible <[email protected]> Fix module 'random'. diff --git a/build-aux/gnupload b/build-aux/gnupload index 209f875..cd80257 100755 --- a/build-aux/gnupload +++ b/build-aux/gnupload @@ -1,10 +1,10 @@ #!/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, 2005, 2006, 2007, 2008, 2009, 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 +20,8 @@ scriptversion=2010-05-23.15; # UTC # along with this program. If not, see <http://www.gnu.org/licenses/>. # Originally written by Alexandre Duret-Lutz <[email protected]>. +# The master copy of this file is maintained in the gnulib Git repository. +# Please send bug reports and feature requests to [email protected]. set -e @@ -57,7 +59,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 +107,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 <[email protected]>. -Send patches to <[email protected]>." +Send patches and bug reports to <[email protected]>." # Read local configuration file if test -r "$conffile"; then @@ -170,7 +171,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 +189,7 @@ done dprint() { - echo "Running $* ..." + echo "Running $*..." } if $dry_run; then @@ -219,7 +220,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 +239,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 +253,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 +392,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/[^:]*://'` diff --git a/config/srclist.txt b/config/srclist.txt index ba3143a..290f140 100644 --- a/config/srclist.txt +++ b/config/srclist.txt @@ -8,7 +8,6 @@ $AUTOMAKE/lib/ar-lib build-aux $AUTOMAKE/lib/compile build-aux $AUTOMAKE/lib/depcomp build-aux $AUTOMAKE/lib/elisp-comp build-aux -$AUTOMAKE/lib/gnupload build-aux $AUTOMAKE/lib/install-sh build-aux $AUTOMAKE/lib/mdate-sh build-aux $AUTOMAKE/lib/missing build-aux -- 1.7.7.3
