[Python-apps-commits] r4687 - in packages/ibid/trunk/debian (control)

[stefanor-guest at users.alioth.debian.org]

    Date: Friday, February 5, 2010 @ 18:26:29
  Author: stefanor-guest
Revision: 4687

Reorder ORed dependencies

Modified:
  packages/ibid/trunk/debian/control

Modified: packages/ibid/trunk/debian/control
===================================================================
--- packages/ibid/trunk/debian/control	2010-02-05 17:21:58 UTC (rev 4686)
+++ packages/ibid/trunk/debian/control	2010-02-05 18:26:29 UTC (rev 4687)
@@ -4,11 +4,11 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Stefano Rivera <stefano at rivera.za.net>
 Build-Depends: debhelper (>= 7.0.50~), python-central (>= 0.6.7~),
- python-configobj (>= 4.7.0), python-setuptools, python-sphinx,
- python-beautifulsoup, python (>= 2.5) | python-celementtree, python-dateutil,
- python-html5lib, python-jinja, python-pkg-resources,
- python-simplejson | python (>= 2.6), python-soappy,
- python-sqlalchemy (>= 0.4.6), python-twisted-core, python-twisted-web
+ python (>= 2.5) | python-celementtree, python (>= 2.6) | python-simplejson,
+ python-beautifulsoup, python-configobj (>= 4.7.0), python-dateutil,
+ python-html5lib, python-jinja, python-pkg-resources, python-setuptools,
+ python-soappy, python-sphinx, python-sqlalchemy (>= 0.4.6),
+ python-twisted-core, python-twisted-web
 Standards-Version: 3.8.4
 Homepage: http://ibid.omnia.za.net/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/ibid/trunk/
@@ -19,13 +19,12 @@
 Architecture: all
 XB-Python-Version: ${python:Versions}
 Depends: ${misc:Depends}, ${python:Depends},
- libjs-jquery, python-beautifulsoup, python-celementtree | python (>= 2.5),
- python-chardet, python-configobj (>= 4.7.0), python-dateutil, python-html5lib,
- python-jinja, python-pkg-resources,
- python-pysqlite2 | python-mysqldb | python-psycopg2,
- python-simplejson | python (>= 2.6), python-soappy,
- python-sqlalchemy (>= 0.4.6), python-twisted-core, python-twisted-web,
- python-twisted-words, python-zope.iterface
+ libjs-jquery, python (>= 2.5) | python-celementtree,
+ python (>= 2.6) | python-simplejson, python-beautifulsoup, python-chardet,
+ python-configobj (>= 4.7.0), python-dateutil, python-html5lib, python-jinja,
+ python-pkg-resources, python-pysqlite2 | python-mysqldb | python-psycopg2,
+ python-soappy, python-sqlalchemy (>= 0.4.6), python-twisted-core,
+ python-twisted-web, python-twisted-words, python-zope.iterface
 Recommends: fortune, ipcalc, iputils-ping, iputils-tracepath, man-db,
  python-dictclient, python-dnspython, python-feedparser, python-html2text,
  python-imdbpy (>= 3.8), python-twisted-mail, python-wokkel (>= 0.6.3), units