Merge remote-tracking branch 'enrico/master'

* enrico/master:
  Added python-markdown
  nm.debian.org: added python-django-south and postgresql-client

diff --git a/debian/changelog b/debian/changelog
index fb6fe61005fe897016e65910d7e086c2541c8f60..ba2ca1a8d16d121227f9e971da623e1c2ac061eb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -71,6 +71,12 @@ debian.org (52) UNRELEASED; urgency=low
   * piuparts-master:
     + add python-yaml
 
+  [ Enrico Zini ]
+  * nm.debian.org:
+    + python-django-south
+    + postgresql-client
+    + python-markdown
+
   [ Simon Paillard ]
   * debian.org-packages.debian.org: switch from modperl to fastcgi
 

diff --git a/debian/control b/debian/control
index 6e117e9384a7dff42518912b4d6be8103b879ede..a930edad980efd0bbd46e076b4443c22f3cf3b43 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -481,6 +481,7 @@ Depends: libapache2-mod-php5, libapache2-mod-wsgi,
        python-django,
        python-django-south,
        python-tz,
+       python-markdown,
        procmail,
        moreutils,
        libjs-jquery,