Updated python-setuptools dependency info

diff --git a/trunk/python-dispatcher/debian/control b/trunk/python-dispatcher/debian/control
index 20f3081..597ad73 100644 (file)
--- a/trunk/python-dispatcher/debian/control
+++ b/trunk/python-dispatcher/debian/control
@@ -2,7 +2,7 @@ Source: python-dispatcher
 Section: python
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso6), python-setuptools (>= 0.6c3)
+Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso6), python-setuptools (>= 0.6c3) | python2.5-setuptools (>= 0.6c3)
 Standards-Version: 3.6.2.2
 
 Package: python2.5-dispatcher

diff --git a/trunk/python-e_dbus/debian_chinook/control b/trunk/python-e_dbus/debian_chinook/control
index 249fc9d..a4007da 100644 (file)
--- a/trunk/python-e_dbus/debian_chinook/control
+++ b/trunk/python-e_dbus/debian_chinook/control
@@ -2,7 +2,7 @@ Source: python-edbus
 Section: python
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso6), python-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libedbus0-dev (>= 0.1.0.042-maemo3)
+Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso6), python-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libedbus0-dev (>= 0.1.0.042-maemo3) | python2.5-setuptools (>= 0.6c3)
 Standards-Version: 3.6.2.2
 
 Package: python2.5-edbus

diff --git a/trunk/python-ecore/debian/control b/trunk/python-ecore/debian/control
index 3eeb53b..3df8d88 100644 (file)
--- a/trunk/python-ecore/debian/control
+++ b/trunk/python-ecore/debian/control
@@ -2,7 +2,7 @@ Source: python-ecore
 Section: python
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso6), python-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libecore0-dev (>= 0.9.9.042-maemo3), python2.5-cython-dev
+Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso6), python-setuptools (>= 0.6c3) | python2.5-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libecore0-dev (>= 0.9.9.042-maemo3), python2.5-cython-dev
 Standards-Version: 3.6.2.2
 
 Package: python2.5-ecore

diff --git a/trunk/python-edje/debian/control b/trunk/python-edje/debian/control
index 656380a..1e7231c 100644 (file)
--- a/trunk/python-edje/debian/control
+++ b/trunk/python-edje/debian/control
@@ -2,7 +2,7 @@ Source: python-edje
 Section: python
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso6), python-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libedje0-dev (>= 0.5.0.042-maemo4), python2.5-cython-dev
+Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso6), python-setuptools (>= 0.6c3) | python2.5-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libedje0-dev (>= 0.5.0.042-maemo4), python2.5-cython-dev
 Standards-Version: 3.6.2.2
 
 Package: python2.5-edje

diff --git a/trunk/python-efl_utils/debian/control b/trunk/python-efl_utils/debian/control
index c44a7b1..a318770 100644 (file)
--- a/trunk/python-efl_utils/debian/control
+++ b/trunk/python-efl_utils/debian/control
@@ -2,7 +2,7 @@ Source: python-efl-utils
 Section: python
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso6), python-setuptools (>= 0.6c3), python2.5-evas (>= 0.2.3), python2.5-ecore (>= 0.3.0-maemo2)
+Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso6), python-setuptools (>= 0.6c3) | python2.5-setuptools (>= 0.6c3), python2.5-evas (>= 0.2.3), python2.5-ecore (>= 0.3.0-maemo2)
 Standards-Version: 3.6.2.2
 
 Package: python2.5-efl-utils

diff --git a/trunk/python-epsilon/debian/control b/trunk/python-epsilon/debian/control
index 24a489d..691d84c 100644 (file)
--- a/trunk/python-epsilon/debian/control
+++ b/trunk/python-epsilon/debian/control
@@ -2,7 +2,7 @@ Source: python-epsilon
 Section: python
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso6), python-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libepsilon0-dev (>= 0.3.0.012-maemo3), python2.5-cython-dev
+Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso6), python-setuptools (>= 0.6c3) | python2.5-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libepsilon0-dev (>= 0.3.0.012-maemo3), python2.5-cython-dev
 Standards-Version: 3.6.2.2
 
 Package: python2.5-epsilon

diff --git a/trunk/python-etk/debian/control b/trunk/python-etk/debian/control
index 468d2a5..54b3c62 100644 (file)
--- a/trunk/python-etk/debian/control
+++ b/trunk/python-etk/debian/control
@@ -2,7 +2,7 @@ Source: python-etk
 Section: python
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso6), python-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libetk0-dev (>= 0.1.0.042-maemo3), python2.5-cython-dev
+Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso6), python-setuptools (>= 0.6c3) | python2.5-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libetk0-dev (>= 0.1.0.042-maemo3), python2.5-cython-dev
 Standards-Version: 3.6.2.2
 
 Package: python2.5-etk

diff --git a/trunk/python-evas/debian/control b/trunk/python-evas/debian/control
index cc9bd7f..3307798 100644 (file)
--- a/trunk/python-evas/debian/control
+++ b/trunk/python-evas/debian/control
@@ -2,7 +2,7 @@ Source: python-evas
 Section: python
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso6), python-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libevas0-dev (>= 0.9.9.042-maemo3), python2.5-numeric-dev (>= 24.2-1osso4), python2.5-cython-dev
+Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23), python2.5-dev (>= 2.5.1-1osso6), python-setuptools (>= 0.6c3) | python2.5-setuptools (>= 0.6c3), python2.5-pyrex (>= 0.9.5.1), libevas0-dev (>= 0.9.9.042-maemo3), python2.5-numeric-dev (>= 24.2-1osso4), python2.5-cython-dev
 Standards-Version: 3.6.2.2
 
 Package: python2.5-evas