- Added a note about fixversions.py

- Ran it.

7 files changed, 58 insertions, 64 deletions

diff --git a/Mac/OSX/README b/Mac/OSX/README
index 1656e61..d618915 100644
--- a/Mac/OSX/README
+++ b/Mac/OSX/README
@@ -119,6 +119,10 @@ non-GUI and GUI python scripts from the command line, respectively.
 6. How do I create a binary distribution?
 -----------------------------------------
 
+First go to Mac/OSX and run "python fixversions.py -a" with the Python
+you are going to distribute. This will fix the version numbers and copyright
+strings in the various Info.plist files.
+
 Go to the Mac/OSX/Dist directory. There you find a script "build" that
 does all the work: it configures and builds a framework Python, installs
 it, creates the installer package file and packs this in a DMG image.
@@ -156,4 +160,4 @@ macresource module and the Mac/OSX/Makefile cater for this, and create
 ".rsrc.df.rsrc" files on the fly that are normal datafork-based resource
 files.
 
-	Jack Jansen, Jack.Jansen@cwi.nl, 20-Jun-2003.
\ No newline at end of file
+	Jack Jansen, Jack.Jansen@cwi.nl, 15-Jul-2004.
\ No newline at end of file
diff --git a/Mac/OSXResources/app/Info.plist b/Mac/OSXResources/app/Info.plist
index 132dece..d6b7bed 100644
--- a/Mac/OSXResources/app/Info.plist
+++ b/Mac/OSXResources/app/Info.plist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
@@ -19,16 +19,8 @@
 	</array>
 	<key>CFBundleExecutable</key>
 	<string>Python</string>
-
 	<key>CFBundleGetInfoString</key>
-	<string>2.4a0, (c) 2003 Python Software Foundation.</string>
-	<key>CFBundleLongVersionString</key>
-	<string>2.4a0, (c) 2003 Python Software Foundation.</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2003 Python Software Foundation.</string>
-	<key>CFBundleShortVersionString</key>
-	<string>2.4a0</string>
-
+	<string>2.4alpha1, (c) 2004 Python Software Foundation.</string>
 	<key>CFBundleHelpBookFolder</key>
 	<array>
 		<string>Documentation</string>
@@ -38,26 +30,31 @@
 	<string>MacPython Help</string>
 	<key>CFBundleHelpTOCFile</key>
 	<string>index.html</string>
-
 	<key>CFBundleIconFile</key>
 	<string>PythonInterpreter.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.python.python</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string>2.4alpha1, (c) 2004 Python Software Foundation.</string>
 	<key>CFBundleName</key>
 	<string>Python</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.4alpha1</string>
 	<key>CFBundleSignature</key>
 	<string>PytX</string>
 	<key>CFBundleVersion</key>
-	<string>2.4a0</string>
-	<key>LSRequiresCarbon</key>
-    <true/>
+	<string>2.4alpha1</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
+	<key>LSRequiresCarbon</key>
+	<true/>
 	<key>NSAppleScriptEnabled</key>
 	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>(c) 2004 Python Software Foundation.</string>
 </dict>
 </plist>
diff --git a/Mac/OSXResources/framework/version.plist b/Mac/OSXResources/framework/version.plist
index 40ec64e..4c28ffa 100644
--- a/Mac/OSXResources/framework/version.plist
+++ b/Mac/OSXResources/framework/version.plist
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
 <dict>
 	<key>BuildVersion</key>
 	<string>1</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.4a0</string>
+	<string>2.4alpha1</string>
 	<key>CFBundleVersion</key>
-	<string>2.4a0</string>
+	<string>2.4alpha1</string>
 	<key>ProjectName</key>
 	<string>Python</string>
 	<key>ReleaseStatus</key>
diff --git a/Mac/Tools/IDE/PackageManager.plist b/Mac/Tools/IDE/PackageManager.plist
index 9d582d6..d61e00f 100644
--- a/Mac/Tools/IDE/PackageManager.plist
+++ b/Mac/Tools/IDE/PackageManager.plist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
@@ -9,33 +9,31 @@
 	</array>
 	<key>CFBundleExecutable</key>
 	<string>PackageManager</string>
-
 	<key>CFBundleGetInfoString</key>
-	<string>2.3.2, (c) 2003 Python Software Foundation.</string>
-	<key>CFBundleLongVersionString</key>
-	<string>2.3.2, (c) 2003 Python Software Foundation.</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2003 Python Software Foundation.</string>
-	<key>CFBundleShortVersionString</key>
-	<string>2.3.2</string>
-
+	<string>2.4alpha1, (c) 2004 Python Software Foundation.</string>
 	<key>CFBundleIconFile</key>
 	<string>PackageManager.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.python.pythonide</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string>2.4alpha1, (c) 2004 Python Software Foundation.</string>
 	<key>CFBundleName</key>
 	<string>PythonIDE</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.4alpha1</string>
 	<key>CFBundleSignature</key>
 	<string>Pide</string>
 	<key>CFBundleVersion</key>
-	<string>2.3.2</string>
-	<key>LSRequiresCarbon</key>
-    <true/>
+	<string>2.4alpha1</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
+	<key>LSRequiresCarbon</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>(c) 2004 Python Software Foundation.</string>
 </dict>
 </plist>
diff --git a/Mac/Tools/IDE/PythonIDE.plist b/Mac/Tools/IDE/PythonIDE.plist
index a3f9229..0ba8f32 100644
--- a/Mac/Tools/IDE/PythonIDE.plist
+++ b/Mac/Tools/IDE/PythonIDE.plist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
@@ -25,16 +25,8 @@
 	</array>
 	<key>CFBundleExecutable</key>
 	<string>PythonIDE</string>
-
 	<key>CFBundleGetInfoString</key>
-	<string>2.4a0, (c) 2003 Python Software Foundation.</string>
-	<key>CFBundleLongVersionString</key>
-	<string>2.4a0, (c) 2003 Python Software Foundation.</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2003 Python Software Foundation.</string>
-	<key>CFBundleShortVersionString</key>
-	<string>2.4a0</string>
-
+	<string>2.4alpha1, (c) 2004 Python Software Foundation.</string>
 	<key>CFBundleHelpBookFolder</key>
 	<array>
 		<string>PythonDocumentation</string>
@@ -43,24 +35,29 @@
 	<string>Python Help</string>
 	<key>CFBundleHelpTOCFile</key>
 	<string>index.html</string>
-
 	<key>CFBundleIconFile</key>
 	<string>PythonIDE.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.python.pythonide</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string>2.4alpha1, (c) 2004 Python Software Foundation.</string>
 	<key>CFBundleName</key>
 	<string>PythonIDE</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.4alpha1</string>
 	<key>CFBundleSignature</key>
 	<string>Pide</string>
 	<key>CFBundleVersion</key>
-	<string>2.3.2</string>
-	<key>LSRequiresCarbon</key>
-    <true/>
+	<string>2.4alpha1</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
+	<key>LSRequiresCarbon</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>(c) 2004 Python Software Foundation.</string>
 </dict>
 </plist>
diff --git a/Mac/Tools/IDE/PythonIDE.py b/Mac/Tools/IDE/PythonIDE.py
index fb991b0..1ea7711 100644
--- a/Mac/Tools/IDE/PythonIDE.py
+++ b/Mac/Tools/IDE/PythonIDE.py
@@ -3,7 +3,7 @@
 # keep this (__main__) as clean as possible, since we are using 
 # it like the "normal" interpreter.
 
-__version__ = '1.0.1'
+__version__ = '1.0.2'
 import sys
 import os
 
diff --git a/Mac/scripts/BuildApplet.plist b/Mac/scripts/BuildApplet.plist
index 1301dd4..ec62881 100644
--- a/Mac/scripts/BuildApplet.plist
+++ b/Mac/scripts/BuildApplet.plist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
@@ -25,33 +25,31 @@
 	</array>
 	<key>CFBundleExecutable</key>
 	<string>BuildApplet</string>
-
 	<key>CFBundleGetInfoString</key>
-	<string>2.3.2, (c) 2003 Python Software Foundation.</string>
-	<key>CFBundleLongVersionString</key>
-	<string>2.3.2, (c) 2003 Python Software Foundation.</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2003 Python Software Foundation.</string>
-	<key>CFBundleShortVersionString</key>
-	<string>2.3.2</string>
-
+	<string>2.4alpha1, (c) 2004 Python Software Foundation.</string>
 	<key>CFBundleIconFile</key>
 	<string>BuildApplet.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.python.buildapplet</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string>2.4alpha1, (c) 2004 Python Software Foundation.</string>
 	<key>CFBundleName</key>
 	<string>PythonIDE</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.4alpha1</string>
 	<key>CFBundleSignature</key>
 	<string>Pide</string>
 	<key>CFBundleVersion</key>
-	<string>2.3.2</string>
-	<key>LSRequiresCarbon</key>
-    <true/>
+	<string>2.4alpha1</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
+	<key>LSRequiresCarbon</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>(c) 2004 Python Software Foundation.</string>
 </dict>
 </plist>