Merge branch 'master' into ubuntu-master

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 29e694fed94bbca43f1a879c204f60f18d137f58..8b20d1407003818b2db9594faa3b01b15b7ff94d 100644 (file)
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -26,7 +26,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 f806dc7b8bcced4846a7310403d953ee6be8abc6..dd56fda2ccdb33fc71d12f6d97acbd6fce617623 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>