[Python-checkins] CVS: python/dist/src/Mac/Distributions binary.exclude,1.11,1.12 binary.include,1.20,1.21 dev.exclude,1.8,1.9 dev.include,1.24,1.25

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Distributions
In directory usw-pr-cvs1:/tmp/cvs-serv16564/Distributions

Modified Files:
	binary.exclude binary.include dev.exclude dev.include 
Log Message:
Merging changes from release22-branch.



Index: binary.exclude
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Distributions/binary.exclude,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** binary.exclude	2001/12/20 20:41:44	1.11
--- binary.exclude	2001/12/27 23:01:17	1.12
***************
*** 35,36 ****
--- 35,37 ----
  Setup.in
  [(]*[)]
+ *~[0-9]

Index: binary.include
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Distributions/binary.include,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** binary.include	2001/12/20 20:41:45	1.20
--- binary.include	2001/12/27 23:01:17	1.21
***************
*** 128,131 ****
--- 128,132 ----
  (':Mac:Contrib:Sherlock', '')
  (':Mac:Contrib:Tabcleaner', '')
+ (':Mac:Contrib:mpwsystem', '')
  (':Mac:Contrib:osam:OSAm.carbon.slb', '')
  (':Mac:Contrib:osam:OSAm.exp', None)
***************
*** 150,153 ****
--- 151,155 ----
  (':Mac:ReadMe-dev', None)
  (':Mac:ReadMe-src', None)
+ (':Mac:ReadMe~0', None)
  (':Mac:ReadmeSource', None)
  (':Mac:Relnotes', ':Relnotes:')
***************
*** 220,223 ****
  (':setup.py', None)
  (':site-packages', None)
- (':Mac:ReadMe~0', None)
- (':Mac:Contrib:mpwsystem', '')
--- 222,223 ----

Index: dev.exclude
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Distributions/dev.exclude,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dev.exclude	2001/11/30 14:16:29	1.8
--- dev.exclude	2001/12/27 23:01:17	1.9
***************
*** 18,19 ****
--- 18,20 ----
  CVS
  [(]*[)]
+ *~[0-9]

Index: dev.include
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Distributions/dev.include,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** dev.include	2001/12/20 20:41:45	1.24
--- dev.include	2001/12/27 23:01:17	1.25
***************
*** 64,74 ****
--- 64,77 ----
  (':Mac:Build:Printing.mcp.exp', None)
  (':Mac:Build:Printing.mcp.xml', None)
+ (':Mac:Build:PythonCore.axp', None)
  (':Mac:Build:PythonCore.exp', None)
  (':Mac:Build:PythonCore.mcp', None)
  (':Mac:Build:PythonCoreCarbon.exp', None)
  (':Mac:Build:PythonInterpreter.mcp', None)
+ (':Mac:Build:PythonInterpreter.old.mcp', None)
  (':Mac:Build:PythonStandSmall.mcp', None)
  (':Mac:Build:PythonStandSmall.mcp~0', None)
  (':Mac:Build:PythonStandSmall.mcp~1', None)
+ (':Mac:Build:PythonStandSmall.old.mcp', None)
  (':Mac:Build:PythonStandalone.mcp', None)
  (':Mac:Build:PythonStandalone.mcp~0', None)
***************
*** 105,108 ****
--- 108,117 ----
  (':Mac:Build:_CF.carbon.mcp.exp', None)
  (':Mac:Build:_CF.carbon.mcp.xml', None)
+ (':Mac:Build:_CG.carbon.mcp', None)
+ (':Mac:Build:_CG.carbon.mcp.exp', None)
+ (':Mac:Build:_CG.carbon.old.mcp', None)
+ (':Mac:Build:_CarbonEvt.carbon.mcp', None)
+ (':Mac:Build:_CarbonEvt.carbon.mcp.exp', None)
+ (':Mac:Build:_CarbonEvt.carbon.mcp.xml', None)
  (':Mac:Build:_Cm.carbon.mcp', None)
  (':Mac:Build:_Cm.carbon.mcp.exp', None)
***************
*** 224,227 ****
--- 233,237 ----
  (':Mac:Build:_dummy_tkinter.mcp', None)
  (':Mac:Build:_dummy_tkinter.mcp.exp', None)
+ (':Mac:Build:_dummy_tkinter.old.mcp', None)
  (':Mac:Build:_hotshot.carbon.mcp', None)
  (':Mac:Build:_hotshot.carbon.mcp.exp', None)
***************
*** 374,377 ****
--- 384,388 ----
  (':Mac:ReadMe-dev', ':')
  (':Mac:ReadMe-src', None)
+ (':Mac:ReadMe~0', None)
  (':Mac:Relnotes', None)
  (':Mac:Relnotes-source', None)
***************
*** 530,533 ****
--- 541,546 ----
  (':Modules:threadmodule.c', None)
  (':Modules:timemodule.c', None)
+ (':Modules:timemodule.c~0', None)
+ (':Modules:timemodule.c~1', None)
  (':Modules:timing.h', None)
  (':Modules:timingmodule.c', None)
***************
*** 601,615 ****
  (':setup.py', None)
  (':site-packages', None)
- (':Mac:Build:_CG.carbon.old.mcp', None)
- (':Mac:Build:_CG.carbon.mcp.exp', None)
- (':Mac:Build:_CG.carbon.mcp', None)
- (':Mac:Build:_CarbonEvt.carbon.mcp.xml', None)
- (':Mac:Build:_CarbonEvt.carbon.mcp.exp', None)
- (':Mac:Build:_CarbonEvt.carbon.mcp', None)
- (':Mac:ReadMe~0', None)
- (':Modules:timemodule.c~1', None)
- (':Modules:timemodule.c~0', None)
- (':Mac:Build:PythonStandSmall.old.mcp', None)
- (':Mac:Build:PythonInterpreter.old.mcp', None)
- (':Mac:Build:PythonCore.axp', None)
- (':Mac:Build:_dummy_tkinter.old.mcp', None)
--- 614,615 ----