Merge branch 'master' of http://kosh.ganneff.de/~joerg/debian.org

* 'master' of http://kosh.ganneff.de/~joerg/debian.org:
  Add a changelog entry
  python instead of python2.4.
  editor extensions are unwanted
  mc is already in -recommends
  No more gpgv
  Fixup apt-utils depends
  Add a first version for an ftpmaster.d.o metapackage
  Update the planet.debian.org metapackage

Conflicts:

	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index e686fe05afc968e6da49118fd8396beeb5ac54df..e6b12c9a9c1f7f577c3e8f7a892ef105d30e7ddd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debian.org (XX) XXable; urgency=low
+
+  [ Joerg Jaspert]
+  * Update the planet.debian.org metapackage, adding timeout,
+    debianutils, python-django, python as dependencies.
+  * Add an ftpmaster metapackage
+
+ -- Joerg Jaspert <joerg@debian.org>  Sat, 27 Feb 2010 11:54:20 +0100
+
 debian.org (32) stable; urgency=low
 
   * Fix install target of Makefile to deal with usr/bin.

diff --git a/debian/control b/debian/control
index 843a7bfe94c38ab1ef8cdd87642c37a145f18b81..3b84ce37c9fd1035c7c54133e186b88733875999 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -247,10 +247,13 @@ Description: metapackages for patch-tracker.debian.org dependencies
 
 Package: debian.org-planet.debian.org
 Architecture: all
-Depends: libwww-perl
+Depends: libwww-perl,
+       timeout,
+       debianutils,
+       python-django,
+       python
 Description: metapackages for planet.debian.org dependencies
  This package depends on everything that is needed for a planet.debian.org.
- Note: This package is very incomplete.
 
 Package: debian.org-testing-security.debian.org
 Architecture: all
@@ -261,3 +264,39 @@ Depends: libdbd-sqlite3-perl,
        python-apt
 Description: metapackages for testing-security.debian.org dependencies
  This package depends on everything that is needed for a testing-security.debian.org.
+
+Package: debian.org-ftpmaster.debian.org
+Architecture: all
+Depends: apt-utils,
+       libapt-pkg-dev,
+       python-apt,
+       python-btsutils,
+       lintian,
+       python,
+       python-debian,
+       python-gnupginterface,
+       python-ldap,
+       python-psycopg2,
+       python-pygresql,
+       python-pyrss2gen,
+       python-yaml,
+       python-sqlalchemy,
+       binutils-multiarch,
+       build-essential,
+       devscripts,
+       graphviz,
+       ikiwiki,
+       libdbd-pg-ruby,
+       python-epydoc,
+       python-numpy,
+       python-soappy,
+       r-base,
+       symlinks,
+       python-magic,
+       unp,
+       procmail,
+       cvs,
+       ruby,
+       irb
+Description: metapackage for ftpmaster
+ This package depends on everything that is needed for an ftpmaster setup.