[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-95-gb67ee44

[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=b67ee443339114df67f64ace6b28c7adde4f4965

The branch, master has been updated
       via  b67ee443339114df67f64ace6b28c7adde4f4965 (commit)
       via  05d41b17c7e4f896ac57a2df1de1c26ae1f5ad30 (commit)
       via  77d43d3879a750c549bd3efd27b8e344a685ff72 (commit)
      from  b211937f2106e05d6d3577bf393ae8b4198ce1fb (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 b67ee443339114df67f64ace6b28c7adde4f4965
Merge: b211937f2106e05d6d3577bf393ae8b4198ce1fb 
05d41b17c7e4f896ac57a2df1de1c26ae1f5ad30
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Dec 21 22:24:37 2009 +0100

    Merge branch 'maint'

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

Summary of changes:
 ChangeLog    |   12 ++++++++++++
 lib/gnupload |    7 ++++++-
 m4/python.m4 |    2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a91561f..399a33e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-21  Julien Danjou  <address@hidden>  (tiny change)
+
+       Add support for newer python version
+       * m4/python.m4 (AM_PATH_PYTHON): Add python3.1 to
+       _AM_PYTHON_INTERPRETER_LIST.
+
+2009-12-21  Karl Berry  <address@hidden>
+
+       mention ncftpput in gnupload --help
+       * lib/gnupload: Mention ncftpput in `--help' output.
+       Report by Bruce Korb.
+
 2009-12-06  Ralf Wildenhues  <address@hidden>
 
        * NEWS: Update.
diff --git a/lib/gnupload b/lib/gnupload
index 104f8ad..bd120e8 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2009-11-29.20; # UTC
+scriptversion=2009-12-21.21; # UTC
 
 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation
 #
@@ -96,6 +96,11 @@ Examples:
            --delete oopsbar-0.9.91.tar.gz \\
            -- foobar-0.9.91.tar.gz
 
+gnupload uses the ncftpput program to do the transfers; if you don't
+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 <address@hidden>.
 Send patches to <address@hidden>."
 
diff --git a/m4/python.m4 b/m4/python.m4
index 16de9c3..1dc3985 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -37,7 +37,7 @@ AC_DEFUN([AM_PATH_PYTHON],
   dnl Find a Python interpreter.  Python versions prior to 2.0 are not
   dnl supported. (2.0 was released on October 16, 2000).
   m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-                    [python python2 python3 python3.0 python2.5 python2.4 
python2.3 python2.2 dnl
+                    [python python2 python3 python3.1 python3.0 python2.6 
python2.5 python2.4 python2.3 python2.2 dnl
 python2.1 python2.0])
 
   m4_if([$1],[],[


hooks/post-receive
-- 
GNU Automake