Merge commit 'origin/master' into debian-master

diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index 3df473da5f5c5e30c8413506edbbc8f6c2a28719..7054bb90c1ff7904c9ae6483d0894b090fb38f38 100644 (file)
--- a/lib/Packages/DoSearchContents.pm
+++ b/lib/Packages/DoSearchContents.pm
@@ -14,7 +14,7 @@ our @EXPORT = qw( do_search_contents );
 use Deb::Versions;
 use Packages::I18N::Locale;
 use Packages::Search qw( :all );
-use Packages::CGI;
+use Packages::CGI qw( :DEFAULT error );
 use Packages::DB;
 use Packages::Config qw( $DBDIR @SUITES @ARCHIVES @ARCHITECTURES $ROOT );
 

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index cbe4cb1dac622b64e5ac081ab9a5e846b144607a..a9ed93b5370323135094fd49b859c956c5b96ebe 100644 (file)
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -62,7 +62,7 @@
 <li><a href="[% pts_url _ pkg | uri %]">Developer Information (PTS)</a></li>
 [%- END %]
 
-[% IF files %]
+[% IF files && (!archive or archive == main_archive or archive == 'security') %]
 <li><a href="[% changelogs_url _ files.changelog.path %]">Debian Changelog</a></li>
 <li><a href="[% changelogs_url _ files.copyright.path %]">Copyright File</a></li>
 [% END %]