Merge branch 'master' into debian-master

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 92d18d0096e926d7faff9791ca672a4a565bbf3a..9d5d3eab5aca9a8390fd87e7d323829385969675 100644 (file)
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -24,7 +24,7 @@
    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/'
+   screenshots_thumb_url = 'http://screenshots.debian.net/thumbnail-with-version/'
    logo = {
        url => project_homepage,
         src => '/Pics/openlogo-nd-25.png',

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index e86af33a9c5342981f4de2886e785a3c0a9af784..ebbba777fb86e0d39bd39ab8bfd7a5f471d2447a 100644 (file)
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -64,7 +64,7 @@
 <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>
+<a id="screenshot" href="[% screenshots_url _ pkg %]"><img src="[% "$screenshots_thumb_url/$pkg/$version" %]" alt="Screenshot" border="0"/></a>
 [% END %]
 <h3>[% g('%s Resources:', organisation) %]</h3>
 <ul>