[Python-checkins] r72790 - in python/branches/py3k: Mac/BuildScript/resources/ReadMe.txt Mac/BuildScript/scripts/postflight.patch-profile

[ronald.oussoren]

Author: ronald.oussoren
Date: Tue May 19 21:30:44 2009
New Revision: 72790

Log:
Merged revisions 72789 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72789 | ronald.oussoren | 2009-05-19 21:29:24 +0200 (Tue, 19 May 2009) | 2 lines
  
  Remove some traces of 'MacPython'
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Mac/BuildScript/resources/ReadMe.txt
   python/branches/py3k/Mac/BuildScript/scripts/postflight.patch-profile

Modified: python/branches/py3k/Mac/BuildScript/resources/ReadMe.txt
==============================================================================
--- python/branches/py3k/Mac/BuildScript/resources/ReadMe.txt	(original)
+++ python/branches/py3k/Mac/BuildScript/resources/ReadMe.txt	Tue May 19 21:30:44 2009
@@ -1,4 +1,4 @@
-This package will install MacPython $FULL_VERSION for Mac OS X
+This package will install Python $FULL_VERSION for Mac OS X
 $MACOSX_DEPLOYMENT_TARGET for the following 
 architecture(s): $ARCHITECTURES.
 
@@ -12,7 +12,7 @@
 though the installer does not enforce this, otherwise
 things will not work.
 
-MacPython consists of the Python programming language
+Python consists of the Python programming language
 interpreter, plus a set of programs to allow easy
 access to it for Mac users including an integrated development
 environment, IDLE, plus a set of pre-built extension modules
@@ -25,8 +25,5 @@
 by default you have to add the "bin" directory inside
 the framework to you shell's search path.
 
-More information on MacPython can be found at
-http://www.python.org/download/mac/.
-
 More information on Python in general can be found at
 http://www.python.org.

Modified: python/branches/py3k/Mac/BuildScript/scripts/postflight.patch-profile
==============================================================================
--- python/branches/py3k/Mac/BuildScript/scripts/postflight.patch-profile	(original)
+++ python/branches/py3k/Mac/BuildScript/scripts/postflight.patch-profile	Tue May 19 21:30:44 2009
@@ -57,7 +57,7 @@
 		cp -fp "${RC}" "${RC}.pysave"
 	fi
 	echo "" >> "${RC}"
-	echo "# Setting PATH for MacPython ${PYVER}" >> "${RC}"
+	echo "# Setting PATH for Python ${PYVER}" >> "${RC}"
 	echo "# The orginal version is saved in .cshrc.pysave" >> "${RC}"
 	echo "set path=(${PYTHON_ROOT}/bin "'$path'")" >> "${RC}"
 	if [ `id -ur` = 0 ]; then
@@ -86,7 +86,7 @@
 	cp -fp "${PR}" "${PR}.pysave"
 fi
 echo "" >> "${PR}"
-echo "# Setting PATH for MacPython ${PYVER}" >> "${PR}"
+echo "# Setting PATH for Python ${PYVER}" >> "${PR}"
 echo "# The orginal version is saved in `basename ${PR}`.pysave" >> "${PR}"
 echo 'PATH="'"${PYTHON_ROOT}/bin"':${PATH}"' >> "${PR}"
 echo 'export PATH' >> "${PR}"