[orca] Bump minimum version of Python to 2.7, remove warning about suspending



commit 3ae939820f98ceee556da0b91a03948fb6a02d7f
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Tue Feb 14 11:09:55 2012 -0500

    Bump minimum version of Python to 2.7, remove warning about suspending

 README           |    8 ++++----
 configure.ac     |    2 +-
 src/orca/orca.py |    3 ---
 3 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/README b/README
index a56cd83..d7540a0 100644
--- a/README
+++ b/README
@@ -30,7 +30,7 @@ infrastructure and application bug fixes that help Orca work better.
 Building Orca also requires the development modules for the following
 to be installed:
 
-* Python           - Python platform
+* Python           - Python platform (minimum version 2.7)
 * pygobject-3.0    - Python bindings for the GObject library
 * gtk+-3.0         - Gtk+ toolkit
 * json-py          - a JSON (http://json.org) reader and writer in Python
@@ -39,18 +39,18 @@ to be installed:
 * BrlTTY           - BrlTTY support for braille (optional)
 * BrlAPI           - BrlAPI support for braille (optional)
 
-YOU ALSO NEED THE LATEST AT-SPI AND ATK FOR THE GNOME 3.1.x DEVELOPMENT
+YOU ALSO NEED THE LATEST AT-SPI AND ATK FOR THE GNOME 3.3.x DEVELOPMENT
 RELEASES.  THEY CONTAIN VERY IMPORTANT BUG FIXES!
 
 NOTE: If you have multiple versions of the python interpreter installed
 on your machine, you should set the PYTHON environment variable when 
 configuring Orca.  For example:
 
-   PYTHON=/usr/bin/python2.6 ./autogen.sh
+   PYTHON=/usr/bin/python2.7 ./autogen.sh
 
 or
 
-   PYTHON=/usr/bin/python2.6 ./configure
+   PYTHON=/usr/bin/python2.7 ./configure
 
 NOTE FOR BRLTTY USERS:
 ========================================================================
diff --git a/configure.ac b/configure.ac
index 79c1fe4..6c9ed33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ AC_PROG_INSTALL
 dnl Check for python and python modules needed by Orca
 dnl TODO: check for incompatibilities between Orca and liblouis
 dnl per http://live.gnome.org/Orca/Braille
-AM_PATH_PYTHON(2.4)
+AM_PATH_PYTHON(2.7)
 #AM_CHECK_PYMOD(gobject,,,[AC_MSG_ERROR(Could not find python module: gobject)])
 # Don't require the DISPLAY to be set - the gtk checking will fail 
 # if DISPLAY is not set, and we don't like that.
diff --git a/src/orca/orca.py b/src/orca/orca.py
index b4bd613..b9bcc35 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -245,9 +245,6 @@ parser = argparse.ArgumentParser(
     epilog = _("If Orca has not been previously set up by the user, Orca\n"
                "will automatically launch the preferences set up unless\n"
                "the -n or --no-setup option is used.\n\n"
-               "WARNING: suspending Orca, e.g. by pressing Control-Z, from\n"
-               "an AT-SPI enabled shell (such as gnome-terminal), can also\n"
-               "suspend the desktop until Orca is killed.\n\n"
                "Report bugs to orca-list gnome org "),
     add_help = False, formatter_class = argparse.RawTextHelpFormatter)
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]