------------------------------------------------------------
revno: 946
committer: Debian BTS <debb...@rietz>
branch nick: debian
timestamp: Mon 2010-02-08 10:44:55 +0000
message:
merge changes from don source
------------------------------------------------------------
revno: 721.14.214
committer: Don Armstrong <d...@donarmstrong.com>
branch nick: source
timestamp: Mon 2010-02-08 02:44:19 -0800
message:
Fix source package src: urls (closes: #567439). Thanks to Paul Wise.
=== modified file 'Debbugs/CGI/Bugreport.pm'
--- Debbugs/CGI/Bugreport.pm 2010-02-05 02:20:01 +0000
+++ Debbugs/CGI/Bugreport.pm 2010-02-08 10:44:52 +0000
@@ -35,6 +35,7 @@
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{
=== modified file 'Debbugs/CGI/Pkgreport.pm'
--- Debbugs/CGI/Pkgreport.pm 2010-02-01 17:23:20 +0000
+++ Debbugs/CGI/Pkgreport.pm 2010-02-08 10:44:52 +0000
@@ -107,7 +107,8 @@
}
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 @@
"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}) {
=== modified file 'debian/changelog'
--- debian/changelog 2010-02-05 02:20:01 +0000
+++ debian/changelog 2010-02-08 10:44:52 +0000
@@ -18,7 +18,7 @@
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.
