Merge branch 'master' into database

diff --combined debian/control
index 2ef89672b27fedd67946d35138371c3b2a2c38fe,e99301a98fe60e55b0ef0cf0a78fa0dd3a7cbaa2..74c47b1d76585fe7b56d605ccd691c6c792df769
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -13,7 -13,7 +13,7 @@@ Build-Depends-Indep: libparams-validate
   libhttp-server-simple-perl, libtest-www-mechanize-perl,
   libmail-rfc822-address-perl, libsafe-hole-perl, libuser-perl,
   libconfig-simple-perl, libtest-pod-perl, liblist-moreutils-perl,
 - libtext-template-perl
 + libtext-template-perl, libdbix-class-perl, libdatetime-format-pg-perl
  Homepage: http://wiki.debian.org/Teams/Debbugs
  
  Package: debbugs
@@@ -44,6 -44,9 +44,9 @@@ Depends
   libio-stringy-perl, libmldbm-perl, liburi-perl, libsoap-lite-perl,
   libcgi-simple-perl, libparams-validate-perl, libtext-template-perl,
   libsafe-hole-perl, libmail-rfc822-address-perl, liblist-moreutils-perl,
+  libtext-template-perl,
+ # used by Debbugs::Libravatar and libravatar.cgi
+  libfile-libmagic-perl, libgravatar-url-perl, libwww-perl, imagemagick
  Section: perl
  Description: modules used by the active Debian BTS
   Debian has a bug tracking system which files details of bugs reported by
@@@ -60,7 -63,7 +63,7 @@@ Architecture: al
  Depends:
   ${misc:Depends},
   libdebbugs-perl, apache | httpd
- Suggests: libcgi-alert-perl
+ Suggests: libcgi-alert-perl, libapache2-mod-perl2
  Description: web scripts for the active Debian BTS
   Debian has a bug tracking system which files details of bugs reported by
   users and developers. Each bug is given a number, and is kept on file until