[pypy-svn] r16646 - in pypy/release/0.7.x: . pypy/doc/tool

[hpk at codespeak.net]

Author: hpk
Date: Fri Aug 26 17:44:36 2005
New Revision: 16646

Modified:
   pypy/release/0.7.x/LICENSE
   pypy/release/0.7.x/pypy/doc/tool/makecontributor.py
Log:
issue52 testing 

- shortened the LICENSE file to adjust to current copyright 
  holders generated from makecontributor.py script. 
  Some people were removed that explicitely said so 
  or only did very minor contributions. 

- moved py lib's licensing info into its own py/LICENSE 

still there is some LICENSING info missing at least
in module/unicodedata. Arre is currently looking into that. 



Modified: pypy/release/0.7.x/LICENSE
==============================================================================
--- pypy/release/0.7.x/LICENSE	(original)
+++ pypy/release/0.7.x/LICENSE	Fri Aug 26 17:44:36 2005
@@ -1,9 +1,9 @@
-License for files in the pypy and py directory 
-============================================== 
+License for files in the pypy/ directory 
+==================================================
 
 Except when otherwise stated (look for LICENSE files in directories or
 information at the beginning of each file) all software and
-documentation in the 'pypy' and 'py' directories is licensed as follows: 
+documentation in the 'pypy' directories is licensed as follows: 
 
     The MIT License
 
@@ -37,37 +37,24 @@
     Armin Rigo <arigo at tunes.org>
     Samuele Pedroni <pedronis at strakt.com>
     Holger Krekel <hpk at trillke.net>
-    Michael Hudson <mwh at python.net>
     Christian Tismer <tismer at tismer.com>
+    Michael Hudson <mwh at python.net>
+    Carl Friedrich Bolz <cfbolz at gmx.de>
+    Eric van Riet Paap <eric at vanrietpaap.nl>
+    Richard Emslie <rxe at ukshells.co.uk>
+    Anders Chrigstrom <ac at strakt.com>
     Seo Sanghyeon <sanxiyn at gmail.com>
     Alex Martelli <aleaxit at yahoo.com>
-    Stefan Schwarzer <sschwarzer at sschwarzer.de>
+    Anders Lehmann <serendipity-soft at get2net.dk>
     Patrick Maupin <pmaupin at speakeasy.net>
-    Carl Friedrich Bolz <cfbolz at gmx.de>
+    Ludovic Aubry <ludovic.aubry at logilab.fr>
     Bob Ippolito <bob at redivi.com>
-    Anders Chrigstrom <ac at strakt.com>
+    Adrien Di Mascio <adim at logilab.fr>
     Jacob Hallen <jacob at strakt.com>
-    Marius Gedminas <mgedmin at b4net.lt>
     Laura Creighton <lac at strakt.com>
+    Marius Gedminas <mgedmin at b4net.lt>
+    Niklaus Haldimann <nhaldimann at gmx.ch>
     Guido van Rossum <guido at python.org>
-    Richard Emslie <rxe at ukshells.co.uk>
-    Ludovic Aubry <ludovic.aubry at logilab.fr>
-    Adrien Di Mascio <adim at logilab.fr>
-    Stephan Diehl <>
-    Dinu Gherman <gherman at darwin.in-berlin.de>
-    Guenter Jantzen <Guenter.Jantzen at t-mobile.de>
-    Anders Lehmann <serendipity-soft at get2net.dk>
-    Rocco Moretti <roccomoretti at hotpop.com>
-    Olivier Dormond <olivier.dormond at gmail.com>
-    Brian Dorsey <briandorsey at gmail.com>
-    Jonathan David Riehl <jriehl at spaceship.com>
-    Andreas Friedge <andreas at trillke.net>
-    Jens-Uwe Mager <jum at anubis.han.de>
-    Alan McIntyre <alan.mcintyre at esrgtech.com>
-    Lutz Paelike <lutz_p at gmx.net>
-    Jacek Generowicz <jacek.generowicz at cern.ch>
-    Ben Young <ben at transversal.com>
-    Michael Chermside <mcherm at mcherm.com>
 
     Heinrich-Heine University, Germany 
     AB Strakt, Sweden  
@@ -77,31 +64,12 @@
     DFKI GmbH, Germany 
 
  
-py lib Copyright holders, 2003-2005 
------------------------------------ 
-
-Except when otherwise stated (look for LICENSE files or information at
-the beginning of each file) the files in the 'py' directory are
-copyrighted by one or more of the following people and organizations:    
-
-    Holger Krekel <hpk at trillke.net>
-    merlinux GmbH, Germany <office at merlinux.de>
-    Armin Rigo <arigo at tunes.org>
-    Jan Balster <jan at balster.info>
-
-Contributors include:: 
-
-    Ian Bicking <ianb at colorstudy.com>
-    Grig Gheorghiu <grig at gheorghiu.net>
-    Bob Ippolito <bob at redivi.com>
-
-
-License for 'lib-python/2.3.4' and 'lib-python/2.3.4-modified'
+License for 'lib-python/2.4.1' and 'lib-python/2.4.1-modified'
 ============================================================== 
 
-Except when otherwise stated (look for LICENSE files or information at
-the beginning of each file) the files in the 'lib-python/2.3.4' 
-and 'lib-python/2.3.4-modified' directories are all copyrighted
-by the Python Software Foundation and licensed under the Python 
-Software License of which you can find a copy here:  
+Except when otherwise stated (look for LICENSE files or
+copyright/license information at the beginning of each file) the files
+in the 'lib-python/2.4.1' and 'lib-python/2.4.1-modified' directories
+are all copyrighted by the Python Software Foundation and licensed under
+the Python Software License of which you can find a copy here:
 http://www.python.org/doc/Copyright.html 

Modified: pypy/release/0.7.x/pypy/doc/tool/makecontributor.py
==============================================================================
--- pypy/release/0.7.x/pypy/doc/tool/makecontributor.py	(original)
+++ pypy/release/0.7.x/pypy/doc/tool/makecontributor.py	Fri Aug 26 17:44:36 2005
@@ -26,6 +26,9 @@
 import uconf # http://codespeak.net/svn/uconf/dist/uconf 
 
 for author, count in items: 
-    realname = uconf.system.User(author).realname  # only works on codespeak 
-    print "   ", realname 
+    user = uconf.system.User(author)
+    realname = user.realname 
+    email = user.email 
+    #print "%5d" % count, "   ", realname, "<%s>" % email 
+    print "   ", realname, "<%s>" % email