Merge branch 'buxy'

* buxy:
  Add meta-package for tracker.debian.org

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 98ebca929852163f7cbc3d190d843af13cd5e449..2fb83f50aacf8dd3582f2687a060d0d499b432f5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,14 @@ debian.org (53) UNRELEASED; urgency=low
   * manpages:
     + replace gs-common with ghostscript
 
+  [ Hector Oron ]
+  * d/control: add postgresql-client to qa.debian.org
+    - Apply patch from Bart Martens
+
+  [ Enrico Zini ]
+  * nm.d.o update:
+    + python-lzma
+
   [ Raphaël Hertzog ]
   * Add initial meta-package for tracker.debian.org.
 

diff --git a/debian/control b/debian/control
index 96a624f9c89071ca2fcfb428fc9065b14edf0188..4f35a65870ccc648d04f9de6eb757a7319aab3d1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -488,6 +488,7 @@ Depends: libapache2-mod-wsgi,
        python-django-south,
        python-tz,
        python-markdown,
+       python-lzma,
        procmail,
        moreutils,
        libjs-jquery,
@@ -524,6 +525,7 @@ Depends: db4.8-util,
                libapache2-mod-fcgid,
        python-apt, python-psycopg2, python-gpgme,
        python3, python3-psycopg2,
+       postgresql-client,
        libdbd-pg-ruby,
        rrdtool,
        raptor-utils | raptor2-utils