[Python-checkins] python/nondist/peps pep-0314.txt,1.6,1.7

[akuchling@users.sourceforge.net]

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

Modified Files:
	pep-0314.txt 
Log Message:
Allow version declarations everywhere

Index: pep-0314.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0314.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pep-0314.txt	29 Apr 2003 17:02:46 -0000	1.6
--- pep-0314.txt	29 Apr 2003 17:17:04 -0000	1.7
***************
*** 275,279 ****
        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
--- 275,279 ----
        that this package renders obsolete, meaning that the two packages
        should not be installed at the same time.  Version declarations
!       can be supplied.  
  
        The most common use of this field will be in case a package name
***************
*** 291,295 ****
        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
--- 291,295 ----
        that conflicts with this package, meaning that the two packages
        should not be installed at the same time.  Version declarations
!       can be supplied.  
  
        Conflict resolution probably isn't very important for Python