From b3670c0674fc8ec98500ac19e520e459e90047ab Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 23 Jan 2011 22:07:07 +0100 Subject: [PATCH] add python-simplejson || python (>= 2.6) to ftp --- debian/changelog | 4 +++- debian/control | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) 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 Tue, 28 Dec 2010 15:44:12 +0100 + -- Peter Palfrader 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, -- 2.30.2