Merge branch 'master' into archive-master

Conflicts:
	config.sh.sed.in
	templates/config.tmpl
	templates/config/mirrors.tmpl

diff --cc conf/apache.conf.sed.in
Simple merge

diff --cc config.sh.sed.in
index 50f6dc1cfdb868eb1c13c64d2a8c6f5518ae9b7a,55ba5b36a87b15bdf874a45f7a2c2d6ef5422ec6..94dceefaf53824c3c71a3daceea9cb14d65a1fec
--- 1/config.sh.sed.in
--- 2/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -39,21 -40,22 +39,21 @@@ search_url="/search
  
  # Architectures
  #
- polangs="de fi fr hu ja nl ru sk sv uk zh-cn"
+ polangs="bg de fi fr hu ja nl ru sk sv uk zh-cn"
  ddtplangs="ca cs da de eo es eu fi fr hu it ja km ko nl pl pt pt-br ru sk sv uk zh zh-cn zh-tw"
 -archives="us security debports backports volatile"
 +archives="us security backports volatile"
  sections="main contrib non-free"
  parts="$sections"
 -suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile lenny-backports squeeze sid experimental"
 +suites="bo hamm slink potato woody sarge sarge-volatile sarge-backports"
  priorities="required important standard optional extra"
  dists="$suites"
 -architectures="alpha amd64 arm armel avr32 hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc"
 -arch_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
 -arch_lenny="${arch_etch} armel"
 -arch_squeeze="alpha amd64 armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc"
 -arch_sid="${arch_squeeze} avr32 hurd-i386 m68k"
 -arch_experimental="${arch_sid}"
 -arch_lenny_proposed_updates="${arch_lenny}"
 -arch_etch_proposed_updates="${arch_etch}"
 +architectures="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
 +arch_bo="i386"
 +arch_hamm="i386 m68k"
 +arch_slink="alpha i386 m68k sparc"
 +arch_potato="alpha arm i386 ia64 m68k powerpc sparc"
 +arch_woody="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
 +arch_sarge="${arch_woody}"
  
  # Miscellaneous
  #

diff --cc templates/config.tmpl
index 9ea162ed4255cba3bf4efe3418ff2fd87cf6e39e,85c52f790939478b2a4304fe598865b407938114..8c86558b798b15496752b00186ef91f11327a5ad
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -15,13 -16,13 +15,13 @@@
     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 = 'archive.debian.org'
     security_mirror_url = security_mirror _ '/debian-security'
     security_suite_suffix = '/updates'
 -   changelogs_url = 'http://packages.debian.org/changelogs/'
 +   changelogs_url = 'http://archive.debian.net/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'
 -   patch_tracking_url = 'http://patch-tracker.debian.org/package'
++#   patch_tracking_url = 'http://patch-tracker.debian.org/package'
     logo = {
        url => project_homepage,
          src => '/Pics/openlogo-nd-25.png',

diff --cc templates/config/mirrors.tmpl
index 81dc3aeab335a5261c98a542df4e001925ca9664,28c4a0ec09bc797dc3161d84a023e09fe62ca54c..a222eb100ee23c28209e46e06e2317509977b975
--- 1/templates/config/mirrors.tmpl
--- 2/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@@ -11,37 -11,178 +11,40 @@@
   
  mirrors = {
        us => {
 -              mirror_list => 'http://www.debian.org/mirror/list',
+               url => 'http://www.debian.org/',
 +              mirror_list => 'http://www.debian.org/distrib/archive',
                north_america => [
 -                      "ftp.us.debian.org/debian",
 -                      "http.us.debian.org/debian",
 -#only amd64,i386      "ftp.debian.org/debian",
 -                      "ftp.ca.debian.org/debian",
 -                      "ftp.mx.debian.org/debian",
 -                      "ftp.egr.msu.edu/debian",
 -                      "mirrors.kernel.org/debian",
 -                      "ftp-mirror.internap.com/pub/debian",
 -#only some arches     "ftp.cerias.purdue.edu/pub/os/debian",
 -                      "debian.lcs.mit.edu/debian",
 -                      "debian.oregonstate.edu/debian",
 +                      "ftp.egr.msu.edu/debian-archive",
 +                      "ftp3.nrc.ca/debian-archive",
                ],
                europa => [
 -                      "ftp.de.debian.org/debian",
 -                      "ftp.at.debian.org/debian",
 -                      "ftp.bg.debian.org/debian",
 -                      "ftp.ch.debian.org/debian",
 -                      "ftp.cz.debian.org/debian",
 -                      "ftp.dk.debian.org/debian",
 -                      "ftp.ee.debian.org/debian",
 -                      "ftp.es.debian.org/debian",
 -                      "ftp.fi.debian.org/debian",
 -                      "ftp.fr.debian.org/debian",
 -                      "ftp.hr.debian.org/debian",
 -                      "ftp.hu.debian.org/debian",
 -                      "ftp.ie.debian.org/debian",
 -                      "ftp.is.debian.org/debian",
 -                      "ftp.it.debian.org/debian",
 -                      "ftp.nl.debian.org/debian",
 -#only some arches     "ftp.no.debian.org/debian",
 -                      "ftp.pl.debian.org/debian",
 -                      "ftp.ro.debian.org/debian",
 -                      "ftp.ru.debian.org/debian",
 -                      "ftp.se.debian.org/debian",
 -#only some arches     "ftp.si.debian.org/debian",
 -                      "ftp.tr.debian.org/debian",
 -                      "ftp.uk.debian.org/debian",
 -              ],
 -              south_america => [
 -                      "ftp.br.debian.org/debian",
 -                      "ftp.cl.debian.org/debian",
 -                      "download.unesp.br/linux/debian",
 -                      "sft.if.usp.br/debian",
 -#not reachable                "debian.unesr.edu.ve/debian",
 -                      "debian.torredehanoi.org/debian",
 -              ],
 -              oceania => [
 -                      "ftp.au.debian.org/debian",
 -                      "ftp.wa.au.debian.org/debian",
 -                      "ftp.nz.debian.org/debian",
 -                      "mirror.pacific.net.au/debian",
 -                      "ftp.iinet.net.au/debian/debian",
 -                      "mirror.optus.net/debian",
 +                      "archive.debian.org/debian",
 +                      "ftp.de.debian.org/archive/debian",
 +                      "ftp.ch.debian.org/debian-archive",
 +                      "ftp.nl.debian.org/debian-archive",
 +                      "debian.dynamica.it/debian-archive",
 +                      "debian.org.ua/debian-archive",
 +                      "ftp2.debian.org.ua/debian-archive",
 +#                     "ftp.irb.hr/debian-archive",
 +                      "webb.ens-cachan.fr/ftp/debian-archive",
                ],
                asia => [
 -                      "ftp.jp.debian.org/debian",
 -                      "ftp2.jp.debian.org/debian",
 -                      "ftp.kr.debian.org/debian",
 -#only some arches     "ftp.hk.debian.org/debian",
 -                      "ftp.tw.debian.org/debian",
 -                      "debian.nctu.edu.tw/debian",
 -                      "debian.linux.org.tw/debian",
 -                      "linux.cdpa.nsysu.edu.tw/debian",
 -                      "ftp.nara.wide.ad.jp/debian",
 -                      "mirrors.geekbone.org/debian",
 -                      "ftp.yz.yamagata-u.ac.jp/debian",
 -                      "debian.thaios.net/debian",
 -                      "www.anheng.com.cn/debian",
 -                      "ftp.daum.net/debian",
 -              ],
 -              africa => [
 -                      "debian.mirror.ac.za/debian",
 +                      "ftp.kr.debian.org/debian-archive",
 +#                     "ftp.twaren.net/Linux/Debian/debian-archive",
                ],
        },
 -
        volatile => {
+               url => 'http://www.debian.org/volatile/',
                title => g('volatile packages that need major changes during the life of a stable release'),
 -              mirror_list => 'http://www.debian.org/volatile/volatile-mirrors',
                europa => [
 -                      "volatile.debian.org/debian-volatile",
 -                      "ftp.at.debian.org/debian-volatile",
 -                      "ftp.be.debian.org/debian-volatile",
 -                      "ftp.ch.debian.org/debian-volatile",
 -                      "ftp.de.debian.org/debian-volatile",
 -                      "ftp2.de.debian.org/debian-volatile",
 -                      "ftp.ee.debian.org/debian-volatile",
 -                      "ftp.fi.debian.org/debian-volatile",
 -                      "ftp.gr.debian.org/debian-volatile",
 -                      "ftp.nl.debian.org/debian-volatile",
 -                      "ftp.ru.debian.org/debian-volatile",
 -                      "ftp.sk.debian.org/debian-volatile",
 -                      "ftp.ua.debian.org/debian-volatile",
 -                      "ftp.uk.debian.org/debian-volatile",
 -              ],
 -              north_america => [
 -                      "mirror.csclub.uwaterloo.ca/debian-volatile",
 -                      "ftp3.nrc.ca/debian-volatile",
 -                      "gulus.usherbrooke.ca/debian-volatile",
 -              ],
 -              south_america => [
 -                      "ftp.br.debian.org/debian-volatile",
 -                      "ftp.cl.debian.org/debian-volatile",
 -                      "sft.if.usp.br/debian-volatile",
 -              ],
 -              asia => [
 -                      "ftp2.jp.debian.org/debian-volatile",
 -                      "ftp.tw.debian.org/debian-volatile",
 -                      "mirror.unej.ac.id/debian-volatile",
 -                      "mirrors.geekbone.org/debian-volatile",
 -              ],
 -              oceania => [
 -                      "ftp.nz.debian.org/debian-volatile",
 +                      "archive.debian.org/debian-volatile",
                ],
        },
 -
        backports => {
+               url => 'http://www.backports.org/',
                title => g('newer packages that have been adapted to stable releases of Debian'),
 -              mirror_list => 'http://www.backports.org/debian/README.mirrors.html',
                europa => [
 -                      "www.backports.org/debian",
 -                      "debian.sil.at/backports.org/",
 -                      "backports.debian.or.at/backports.org",
 -                      "mirror.realroute.net/backports.org",
 -                      "backports.cisbg.com",
 -                      "backports.linuxdediziert.de/backports.org",
 -                      "debian.netcologne.de/debian-backports",
 -                      "ftp.de.debian.org/backports.org",
 -                      "mirror.buildd.net/backports.org",
 -                      "ftp.estpak.ee/backports.org",
 -                      "debian.acantho.net/backports.org",
 -                      "backports.essentkabel.com/backports.org",
 -                      "backports.sipo.nl",
 -                      "ftp.tuke.sk",
 -              ],
 -              asia => [
 -                      "backports.mithril-linux.org",
 -              ],
 -              oceania => [
 -                      "mirror.linux.org.au/backports.org",
 -                      "mirror.pacific.net.au/linux/debian-backports",
 -              ],
 -      },
 -
 -      debports => {
 -              url => 'http://www.debian-ports.org/',
 -              title => g('ports of packages to architectures not yet or not anymore available in Debian'),
 -              mirror_list => 'http://wiki.debian.org/DebianPorts/Mirrors',
 -              unofficial_port => {
 -                      avr32 => {
 -                              url => 'http://avr32.debian.net/',
 -                              name => 'AVR32',
 -                      },
 -                      m68k => {
 -                              url_name => 'm68k',
 -                              name => 'M68K',
 -                      },
 -              },
 -              north_america => [
 -                      "www.gtlib.gatech.edu/pub/gnuab/debian",
 -              ],
 -              europa => [
 -                      "ftp.debian-ports.org/debian",
 -                      "ftp.de.debian.org/debian-ports",
 -                      "ftp.ch.debian.org/debian-ports",
 -              ],
 -              asia => [
 -                      "debian.nctu.edu.tw/debian-ports",
 +                      "archive.debian.org/backports.org",
                ],
        },
  }

diff --cc templates/html/download.tmpl
Simple merge