Merge branch 'buxy'

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

Conflicts:
	debian/changelog

diff --combined debian/changelog
index de32e7b6752ad5e48d3063ab54a5e9ef8afcb44f,98ebca929852163f7cbc3d190d843af13cd5e449..2fb83f50aacf8dd3582f2687a060d0d499b432f5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -12,14 -12,9 +12,17 @@@ debian.org (53) UNRELEASED; urgency=lo
    * 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.
+ 
   -- Bernhard R. Link <brlink@debian.org>  Sun, 13 Oct 2013 11:55:19 +0200
  
  debian.org (52) unstable; urgency=low

diff --combined debian/control
index 110cc04f6991f86498c5a9508fb4a770a1f2fe85,96a624f9c89071ca2fcfb428fc9065b14edf0188..4f35a65870ccc648d04f9de6eb757a7319aab3d1
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -488,7 -488,6 +488,7 @@@ Depends: libapache2-mod-wsgi
        python-django-south,
        python-tz,
        python-markdown,
 +      python-lzma,
        procmail,
        moreutils,
        libjs-jquery,
@@@ -525,7 -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
@@@ -549,6 -547,31 +549,31 @@@ Depends: db4.7-util
  Description: metapackage for packages.qa.debian.org
   This package depends on all the packages that are needed for packages.qa.debian.org setup.
  
+ Package: debian.org-tracker.debian.org
+ Architecture: all
+ Depends:
+ # Runtime
+       libapache2-mod-wsgi,
+       python-apt,
+       python-beautifulsoup,
+       python-debian,
+       python-django (>= 1.5),
+       python-django-jsonfield,
+       python-django-south,
+       python-gpgme,
+       python-lzma,
+       python-requests,
+       python-soappy,
+       python-yaml,
+ # Database access
+       python-psycopg2,
+       postgresql-client,
+ # Test suite and docs
+       python-mock,
+       python-sphinx,
+ Description: metapackage for tracker.debian.org
+  This package depends on all the packages that are needed for tracker.debian.org.
+ 
  Package: debian.org-udd.debian.org
  Architecture: all
  Depends: curl,