From: Gerfried Fuchs Date: Fri, 20 Aug 2010 09:18:31 +0000 (+0200) Subject: Merge branch 'master' into ubuntu-master X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=13dc7ea813815f5583d4e31c98fd1f8d932bb46d;p=deb%2Fpackages.git Merge branch 'master' into ubuntu-master --- 13dc7ea813815f5583d4e31c98fd1f8d932bb46d diff --cc templates/config.tmpl index ef9c4a6,aa1dee5..ee419ee --- a/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 8c7fad0,c03f50e..9b31bb2 --- a/templates/html/show.tmpl +++ b/templates/html/show.tmpl @@@ -63,9 -63,18 +63,12 @@@ [% UNLESS is_virtual %]

[% g('Links for %s', pkg) %]

+ [% IF screenshots_url && screenshots_thumb_url && !is_source %] + Screenshot + [% END %]

[% g('%s Resources:', organisation) %]