From: Gerfried Fuchs <rhonda@debian.at>
Date: Mon, 13 Sep 2010 07:05:03 +0000 (+0200)
Subject: Merge branch 'master' into archive-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=4fce6c73c1628aa97d4ffcaf0d22e31e736ef9f4;hp=--cc;p=deb%2Fpackages.git

Merge branch 'master' into archive-master

Conflicts:
	config.sh.sed.in
	cron.d/100syncarchive_backports
	cron.d/100syncarchive_debports
	templates/config/mirrors.tmpl
	templates/html/homepage.tmpl
---

4fce6c73c1628aa97d4ffcaf0d22e31e736ef9f4
diff --cc config.sh.sed.in
index 4590580,09d080c..ae7bf5c
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -24,11 -24,12 +24,12 @@@ localdir=/srv/archive.debian.org/ft
  # path to private ftp directory
  #ftproot=/org/ftp.root
  
 -ftpsite=http://ftp.de.debian.org/debian
 -security_ftpsite=http://security.debian.org/debian-security
 -volatile_ftpsite=http://volatile.debian.org/debian-volatile
 -backports_ftpsite=http://backports.debian.org/debian-backports
 +ftpsite=http://archive.debian.org/debian
 +security_ftpsite=http://archive.debian.org/debian-security
 +volatile_ftpsite=http://archive.debian.org/debian-volatile
- backports_ftpsite=http://archive.debian.org/backports.org
++backports_ftpsite=http://archive.debian.org/debian-backports
 +ddtp_ftpsite=http://ftp.de.debian.org/debian
+ debports_ftpsite=http://ftp.debian-ports.org/debian
 -ddtp_ftpsite=
  
  wget_cmd="wget --no-verbose --tries=2 --timeout=60"
  check_release_cmd="perl -I${libdir} ${bindir}/check-release --verbose --ignoremissing --keyring ${configdir}/trusted.gpg"
diff --cc templates/config/mirrors.tmpl
index a222eb1,4256765..f364773
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@@ -36,15 -91,108 +36,15 @@@ mirrors = 
  	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/',
+ 		url => 'http://backports.debian.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 => [
 -			"backports.debian.org/debian-backports",
 -			"ftp.at.debian.org/debian-backports/",
 -		    	"backports.debian.or.at/debian-backports",
 -		       	"mirror.realroute.net/debian-backports",
 -			"backports.cisbg.com",
 -			"debian.netcologne.de/debian-backports",
 -			"ftp.de.debian.org/debian-backports",
 -			"mirror.buildd.net/debian-backports",
 -			"ftp.estpak.ee/backports.org",
 -			"debian.acantho.net/backports.org",
 -			"backports.essentkabel.com/backports.org",
 -			"backports.sipo.nl",
 -		],
 -		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',
 -			},
 -			powerpcspe => {
 -				url => 'http://wiki.debian.org/PowerPCSPEPort',
 -				name => 'PowerPCSPE',
 -			},
 -			sh4 => {
 -				url => 'http://wiki.debian.org/SH4',
 -				name => 'SH4',
 -			},
 -			sparc64 => {
 -				url => 'http://wiki.debian.org/Sparc64',
 -				name => 'Sparc64',
 -			},
 -			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",
  		],
  	},
  }