From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 18 Nov 2013 19:52:21 +0000 (+0100)
Subject: Merge branch 'buxy'
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=commitdiff_plain;h=cacce32945fbb67051ee108ceda0861ffd73f26a;hp=c9c2053cc76d316195718e29b0bc80d480d0ea29

Merge branch 'buxy'

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

Conflicts:
	debian/changelog
---

diff --git a/debian/changelog b/debian/changelog
index 98ebca9..2fb83f5 100644
--- 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 96a624f..4f35a65 100644
--- 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