Commit to mainline by don@debian.org -- merge changes from don source

[Debbugs Maintainers]

------------------------------------------------------------
revno: 917
committer: Debian BTS <debb...@rietz>
branch nick: mainline
timestamp: Mon 2010-02-08 10:51:51 +0000
message:
  merge changes from don source
    ------------------------------------------------------------
    revno: 738.3.215
    committer: Don Armstrong <d...@donarmstrong.com>
    branch nick: source
    timestamp: Mon 2010-02-08 02:51:30 -0800
    message:
      its maintainers, not maint

=== modified file 'Debbugs/Config.pm'
--- Debbugs/Config.pm   2010-02-05 02:20:01 +0000
+++ Debbugs/Config.pm   2010-02-08 10:51:50 +0000
@@ -771,7 +771,7 @@
 
set_default(\%config,'maintainer_file_override',$config{config_dir}.'/Maintainers.override');
 
set_default(\%config,'source_maintainer_file',$config{config_dir}.'/Source_maintainers');
 set_default(\%config,'source_maintainer_file_override',undef);
-set_default(\%config,'pseudo_maint_file',$config{config_dir}.'/pseudo-packages.maint');
+set_default(\%config,'pseudo_maint_file',$config{config_dir}.'/pseudo-packages.maintainers');
 
set_default(\%config,'pseudo_desc_file',$config{config_dir}.'/pseudo-packages.description');
 set_default(\%config,'package_source',$config{config_dir}.'/indices/sources');
 

=== modified file 't/lib/DebbugsTest.pm'
--- t/lib/DebbugsTest.pm        2010-02-08 10:38:34 +0000
+++ t/lib/DebbugsTest.pm        2010-02-08 10:51:50 +0000
@@ -93,7 +93,7 @@
 foo main foo
 END
                            "$config_dir/pseudo-packages.description" => '',
-                           "$config_dir/pseudo-packages.maint" => '',
+                           "$config_dir/pseudo-packages.maintainers" => '',
                           );
      while (my ($file,$contents) = each %files_to_create) {
          system('mkdir','-p',dirname($file));