Fix source package src: urls (closes: #567439). Thanks to Paul Wise.

diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm
index ba4c7a4f30ee3185b9eb5dc377a177bc914b18da..2359837fa42620536c348157e0095d8f34e58dc3 100644 (file)
--- a/Debbugs/CGI/Bugreport.pm
+++ b/Debbugs/CGI/Bugreport.pm
@@ -35,6 +35,7 @@ use Params::Validate qw(validate_with :types);
 use Debbugs::MIME qw(convert_to_utf8 decode_rfc1522 create_mime_message);
 use Debbugs::CGI qw(:url :html :util);
 use Debbugs::Common qw(globify_scalar english_join);
+use Debbugs::Config qw(:config);
 use POSIX qw(strftime);
 
 BEGIN{

diff --git a/Debbugs/CGI/Pkgreport.pm b/Debbugs/CGI/Pkgreport.pm
index d047affb1d262827d204552b3fc4c52ece4e9b63..e87125c0ca4b247f5c37a73de2cea0df722cc53f 100644 (file)
--- a/Debbugs/CGI/Pkgreport.pm
+++ b/Debbugs/CGI/Pkgreport.pm
@@ -107,7 +107,8 @@ sub generate_package_info{
      }
      else {
          print {$output} "<p>There is no maintainer for $showpkg. ".
-              "Please do not report new bugs against this package.</p>\n";
+              "This means that this package no longer exists (or never existed). ".
+                  "Please do not report new bugs against this package. </p>\n";
      }
      my @pkgs = getsrcpkgs($srcforpkg);
      @pkgs = grep( !/^\Q$package\E$/, @pkgs );
@@ -130,9 +131,11 @@ sub generate_package_info{
               "list of other pseudo-packages</a>";
      }
      elsif (not defined $maint and not @{$param{bugs}}) {
-         print {$output} "<p>There is no record of the " . html_escape($package) .
-              ($param{binary} ? " package" : " source package") .
-                   ", and no bugs have been filed against it.</p>";
+       # don't bother printing out this information, because it's
+       # already present above.
+       #  print {$output} "<p>There is no record of the " . html_escape($package) .
+       #       ($param{binary} ? " package" : " source package") .
+       #           ", and no bugs have been filed against it.</p>";
      }
      else {
          if ($package and defined $config{package_pages} and length $config{package_pages}) {

diff --git a/debian/changelog b/debian/changelog
index 4b03178d5eeee08a93b5bf02177a12dc660728f2..8679d397a17f2f132612feed28010a0b30e7d81f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +18,7 @@ debbugs (2.4.2~exp1) experimental; urgency=low
     Thanks to Martin Krafft.
   * Properly handle Forwarded: at submit@ time (closes: #568020). Thanks
     to Martin Krafft.
-  * Fix source package src: urls
+  * Fix source package src: urls (closes: #567439). Thanks to Paul Wise.
   * Use package_maintainer to search for packages maintained by a
     maintainer (closes: #556863). Thanks to Yves-Alexis Perez.
   * Linkify CVE reports (closes: #568464). Thanks to Martin Zobel-Helas.