From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 23 Jan 2011 21:07:07 +0000 (+0100)
Subject: add python-simplejson || python (>= 2.6) to ftp
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b3670c0674fc8ec98500ac19e520e459e90047ab;p=dsa-metapackages.git

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

diff --git a/debian/changelog b/debian/changelog
index 22030b3..3816120 100644
--- 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
+  * ftp-master:
+    - add python-simplejson || python (>= 2.6)
 
   [ Bernd Zeimetz ]
   * nm.d.o:
@@ -28,7 +30,7 @@ debian.org (XX) XXstable; urgency=low
   [ 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
 
diff --git a/debian/control b/debian/control
index 6686fcc..a36daa2 100644
--- a/debian/control
+++ b/debian/control
@@ -316,6 +316,7 @@ Depends: apt-utils,
 	python-psycopg2,
 	python-pygresql,
 	python-pyrss2gen,
+	python-simplejson || python (>= 2.6),
 	python-yaml,
 	python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6),
 	binutils-multiarch,