[Checkins] SVN: van.pydeb/trunk/ setuptools comes from distribute source package in all current dists

[Gediminas Paulauskas]

Log message for revision 122525:
  setuptools comes from distribute source package in all current dists
  

Changed:
  U   van.pydeb/trunk/CHANGES.txt
  U   van.pydeb/trunk/van/pydeb/py_to_src.txt
  U   van.pydeb/trunk/van/pydeb/tests/translations.txt

-=-
Modified: van.pydeb/trunk/CHANGES.txt
===================================================================
--- van.pydeb/trunk/CHANGES.txt	2011-08-10 13:32:25 UTC (rev 122524)
+++ van.pydeb/trunk/CHANGES.txt	2011-08-10 13:37:14 UTC (rev 122525)
@@ -9,6 +9,7 @@
 * py_to_bin_default: do not prepend python- if python package name already
   starts with it.
 * Update automatically updated list from current unstable.
+* setuptools comes from distribute source package.
 
 1.3.2 (2010-06-22)
 ------------------
@@ -37,7 +38,7 @@
 * Add the concept of options to the list of dependencies.
 * Create a "reduced" option that causes warnings to be printed when a reduced
   dependncy is used.
-* Implement a --override-dep option which can be used to override python to
+* Implement a --override-bdep option which can be used to override python to
   binary package dependencies.
 
 1.2.1 (2009-06-15)

Modified: van.pydeb/trunk/van/pydeb/py_to_src.txt
===================================================================
--- van.pydeb/trunk/van/pydeb/py_to_src.txt	2011-08-10 13:32:25 UTC (rev 122524)
+++ van.pydeb/trunk/van/pydeb/py_to_src.txt	2011-08-10 13:37:14 UTC (rev 122525)
@@ -8,9 +8,9 @@
 pyPdf                                           python-pypdf
 PyQt4                                           python-qt4
 pytz                                            python-tz
-Reportlab                                       python-reportlab
+reportlab                                       python-reportlab
 RestrictedPython                                restrictedpython
-setuptools                                      python-setuptools
+setuptools                                      distribute
 SQLAlchemy                                      sqlalchemy
 xlrd                                            python-xlrd
 ZConfig                                         zconfig

Modified: van.pydeb/trunk/van/pydeb/tests/translations.txt
===================================================================
--- van.pydeb/trunk/van/pydeb/tests/translations.txt	2011-08-10 13:32:25 UTC (rev 122524)
+++ van.pydeb/trunk/van/pydeb/tests/translations.txt	2011-08-10 13:37:14 UTC (rev 122525)
@@ -82,24 +82,27 @@
     http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=543551
 
 Setuptools is a special case, most packages in debian which depend on
-setuptools are namespace packages and only require pkg-resources.
+setuptools are namespace packages and only require pkg_resources.
 
 van.pydeb therefore defaults to defining python-pkg-resources as the debian
-translation od setuptools:
+translation of setuptools:
 
     >>> print pydeb.py_to_bin("setuptools")
     python-pkg-resources
-    
-    >>> print pydeb.py_to_src("setuptools")
-    python-setuptools
 
     >>> print pydeb.bin_to_py("python-setuptools")
     setuptools
     >>> print pydeb.bin_to_py("python-pkg-resources")
     setuptools
     
-    >>> print pydeb.src_to_py("python-setuptools")
+In fact setuptools is provided by `distribute` source package
+
+    >>> print pydeb.py_to_src("setuptools")
+    distribute
+    >>> print pydeb.src_to_py("distribute")
     setuptools
+    >>> print pydeb.src_to_py("setuptools")
+    setuptools
      
 
 Paste