Merge commit 'origin/master' into debian-master

diff --combined templates/html/show.tmpl
index cbe4cb1dac622b64e5ac081ab9a5e846b144607a,a9ef33870b80d68ce9a7db15445ea6a33e16d7b9..a9ed93b5370323135094fd49b859c956c5b96ebe
--- 1/templates/html/show.tmpl
--- 2/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@@ -62,7 -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 %]
@@@ -322,6 -322,6 +322,6 @@@ Do not install it on a normal Debian sy
    [%- END %]
  [% END %]
  
 -<script type="text/javascript">init_tab_list("ptablist")</script>
 +[%# <script type="text/javascript">init_tab_list("ptablist")</script> %]
  
  [%- PROCESS 'html/foot.tmpl' -%]