[Checkins] SVN: van.pydeb/trunk/ Make python-pkg-resources the default translation for setuptools.

[Brian Sutherland]

Log message for revision 103391:
  Make python-pkg-resources the default translation for setuptools.
  
  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=543551
  

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

-=-
Modified: van.pydeb/trunk/CHANGES.txt
===================================================================
--- van.pydeb/trunk/CHANGES.txt	2009-08-30 03:50:18 UTC (rev 103390)
+++ van.pydeb/trunk/CHANGES.txt	2009-08-31 08:59:07 UTC (rev 103391)
@@ -9,6 +9,8 @@
 * Append the output of the generate script to van/pydeb/py_to_bin.txt.
 * Expose _default functions for package conversions so that generate can check
   it's results and weed out extra packages that match the default conversions.
+* Make python-pkg-resources the default translation for setuptools:
+  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=543551
 
 1.2.1 (2009-06-15)
 ------------------

Modified: van.pydeb/trunk/van/pydeb/py_to_bin.txt
===================================================================
--- van.pydeb/trunk/van/pydeb/py_to_bin.txt	2009-08-30 03:50:18 UTC (rev 103390)
+++ van.pydeb/trunk/van/pydeb/py_to_bin.txt	2009-08-31 08:59:07 UTC (rev 103391)
@@ -7,6 +7,7 @@
 Reportlab                              	python-reportlab
 RestrictedPython			python-restrictedpython
 PyQt4					python-qt4
+setuptools				python-pkg-resources
 
 #
 # The following list is automatically generated from apt-file info by the scripts/generate script

Modified: van.pydeb/trunk/van/pydeb/py_to_src.txt
===================================================================
--- van.pydeb/trunk/van/pydeb/py_to_src.txt	2009-08-30 03:50:18 UTC (rev 103390)
+++ van.pydeb/trunk/van/pydeb/py_to_src.txt	2009-08-31 08:59:07 UTC (rev 103391)
@@ -9,3 +9,4 @@
 ZODB3                                           zodb
 RestrictedPython				restrictedpython
 PyQt4						python-qt4
+setuptools					python-setuptools

Modified: van.pydeb/trunk/van/pydeb/tests/extras.txt
===================================================================
--- van.pydeb/trunk/van/pydeb/tests/extras.txt	2009-08-30 03:50:18 UTC (rev 103390)
+++ van.pydeb/trunk/van/pydeb/tests/extras.txt	2009-08-31 08:59:07 UTC (rev 103391)
@@ -19,7 +19,7 @@
 of this extra are shown in the depends and provides line:
   
     >>> runit('van-pydeb depends --egg-info %s' % zope_component)
-    python-setuptools, python-z3c.recipe.sphinxdoc, python-zodb, python-zope, python-zope.configuration, python-zope.event, python-zope.hookable, python-zope.i18nmessageid, python-zope.interface, python-zope.location, python-zope.proxy, python-zope.security, python-zope.testing
+    python-pkg-resources, python-z3c.recipe.sphinxdoc, python-zodb, python-zope, python-zope.configuration, python-zope.event, python-zope.hookable, python-zope.i18nmessageid, python-zope.interface, python-zope.location, python-zope.proxy, python-zope.security, python-zope.testing
 
 We can have create a provides line for all extras:
 
@@ -33,7 +33,7 @@
 (it goes into Suggests:):
 
     >>> runit('van-pydeb depends --egg-info %s --exclude-extra docs' % zope_component)
-    python-setuptools, python-zodb, python-zope, python-zope.configuration, python-zope.event, python-zope.hookable, python-zope.i18nmessageid, python-zope.interface, python-zope.location, python-zope.proxy, python-zope.security, python-zope.testing
+    python-pkg-resources, python-zodb, python-zope, python-zope.configuration, python-zope.event, python-zope.hookable, python-zope.i18nmessageid, python-zope.interface, python-zope.location, python-zope.proxy, python-zope.security, python-zope.testing
 
 We could also exclude it from the "provides" list:
 
@@ -46,7 +46,7 @@
 Now we decide to move the 'zcml' extra to it's own metapackage, thus we need to separate out it's dependencies:
 
     >>> runit('van-pydeb depends --egg-info %s --exclude-extra docs --exclude-extra zcml' % zope_component)
-    python-setuptools, python-zodb, python-zope, python-zope.event, python-zope.hookable, python-zope.interface, python-zope.location, python-zope.testing
+    python-pkg-resources, python-zodb, python-zope, python-zope.event, python-zope.hookable, python-zope.interface, python-zope.location, python-zope.testing
     >>> runit('van-pydeb depends --egg-info %s --extra zcml' % zope_component)
     python-zope.configuration, python-zope.i18nmessageid, python-zope.proxy, python-zope.security
 

Modified: van.pydeb/trunk/van/pydeb/tests/translations.txt
===================================================================
--- van.pydeb/trunk/van/pydeb/tests/translations.txt	2009-08-30 03:50:18 UTC (rev 103390)
+++ van.pydeb/trunk/van/pydeb/tests/translations.txt	2009-08-31 08:59:07 UTC (rev 103391)
@@ -47,6 +47,32 @@
         >>> print pydeb.bin_to_py("foo")
         foo
 
+Setuptools
+----------
+
+    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.
+
+van.pydeb therefore defaults to defining python-pkg-resources as the debian
+translation od 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")
+    setuptools
+     
+
 Paste
 -----