Merge remote-tracking branch 'local/master' into database

diff --combined Debbugs/CGI/Bugreport.pm
index dccae9541f5b9934335463579c778fe37a9d3fa0,f02bf784a74ee79c9e3ba3ab3736579453eab2a6..4a47506434d5b2cb42e7804837e2ef61736fc4d9
--- 1/Debbugs/CGI/Bugreport.pm
--- 2/Debbugs/CGI/Bugreport.pm
+++ b/Debbugs/CGI/Bugreport.pm
@@@ -35,7 -35,7 +35,7 @@@ use IO::Scalar
  use Params::Validate qw(validate_with :types);
  use Digest::MD5 qw(md5_hex);
  use Debbugs::Mail qw(get_addresses :reply);
 -use Debbugs::MIME qw(decode_rfc1522 create_mime_message);
 +use Debbugs::MIME qw(decode_rfc1522 create_mime_message parse_to_mime_entity);
  use Debbugs::CGI qw(:url :html :util);
  use Debbugs::Common qw(globify_scalar english_join);
  use Debbugs::UTF8;
@@@ -335,7 -335,17 +335,7 @@@ sub handle_email_message
       my $entity;
       my $tempdir;
       if (not blessed $record) {
 -         my $parser = MIME::Parser->new();
 -         # this will be cleaned up once it goes out of scope
 -         $tempdir = File::Temp->newdir();
 -         $parser->output_under($tempdir->dirname());
 -         if ($record->{inner_file}) {
 -             $entity = $parser->parse($record->{fh}) or
 -                 die "Unable to parse entity";
 -         } else {
 -             $entity = $parser->parse_data($record->{text}) or
 -                 die "Unable to parse entity";
 -         }
 +       $entity = parse_to_mime_entity($record);
       } else {
           $entity = $record;
       }
@@@ -466,6 -476,7 +466,7 @@@ sub handle_record
            # this will be cleaned up once it goes out of scope
            my $tempdir = File::Temp->newdir();
            $parser->output_under($tempdir->dirname());
+          $parser->filer->ignore_filename(1);
           my $entity;
           if ($record->{inner_file}) {
               $entity = $parser->parse($record->{fh});
@@@ -506,9 -517,7 +507,7 @@@ sub __libravatar_url 
  
  
  __END__
- 
- 
- 
- 
- 
- 
+ # Local Variables:
+ # cperl-indent-level: 4
+ # indent-tabs-mode: nil
+ # End:

diff --combined debian/control
index 6fadd40da5f41eb00e6e26e35aad5ab46d3945ae,36ebfcc4033320d2495e62bd2eaf44479736210d..097852d898e53d14becbc29ee907473c8a2fa655
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -13,11 -13,9 +13,10 @@@ 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-allutils-perl,
--# used by Debbugs::Libravatar and libravatar.cgi
   libfile-libmagic-perl, libgravatar-url-perl, libwww-perl, imagemagick,
-  libtext-template-perl, graphviz, libtext-iconv-perl
 + libdbix-class-perl, libdatetime-format-pg-perl,
 + libdatetime-format-mail-perl,
+  libtext-template-perl, graphviz, libtext-iconv-perl, libnet-server-perl
  Homepage: http://wiki.debian.org/Teams/Debbugs
  
  Package: debbugs
@@@ -43,16 -41,14 +42,16 @@@ Description: bug tracking system based 
  Package: libdebbugs-perl
  Architecture: all
  Depends:
 - ${misc:Depends},
 - ${perl:Depends}, libmailtools-perl, ed, libmime-tools-perl,
 + ${misc:Depends}, ${perl:Depends}, libmailtools-perl, ed, libmime-tools-perl,
   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
 + # used by Debbugs::Libravatar and libravatar.cgi
 + libfile-libmagic-perl,
 + libgravatar-url-perl, libwww-perl, imagemagick,
 + # used by the database
 + libdatetime-format-mail-perl, libdbix-class-perl, libdatetime-format-pg-perl
  Section: perl
  Description: modules used by the active Debian BTS
   Debian has a bug tracking system which files details of bugs reported by