From: Gerfried Fuchs <rhonda@debian.org>
Date: Mon, 23 May 2011 11:58:01 +0000 (+0200)
Subject: Merge branch 'master' into debian-master
X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=commitdiff_plain;h=39c8d5a2fa0e09b0ee557c46a6f0bb34f327f18e;hp=-c

Merge branch 'master' into debian-master
---

39c8d5a2fa0e09b0ee557c46a6f0bb34f327f18e
diff --combined templates/config/mirrors.tmpl
index 79ee6f4,bb93172..b01bd33
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@@ -134,7 -134,7 +134,7 @@@ mirrors = 
  	backports => {
  		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',
 +		mirror_list => 'http://backports.debian.org/Mirrors/',
  		europa => [
  			"backports.debian.org/debian-backports",
  			"ftp.at.debian.org/debian-backports/",
@@@ -163,10 -163,22 +163,22 @@@
  		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 => {
+ 			alpha => {
+ 				url_name => 'alpha',
+ 				name => 'Alpha',
+ 			},
  			avr32 => {
  				url => 'http://avr32.debian.net/',
  				name => 'AVR32',
  			},
+ 			hppa => {
+ 				url_name => 'hppa',
+ 				name => 'HPPA',
+ 			},
+ 			m68k => {
+ 				url_name => 'm68k',
+ 				name => 'M68K',
+ 			},
  			powerpcspe => {
  				url => 'http://wiki.debian.org/PowerPCSPEPort',
  				name => 'PowerPCSPE',
@@@ -179,10 -191,6 +191,6 @@@
  				url => 'http://wiki.debian.org/Sparc64',
  				name => 'Sparc64',
  			},
- 			m68k => {
- 				url_name => 'm68k',
- 				name => 'M68K',
- 			},
  		},
  		north_america => [
  			"www.gtlib.gatech.edu/pub/gnuab/debian",