From: Gerfried Fuchs Date: Tue, 9 Nov 2010 19:44:55 +0000 (+0100) Subject: Merge branch 'master' into ubuntu-master X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=582530fd89f3532346a1059176389b376b86c151;p=deb%2Fpackages.git Merge branch 'master' into ubuntu-master --- 582530fd89f3532346a1059176389b376b86c151 diff --cc templates/config.tmpl index 29e694f,4d24e05..8b20d14 --- a/templates/config.tmpl +++ b/templates/config.tmpl @@@ -17,16 -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' +# 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',