add python-simplejson || python (>= 2.6) to ftp

diff --git a/debian/changelog b/debian/changelog
index 22030b36686082ada3484c2b89eb911eb2513a50..381612097658adff5c2f27daa0b3228777f3662e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ debian.org (XX) XXstable; urgency=low
     - add ttf-malayalam-fonts
     - add tidy
     - add libjson-perl
     - add ttf-malayalam-fonts
     - add tidy
     - add libjson-perl

+  * ftp-master:
+    - add python-simplejson || python (>= 2.6)

 
   [ Bernd Zeimetz ]
   * nm.d.o:
 
   [ Bernd Zeimetz ]
   * nm.d.o:


@@ -28,7 +30,7 @@ debian.org (XX) XXstable; urgency=low
   [ Martin Zobel-Helas ]
   * add ipython to -recommended. 
 
   [ Martin Zobel-Helas ]
   * add ipython to -recommended. 
 

- -- Peter Palfrader <weasel@debian.org>  Tue, 28 Dec 2010 15:44:12 +0100
+ -- Peter Palfrader <weasel@debian.org>  Sun, 23 Jan 2011 22:06:44 +0100

 
 debian.org (41.1) stable; urgency=low
 
 
 debian.org (41.1) stable; urgency=low
 

diff --git a/debian/control b/debian/control
index 6686fccbceb3b0e6e525205e1c8ff32be54270d1..a36daa214fdc79bad9a895b31ec84a83917bf26e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -316,6 +316,7 @@ Depends: apt-utils,
        python-psycopg2,
        python-pygresql,
        python-pyrss2gen,
        python-psycopg2,
        python-pygresql,
        python-pyrss2gen,

+       python-simplejson || python (>= 2.6),

        python-yaml,
        python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6),
        binutils-multiarch,
        python-yaml,
        python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6),
        binutils-multiarch,