Merge branch 'kibi'

* kibi:
  d-i.debian.org: Adjust package list.

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index a4154eb8cd19379812b24362d4ebad584beda541..0221241ea8d695baf84d41a0544a68fcdc7e512d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,13 @@ debian.org (53) UNRELEASED; urgency=low
   * 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.
+
   [ Cyril Brulebois ]
   * d-i.debian.org:
     + libfile-slurp-perl
@@ -115,7 +122,6 @@ debian.org (52) unstable; urgency=low
     + postgresql-client
     + python-markdown
     - libapache-mod-php5
-    + python-lzma
 
   [ Simon Paillard ]
   * debian.org-packages.debian.org: switch from modperl to fastcgi

diff --git a/debian/control b/debian/control
index c7f9040dc09c175df5d515b9e82a54996bc29baa..8140698a78793f2cfdbf05ec445285da0963b709 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -549,6 +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,