chiark / gitweb /
Merge branch 'buxy'
authorPeter Palfrader <peter@palfrader.org>
Mon, 18 Nov 2013 19:52:21 +0000 (20:52 +0100)
committerPeter Palfrader <peter@palfrader.org>
Mon, 18 Nov 2013 19:52:21 +0000 (20:52 +0100)
* buxy:
  Add meta-package for tracker.debian.org

Conflicts:
debian/changelog

debian/changelog
debian/control

index 98ebca9..2fb83f5 100644 (file)
@@ -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.
 
index 96a624f..4f35a65 100644 (file)
@@ -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