2 files changed, 13 insertions, 10 deletions
diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in
index 1ca76927..a84cbc2b 100644
--- a/data/templates/Ubuntu.info.in
+++ b/data/templates/Ubuntu.info.in
@@ -8,8 +8,7 @@ BaseURI-powerpc: http://ports.ubuntu.com/
 MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com
 BaseURI-lpia: http://ports.ubuntu.com/
 MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com
-MirrorsFile-amd64: Ubuntu.mirrors
-MirrorsFile-i386: Ubuntu.mirrors
+MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 10.04 'Lucid Lynx'
 Component: main
 _CompDescription: Officially supported
@@ -69,8 +68,7 @@ BaseURI-powerpc: http://ports.ubuntu.com/
 MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com
 BaseURI-lpia: http://ports.ubuntu.com/
 MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com
-MirrorsFile-amd64: Ubuntu.mirrors
-MirrorsFile-i386: Ubuntu.mirrors
+MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 9.10 'Karmic Koala'
 Component: main
 _CompDescription: Officially supported
@@ -130,8 +128,7 @@ BaseURI-powerpc: http://ports.ubuntu.com/
 MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com
 BaseURI-lpia: http://ports.ubuntu.com/
 MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com
-MirrorsFile-amd64: Ubuntu.mirrors
-MirrorsFile-i386: Ubuntu.mirrors
+MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 9.04 'Jaunty Jackalope'
 Component: main
 _CompDescription: Officially supported
@@ -191,8 +188,7 @@ BaseURI-powerpc: http://ports.ubuntu.com/
 MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com
 BaseURI-lpia: http://ports.ubuntu.com/
 MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com
-MirrorsFile-amd64: Ubuntu.mirrors
-MirrorsFile-i386: Ubuntu.mirrors
+MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 8.10 'Intrepid Ibex'
 Component: main
 _CompDescription: Officially supported
@@ -253,8 +249,7 @@ BaseURI-powerpc: http://ports.ubuntu.com/
 MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com
 BaseURI-lpia: http://ports.ubuntu.com/
 MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com
-MirrorsFile-amd64: Ubuntu.mirrors
-MirrorsFile-i386: Ubuntu.mirrors
+MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 8.04 'Hardy Heron'
 Component: main
 _CompDescription: Officially supported
diff --git a/debian/changelog b/debian/changelog
index e9603695..fd3161be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-apt (0.7.93.3) unstable; urgency=low
+
+  * data/templates/Ubuntu.info.in:
+    - Use generic MirrorsFile key instead of per-architecture ones in
+      order to fix FTBFS on !amd64 !i386 (Closes: #571752)
+
+ -- Julian Andres Klode <jak@debian.org>  Sat, 27 Feb 2010 23:26:45 +0100
+
 python-apt (0.7.93.2) unstable; urgency=low
 
   [ Julian Andres Klode ]