From: Frank Lichtenheld Date: Thu, 30 Oct 2008 20:05:11 +0000 (+0100) Subject: Merge commit 'origin/master' into ubuntu-master X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=fa9c56ffd5952da110ed11757fa82585f4bcae76;p=deb%2Fpackages.git Merge commit 'origin/master' into ubuntu-master Conflicts: config.sh.sed.in cron.d/100syncarchive cron.d/100syncarchive_backports cron.d/100syncarchive_debports cron.d/100syncarchive_volatile lib/Packages/Search.pm static/index.tmpl templates/config.tmpl templates/config/archive_layout.tmpl templates/config/mirrors.tmpl --- fa9c56ffd5952da110ed11757fa82585f4bcae76 diff --cc templates/config.tmpl index d6e9bd6,5ce7cc7..3526f5e --- a/templates/config.tmpl +++ b/templates/config.tmpl @@@ -14,13 -13,14 +14,14 @@@ 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-tracking.debian.net/package' +# cn_help_url = project_homepage _ 'intro/cn' ++# patch_tracking_url = 'http://patch-tracking.debian.net/package' logo = { url => project_homepage, src => '/Pics/openlogo-nd-25.png', diff --cc templates/config/archive_layout.tmpl index 1eacb16,30c2850..6adae92 --- a/templates/config/archive_layout.tmpl +++ b/templates/config/archive_layout.tmpl @@@ -2,4 -2,18 +2,10 @@@ main_section = 'main' main_archive = 'us' standard_priority = 'optional' + - suite_aliases = { - sarge => 'oldstable', - etch => 'stable', - lenny => 'testing', - sid => 'unstable', - } - + section_titles = { + main => g('packages that meet the Debian Free Software Guidelines'), + contrib => g('packages that meet the Debian Free Software Guidelines but need software not in Debian main'), + 'non-free' => g('packages that do not meet the Debian Free Software Guidelines'), + } - %]