[Python-checkins] python/nondist/peps pep-0314.txt,1.2,1.3

[akuchling@users.sourceforge.net]

Update of /cvsroot/python/python/nondist/peps
In directory sc8-pr-cvs1:/tmp/cvs-serv1592

Modified Files:
	pep-0314.txt 
Log Message:
Add Obsoletes and Conflicts; wording tweak

Index: pep-0314.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0314.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pep-0314.txt	12 Apr 2003 20:16:20 -0000	1.2
--- pep-0314.txt	12 Apr 2003 21:16:50 -0000	1.3
***************
*** 260,264 ****
      Provides (multiple use)
  
!       Each entry contains a string describing some other component or
        module that will be provided by this package once it is
        installed.  These strings should match the ones used in
--- 260,264 ----
      Provides (multiple use)
  
!       Each entry contains a string describing a component or
        module that will be provided by this package once it is
        installed.  These strings should match the ones used in
***************
*** 273,279 ****
--- 273,311 ----
            Provides: xml.dom
  
+     Obsoletes (multiple use)
+ 
+       Each entry contains a string describing a component or module
+       that this package renders obsolete, meaning that the two packages
+       should not be installed at the same time.  Version declarations
+       cannot be supplied.  (XXX Or are they needed for Obsoletes?)
+ 
+       The most common use of this field will be in case a package name
+       changes, e.g. Gorgon 2.3 gets subsumed into Torqued Python 1.0.
+       When you install Torqued Python, the Gorgon package should be
+       removed.
+       
+       Example:
+ 
+           Obsoletes: Gorgon
+ 
+     Conflicts (multiple use)
+ 
+       Each entry contains a string describing a component or module
+       that conflicts with this package, meaning that the two packages
+       should not be installed at the same time.  Version declarations
+       cannot be supplied.  
+ 
+       Conflict resolution probably isn't very important for Python
+       programs, because few extensions will cause problems for other
+       extensions, unless they're using the same package name.  This 
+       field name is being defined here for future use.
+ 
+           Conflicts: Gorgon
+ 
+ 
  Acknowledgements
  
      None yet.        
+ 
  
  Copyright