33 files changed, 32 insertions, 17 deletions
diff --git a/Mac/Build/App.prj b/Mac/Build/App.prj
index 6b8436c..d94d83d 100644
--- a/Mac/Build/App.prj
+++ b/Mac/Build/App.prj
diff --git a/Mac/Build/Cm.prj b/Mac/Build/Cm.prj
index 79dab7f..583d9a6 100644
--- a/Mac/Build/Cm.prj
+++ b/Mac/Build/Cm.prj
diff --git a/Mac/Build/ColorPicker.prj b/Mac/Build/ColorPicker.prj
index 2b1b60d..d6bb75d 100644
--- a/Mac/Build/ColorPicker.prj
+++ b/Mac/Build/ColorPicker.prj
diff --git a/Mac/Build/Drag.prj b/Mac/Build/Drag.prj
index 5fbc6b2..64e9cca 100644
--- a/Mac/Build/Drag.prj
+++ b/Mac/Build/Drag.prj
diff --git a/Mac/Build/Fm.prj b/Mac/Build/Fm.prj
index a0ff95f..2436aab 100644
--- a/Mac/Build/Fm.prj
+++ b/Mac/Build/Fm.prj
diff --git a/Mac/Build/Help.prj b/Mac/Build/Help.prj
index e74d921..bfa48a3 100644
--- a/Mac/Build/Help.prj
+++ b/Mac/Build/Help.prj
diff --git a/Mac/Build/Icn.prj b/Mac/Build/Icn.prj
index 5025eea..77e76a2 100644
--- a/Mac/Build/Icn.prj
+++ b/Mac/Build/Icn.prj
diff --git a/Mac/Build/List.prj b/Mac/Build/List.prj
index 4c94903..efe8520 100644
--- a/Mac/Build/List.prj
+++ b/Mac/Build/List.prj
diff --git a/Mac/Build/Printing.prj b/Mac/Build/Printing.prj
index f930f5b..4ccd156 100644
--- a/Mac/Build/Printing.prj
+++ b/Mac/Build/Printing.prj
diff --git a/Mac/Build/PythonCore.prj b/Mac/Build/PythonCore.prj
index 00dc799..f1c05e5 100644
--- a/Mac/Build/PythonCore.prj
+++ b/Mac/Build/PythonCore.prj
diff --git a/Mac/Build/PythonCorePPC.prj b/Mac/Build/PythonCorePPC.prj
index bc5873b..95f2882 100644
--- a/Mac/Build/PythonCorePPC.prj
+++ b/Mac/Build/PythonCorePPC.prj
diff --git a/Mac/Build/PythonInterpreter.prj b/Mac/Build/PythonInterpreter.prj
index 54558e0..f7e4b2e 100644
--- a/Mac/Build/PythonInterpreter.prj
+++ b/Mac/Build/PythonInterpreter.prj
diff --git a/Mac/Build/PythonStandSmall.prj b/Mac/Build/PythonStandSmall.prj
index b73b0db..d93f320 100644
--- a/Mac/Build/PythonStandSmall.prj
+++ b/Mac/Build/PythonStandSmall.prj
diff --git a/Mac/Build/Qdoffs.prj b/Mac/Build/Qdoffs.prj
index a50923c..5f436ed 100644
--- a/Mac/Build/Qdoffs.prj
+++ b/Mac/Build/Qdoffs.prj
diff --git a/Mac/Build/Qt.prj b/Mac/Build/Qt.prj
index 1047db8..348501b 100644
--- a/Mac/Build/Qt.prj
+++ b/Mac/Build/Qt.prj
diff --git a/Mac/Build/Scrap.prj b/Mac/Build/Scrap.prj
index 6fd322c..23316cd 100644
--- a/Mac/Build/Scrap.prj
+++ b/Mac/Build/Scrap.prj
diff --git a/Mac/Build/Snd.prj b/Mac/Build/Snd.prj
index 50d1cd6..781af7e 100644
--- a/Mac/Build/Snd.prj
+++ b/Mac/Build/Snd.prj
diff --git a/Mac/Build/Sndihooks.prj b/Mac/Build/Sndihooks.prj
index 4209ff0..245df2b 100644
--- a/Mac/Build/Sndihooks.prj
+++ b/Mac/Build/Sndihooks.prj
diff --git a/Mac/Build/TE.prj b/Mac/Build/TE.prj
index 100f262..48afbda 100644
--- a/Mac/Build/TE.prj
+++ b/Mac/Build/TE.prj
diff --git a/Mac/Build/calldll.ppc.prj b/Mac/Build/calldll.ppc.prj
index 429407e..3a8bc4a 100644
--- a/Mac/Build/calldll.ppc.prj
+++ b/Mac/Build/calldll.ppc.prj
diff --git a/Mac/Build/ctb.prj b/Mac/Build/ctb.prj
index 416e0f3..f09b10c 100644
--- a/Mac/Build/ctb.prj
+++ b/Mac/Build/ctb.prj
diff --git a/Mac/Build/gdbm.prj b/Mac/Build/gdbm.prj
index 0e9b39d..a9c98db 100644
--- a/Mac/Build/gdbm.prj
+++ b/Mac/Build/gdbm.prj
diff --git a/Mac/Build/icglue.prj b/Mac/Build/icglue.prj
index fe7c526..5ab8f68 100644
--- a/Mac/Build/icglue.prj
+++ b/Mac/Build/icglue.prj
diff --git a/Mac/Build/macspeech.prj b/Mac/Build/macspeech.prj
index 2c97623..531f68d 100644
--- a/Mac/Build/macspeech.prj
+++ b/Mac/Build/macspeech.prj
diff --git a/Mac/Build/pyexpat.prj b/Mac/Build/pyexpat.prj
index bfde572..04d8325 100644
--- a/Mac/Build/pyexpat.prj
+++ b/Mac/Build/pyexpat.prj
diff --git a/Mac/Build/ucnhash.prj b/Mac/Build/ucnhash.prj
index b2b1a5e..ab73867 100644
--- a/Mac/Build/ucnhash.prj
+++ b/Mac/Build/ucnhash.prj
diff --git a/Mac/Build/waste.prj b/Mac/Build/waste.prj
index 658b6ee..2df5e86 100644
--- a/Mac/Build/waste.prj
+++ b/Mac/Build/waste.prj
diff --git a/Mac/Build/zlib.prj b/Mac/Build/zlib.prj
index 9dc4088..145a6be 100644
--- a/Mac/Build/zlib.prj
+++ b/Mac/Build/zlib.prj
diff --git a/Mac/Distributions/(vise)/Python 2.0.vct b/Mac/Distributions/(vise)/Python 2.0.vct
index 085042e..6acd929 100644
--- a/Mac/Distributions/(vise)/Python 2.0.vct
+++ b/Mac/Distributions/(vise)/Python 2.0.vct
diff --git a/Mac/Distributions/src.exclude b/Mac/Distributions/src.exclude
index 09723fc..e87fbf7 100644
--- a/Mac/Distributions/src.exclude
+++ b/Mac/Distributions/src.exclude
@@ -6,10 +6,14 @@
 *.hqx
 *.idb
 *.in
+*.lib
 *.pyc
 *.slb
 *.xMAP
 *.xSYM
+.#*
+.cvsignore
+@*
 CVS
 Makefile.pre.in
 PyIDE-src
diff --git a/Mac/Distributions/src.include b/Mac/Distributions/src.include
index 6b271f4..61a0221 100644
--- a/Mac/Distributions/src.include
+++ b/Mac/Distributions/src.include
@@ -23,6 +23,7 @@
 (':Grammar:Makefile', None)
 (':Icon\015', None)
 (':Include', '')
+(':LICENSE', '')
 (':Lib', '')
 (':Mac:Build', '')
 (':Mac:Build:PythonAppletCFM68K', None)
@@ -36,14 +37,25 @@
 (':Mac:Compat', '')
 (':Mac:Contrib', '')
 (':Mac:Demo', '')
-(':Mac:Distributions', None)
-(':Mac:GUSI-mods', '')
+(':Mac:Distributions:68k-shared.exclude', None)
+(':Mac:Distributions:68k-shared.include', None)
+(':Mac:Distributions:68k-stand.exclude', None)
+(':Mac:Distributions:68k-stand.include', None)
+(':Mac:Distributions:binary.exclude', '')
+(':Mac:Distributions:binary.include', '')
+(':Mac:Distributions:dev.exclude', '')
+(':Mac:Distributions:dev.include', '')
+(':Mac:Distributions:readme.txt', '')
+(':Mac:Distributions:src.exclude', '')
+(':Mac:Distributions:src.include', '')
 (':Mac:HISTORY', ':Relnotes:')
+(':Mac:IDE scripts', '')
 (':Mac:Icon\015', None)
 (':Mac:Include', '')
 (':Mac:Lib', '')
 (':Mac:MPW', '')
 (':Mac:Modules', '')
+(':Mac:PlugIns:readme.txt', '')
 (':Mac:Python', '')
 (':Mac:ReadMe', '')
 (':Mac:ReadMe-dev', None)
@@ -51,30 +63,20 @@
 (':Mac:Relnotes', ':Relnotes:')
 (':Mac:Resources', '')
 (':Mac:TODO', None)
+(':Mac:Tools:CGI', '')
+(':Mac:Tools:CGI:BuildCGIApplet', None)
 (':Mac:Tools:IDE', None)
 (':Mac:Tools:Icon\015', None)
 (':Mac:Tools:PyIDE', None)
 (':Mac:Tools:bruce', None)
 (':Mac:Tools:macfreeze', '')
-(':Mac:Tools:twit', '')
 (':Mac:Unsupported', '')
 (':Mac:_checkversion.py', None)
-(':Mac:mwerks:Icon\015', None)
-(':Mac:mwerks:errno_unix.h', '')
-(':Mac:mwerks:macuseshlstart.c', '')
-(':Mac:mwerks:malloc', '')
-(':Mac:mwerks:mwerks_applet_config.h', '')
-(':Mac:mwerks:mwerks_nonshared_config.h', '')
-(':Mac:mwerks:mwerks_plugin_config.h', '')
-(':Mac:mwerks:mwerks_shared_config.h', '')
-(':Mac:mwerks:mwerks_small_config.h', '')
-(':Mac:mwerks:mwerks_tkplugin_config.h', '')
-(':Mac:mwerks:mwfopenrf.c', '')
+(':Mac:mwerks', '')
 (':Mac:mwerks:old', None)
 (':Mac:mwerks:projects', None)
 (':Mac:scripts', '')
 (':Mac:tclmods', '')
-(':Mac:think', '')
 (':Misc', '')
 (':Modules', '')
 (':Objects', '')
@@ -90,14 +92,20 @@
 (':PythonFAT', None)
 (':PythonInterpreter', None)
 (':PythonPPC', None)
+(':PythonStandCarbon', None)
 (':PythonStandSmall', None)
+(':PythonStandSmallShGUSI', None)
+(':PythonStandSmallThreading', None)
+(':PythonStandalone', None)
 (':README', '')
 (':Tools:Icon\015', None)
 (':Tools:README', '')
 (':Tools:audiopy', '')
 (':Tools:bgen', '')
+(':Tools:compiler', '')
 (':Tools:faqwiz', '')
 (':Tools:freeze', '')
+(':Tools:i18n', '')
 (':Tools:idle', '')
 (':Tools:modulator', '')
 (':Tools:pynche', '')
@@ -116,3 +124,6 @@
 (':mkapplet', None)
 (':pystone.py', None)
 (':site-packages', None)
+(':Mac:Distributions:gusi2.include', None)
+(':Mac:Distributions:gusi2.exclude', None)
+(':Tools:unicode:makeunicodedata.py', '')
diff --git a/Mac/Include/macbuildno.h b/Mac/Include/macbuildno.h
index f1bf41a..3b11c1f 100644
--- a/Mac/Include/macbuildno.h
+++ b/Mac/Include/macbuildno.h
@@ -1 +1 @@
-#define BUILD 66
+#define BUILD 71
diff --git a/Mac/_checkversion.py b/Mac/_checkversion.py
index a7ce8ef..22ffc02 100644
--- a/Mac/_checkversion.py
+++ b/Mac/_checkversion.py
@@ -5,7 +5,7 @@ _checkversion.py file"""
 import pyversioncheck
 
 _PACKAGE="MacPython"
-_VERSION="2.0b1"
+_VERSION="2.0"
 _URL="http://www.cwi.nl/~jack/macpythonversion.txt"
 
 try: