[Python-modules-commits] r17251 - in packages/sphinx/trunk/debian (changelog control)

[jwilk at users.alioth.debian.org]

    Date: Tuesday, May 31, 2011 @ 00:46:06
  Author: jwilk
Revision: 17251

Use python (>= 2.6.6-14~) as an alternative build-dependency to python-simplejson.

Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/control

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2011-05-31 00:29:23 UTC (rev 17250)
+++ packages/sphinx/trunk/debian/changelog	2011-05-31 00:46:06 UTC (rev 17251)
@@ -2,8 +2,11 @@
 
   * Bump standards version to 3.9.2 (no changes needed).
   * Bump minimum required version of jQuery to 1.4.
+  * Use python (>= 2.6.6-14~) as an alternative build-dependency to
+    python-simplejson. The latter package is only needed for python2.5, and
+    python-defaults 2.6.6-14 doesn't support it anymore.
 
- -- Jakub Wilk <jwilk at debian.org>  Tue, 31 May 2011 02:28:40 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Tue, 31 May 2011 02:45:50 +0200
 
 sphinx (1.0.7-4) unstable; urgency=low
 

Modified: packages/sphinx/trunk/debian/control
===================================================================
--- packages/sphinx/trunk/debian/control	2011-05-31 00:29:23 UTC (rev 17250)
+++ packages/sphinx/trunk/debian/control	2011-05-31 00:46:06 UTC (rev 17251)
@@ -6,7 +6,7 @@
 Homepage: http://sphinx.pocoo.org/
 Build-Depends: debhelper (>= 7), python-all (>= 2.5.4-1~), python-setuptools (>= 0.6c5-1~)
 Build-Depends-Indep: python-support (>= 0.6.4), python-docutils, python-pygments (>= 0.8), python-jinja2 (>= 2.1),
-  python-nose, python-simplejson,
+  python-nose, python (>= 2.6.6-14~) | python-simplejson,
   texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/sphinx/trunk/