Merge branch 'master' into ubuntu-master

diff --cc static/packages.css.sed.in
Simple merge

diff --cc templates/config.tmpl
index ef9c4a64f80a965c9da3b5314f57a95fa0e4b48c,aa1dee5f3fcf536de220f42bcd5b603c4e0f2b08..ee419ee2a8d13315ad30e61df6f42f6879d42065
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -17,14 -15,16 +17,16 @@@
     pts_url = 'http://packages.qa.debian.org/'
     ddpo_url = 'http://qa.debian.org/developer.php?login='
     src_bugs_url = bugs_url _ 'src:'
 -   mirror_url = 'http://ftp.debian.org/'
 -   security_mirror = 'security.debian.org'
 -   security_mirror_url = security_mirror _ '/debian-security'
 -   security_suite_suffix = '/updates'
 -   changelogs_url = 'http://packages.debian.org/changelogs/'
 +   mirror_url = 'http://archive.ubuntu.com/'
 +   security_mirror = 'security.ubuntu.com'
 +   security_mirror_url = security_mirror _ '/ubuntu'
 +   security_suite_suffix = '-security'
 +   changelogs_url = 'http://changelogs.ubuntu.com/changelogs/'
     policy_url = 'http://www.debian.org/doc/debian-policy/'
 -   cn_help_url = project_homepage _ 'intro/cn'
 -   patch_tracking_url = 'http://patch-tracker.debian.org/package'
 -   screenshots_url = 'http://screenshots.debian.net/package/'
 -   screenshots_thumb_url = 'http://screenshots.debian.net/thumbnail/'
 +#   cn_help_url = project_homepage _ 'intro/cn'
 +#   patch_tracking_url = 'http://patch-tracker.debian.org/package'
++#   screenshots_url = 'http://screenshots.debian.net/package/'
++#   screenshots_thumb_url = 'http://screenshots.debian.net/thumbnail/'
     logo = {
        url => project_homepage,
          src => '/Pics/openlogo-nd-25.png',

diff --cc templates/html/show.tmpl
index 8c7fad0ec26639c0ae3edb13a34d2e9298da1111,c03f50e3f92472e2ed555373a3cb811deeef3729..9b31bb2c31f7c9a451a8952abe8c0fad6b695316
--- 1/templates/html/show.tmpl
--- 2/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@@ -63,9 -63,18 +63,12 @@@
  [% UNLESS is_virtual %]
  <div id="pmoreinfo">
  <h2>[% g('Links for %s', pkg) %]</h2>
+ [% IF screenshots_url && screenshots_thumb_url && !is_source %]
+ <a id="screenshot" href="[% screenshots_url _ pkg %]"><img src="[% screenshots_thumb_url _ pkg %]" alt="Screenshot" border="0"/></a>
+ [% END %]
  <h3>[% g('%s Resources:', organisation) %]</h3>
  <ul>
 -<li><a href="[% (is_source ? src_bugs_url : bugs_url) _ pkg %]">[% g('Bug Reports') %]</a></li>
 -
 -[% IF src.pkg -%]
 -<li><a href="[% pts_url _ src.pkg %]">[% g('Developer Information (PTS)') %]</a></li>
 -[% ELSIF is_source %]
 -<li><a href="[% pts_url _ pkg %]">[% g('Developer Information (PTS)') %]</a></li>
 -[%- END %]
 +<li><a href="[% launchpad_url _ (is_source ? pkg : src.pkg) _ '/+bugs' %]">[% g('Bug Reports') %]</a></li>
  
  [% IF files && (!archive or archive == main_archive or archive == 'security') %]
  <li><a href="[% changelogs_url _ files.changelog.path %]">[% g('%s Changelog', organisation) %]</a></li>