[Python-modules-commits] r18866 - in packages/python-keyczar/trunk/debian (changelog control)

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

    Date: Tuesday, October 11, 2011 @ 22:11:45
  Author: chrisk-guest
Revision: 18866

Revert dropping python-simplejson dependency as it is still relevant to some actively supported releases

Modified:
  packages/python-keyczar/trunk/debian/changelog
  packages/python-keyczar/trunk/debian/control

Modified: packages/python-keyczar/trunk/debian/changelog
===================================================================
--- packages/python-keyczar/trunk/debian/changelog	2011-10-11 21:03:31 UTC (rev 18865)
+++ packages/python-keyczar/trunk/debian/changelog	2011-10-11 22:11:45 UTC (rev 18866)
@@ -7,8 +7,8 @@
   * debian/control:
     - Dropped dependency on python-support and bumped python-all dependency
       to (>= 2.6.6-3~) for dh_python2
-    - Dropped python-simplejson alternative dependency (the above makes support
-      for Python 2.5 moot)
+    - Modified python-simplejson alternative build dependency to be required
+      only in environments where Python 2.5 is still supported
     - Updated Vcs-* URLs
   * debian/rules:
     - Dropped the get-orig-source target (no longer needed)

Modified: packages/python-keyczar/trunk/debian/control
===================================================================
--- packages/python-keyczar/trunk/debian/control	2011-10-11 21:03:31 UTC (rev 18865)
+++ packages/python-keyczar/trunk/debian/control	2011-10-11 22:11:45 UTC (rev 18866)
@@ -7,6 +7,7 @@
 Build-Depends:
     debhelper (>= 7.0.50~),
     python-all (>= 2.6.6-3~),
+    python (>= 2.6.6-14~) | python-simplejson,
     python-pyasn1,
     python-crypto
 Standards-Version: 3.9.2
@@ -19,6 +20,7 @@
 Depends:
     ${python:Depends},
     ${misc:Depends},
+    python (>= 2.6) | python-simplejson,
     python-pyasn1,
     python-crypto
 Conflicts: