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.

diff --git a/ChangeLog b/ChangeLog
index a2dcf16..8b82eed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-15  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       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  <bruno@clisp.org>
 
        Fix module 'random'.

diff --git a/build-aux/gnupload b/build-aux/gnupload
index 209f875..51e17c6 100755 (executable)
--- a/build-aux/gnupload
+++ b/build-aux/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 <http://www.gnu.org/licenses/>.
 
 # Originally written by Alexandre Duret-Lutz <adl@gnu.org>.
+# 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
 
@@ -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 <bug-automake@gnu.org>.
-Send patches to <automake-patches@gnu.org>."
+Send patches and bug reports to <bug-gnulib@gnu.org>."
 
 # Read local configuration file
 if test -r "$conffile"; then

diff --git a/config/srclist.txt b/config/srclist.txt
index ba3143a..290f140 100644 (file)
--- 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