[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-78-gc0a2114

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=c0a2114a002397071cc6966d0c8832cf2fae40b6

The branch, master has been updated
       via  c0a2114a002397071cc6966d0c8832cf2fae40b6 (commit)
       via  f26e642bb2b4801d72a76d232ab4b330208b6c74 (commit)
       via  375912c466b28a6121d351b9ff5513133a1c7227 (commit)
       via  f5d5e459eb030d6c7c199919555ca167839b3bfa (commit)
      from  9339323e4bda63b091055ef8dd3ab9d6f34250a9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c0a2114a002397071cc6966d0c8832cf2fae40b6
Merge: 9339323e4bda63b091055ef8dd3ab9d6f34250a9 
f26e642bb2b4801d72a76d232ab4b330208b6c74
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Nov 29 22:27:48 2009 +0100

    Merge branch 'maint'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog            |   18 ++++++++++++++++++
 Makefile.am          |    1 +
 Makefile.in          |    1 +
 lib/Automake/Wrap.pm |    2 +-
 lib/gnupload         |   48 +++++++++++++++++++++---------------------------
 5 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d48efd4..d835fd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2009-11-29  Karl Berry  <address@hidden>
+
+       Rewrite `gnupload --help' examples.
+       * lib/gnupload: Use GNU style version numbers, a generic package
+       name, and more useful examples.
+
+2009-11-28  Jim Meyering  <address@hidden>
+
+       avoid a warning from perl-5.11
+       * lib/Automake/Wrap.pm (_tab_length): Remove useless use of tr's
+       "/d" modifier.
+
+2009-11-14  Ralf Wildenhues  <address@hidden>
+
+       Distribute the Automake bootstrap script.
+       * Makefile.am (EXTRA_DIST): Add bootstrap.
+       Report by Jan Engelhardt.
+
 2009-11-14  Ralf Wildenhues  <address@hidden>
 
        Coverage for corner cases in derive_suffix.
diff --git a/Makefile.am b/Makefile.am
index 70cb642..0c3f438 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,6 +39,7 @@ EXTRA_DIST = \
   ChangeLog.02 \
   ChangeLog.03 \
   ChangeLog.04 \
+  bootstrap \
   $(AUTOMAKESOURCES)
 
 ## Make versioned links.  We only run the transform on the root name;
diff --git a/Makefile.in b/Makefile.in
index 606c9ac..46a87d8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -242,6 +242,7 @@ EXTRA_DIST = \
   ChangeLog.02 \
   ChangeLog.03 \
   ChangeLog.04 \
+  bootstrap \
   $(AUTOMAKESOURCES)
 
 do_subst = sed \
diff --git a/lib/Automake/Wrap.pm b/lib/Automake/Wrap.pm
index ad1d81e..59b3e5a 100644
--- a/lib/Automake/Wrap.pm
+++ b/lib/Automake/Wrap.pm
@@ -55,7 +55,7 @@ sub _tab_length($)
 {
   my ($txt) = @_;
   my $len = length ($txt);
-  $len += 7 * ($txt =~ tr/\t/\t/d);
+  $len += 7 * ($txt =~ tr/\t/\t/);
   return $len;
 }
 
diff --git a/lib/gnupload b/lib/gnupload
index 8320b58..104f8ad 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2009-11-29.20; # UTC
 
 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation
 #
@@ -73,34 +73,28 @@ actual command line options.  Use this to keep your 
defaults.  Comments
 (#) and empty lines in $conffile are allowed.
 
 Examples:
-1. Upload automake-1.8.2b.tar.gz and automake-1.8.2b.tar.bz2 to two sites:
-  gnupload --to sources.redhat.com:~ftp/pub/automake \\
-           --to alpha.gnu.org:automake \\
-           automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2
-
-2. Same as above, but also create symbolic links to automake-latest.tar.*:
-  gnupload --to sources.redhat.com:~ftp/pub/automake \\
-           --to alpha.gnu.org:automake \\
-           --symlink-regex \\
-           automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2
-
-3. Symlink automake-1.8.2b.tar.gz to automake-latest.tar.gz and
-automake-1.8.2b.tar.bz2 to automake-latest.tar.bz2 on both sites:
+1. Upload foobar-1.0.tar.gz to ftp.gnu.org:
+  gnupload --to ftp.gnu.org:foobar foobar-1.0.tar.gz
 
-  gnupload --to sources.redhat.com:~ftp/pub/automake \\
-           --to alpha.gnu.org:automake \\
-           --symlink automake-1.8.2b.tar.gz automake-latest.tar.gz \\
-                     automake-1.8.2b.tar.bz2 automake-latest.tar.bz2
+2. Upload foobar-1.0.tar.gz and foobar-1.0.tar.xz to ftp.gnu.org:
+  gnupload --to ftp.gnu.org:foobar foobar-1.0.tar.gz foobar-1.0.tar.xz
 
-4. Delete automake-1.8.2a.tar.gz and .bz2, remove symlink
-automake-latest.tar.gz and upload automake-1.8.2b.tar.gz:
-
-  gnupload --to sources.redhat.com:~ftp/pub/automake \\
-           --to alpha.gnu.org:automake \\
-           --delete automake-1.8.2a.tar.gz automake-1.8.2a.tar.bz2 \\
-           --rmsymlink automake-latest.tar.gz \\
-           -- \\
-           automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2
+3. Same as above, and also create symbolic links to foobar-latest.tar.*:
+  gnupload --to ftp.gnu.org:foobar \\
+           --symlink-regex \\
+           foobar-1.0.tar.gz foobar-1.0.tar.xz
+
+4. Upload foobar-0.9.90.tar.gz to two sites:
+  gnupload --to alpha.gnu.org:foobar \\
+           --to sources.redhat.com:~ftp/pub/foobar \\
+           foobar-0.9.90.tar.gz
+
+5. Delete oopsbar-0.9.91.tar.gz and upload foobar-0.9.91.tar.gz
+   (the -- terminates the list of files to delete):
+  gnupload --to alpha.gnu.org:foobar \\
+           --to sources.redhat.com:~ftp/pub/foobar \\
+           --delete oopsbar-0.9.91.tar.gz \\
+           -- foobar-0.9.91.tar.gz
 
 Report bugs to <address@hidden>.
 Send patches to <address@hidden>."


hooks/post-receive
-- 
GNU Automake