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

[dktrkranz at users.alioth.debian.org]

    Date: Sunday, March 21, 2010 @ 12:52:27
  Author: dktrkranz
Revision: 12315

Always depend on python-simplejson

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

Modified: packages/python-wadllib/trunk/debian/changelog
===================================================================
--- packages/python-wadllib/trunk/debian/changelog	2010-03-21 12:29:04 UTC (rev 12314)
+++ packages/python-wadllib/trunk/debian/changelog	2010-03-21 12:52:27 UTC (rev 12315)
@@ -2,11 +2,14 @@
 
   * debian/control:
     - Move myself as Maintainer, DPMT as Uploaders.
+    - Always depend on python-simplejson, drop the alternative python2.6
+      dependency, as wadllib explicitly needs simplejson, not json
+      provided by python2.6.
     - Bump Standards-Version to 3.8.4, no changes required.
   * debian/rules:
     - Install upstream changelog.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Sat, 06 Mar 2010 16:06:34 +0100
+ -- Luca Falavigna <dktrkranz at debian.org>  Sun, 21 Mar 2010 13:51:12 +0100
 
 python-wadllib (1.1.4-1) unstable; urgency=low
 

Modified: packages/python-wadllib/trunk/debian/control
===================================================================
--- packages/python-wadllib/trunk/debian/control	2010-03-21 12:29:04 UTC (rev 12314)
+++ packages/python-wadllib/trunk/debian/control	2010-03-21 12:52:27 UTC (rev 12315)
@@ -12,7 +12,7 @@
 
 Package: python-wadllib
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-simplejson | python2.6, python2.5 | python2.6 | python-celementtree | python-elementtree, python-lazr.uri
+Depends: ${python:Depends}, ${misc:Depends}, python-simplejson, python2.5 | python2.6 | python-celementtree | python-elementtree, python-lazr.uri
 Description: Python library for navigating WADL files
  The Web Application Description Language (WADL) is an XML vocabulary for
  describing the capabilities of HTTP resources. wadllib can be used in