deblistparser: Special-case *-armel, lpia and powerpcspe architectures.

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 00016679aa4cc9423347b923552c5420b8acb58e..6ede14c4db8ba308a8b80ef0716cc33c65395fea 100644 (file)
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -479,6 +479,12 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op)
  * The complete architecture, consisting of <kernel>-<cpu>.
  */
 static string CompleteArch(std::string& arch) {
+    if (arch == "armel")              return "linux-arm";
+    if (arch == "lpia")               return "linux-i386";
+    if (arch == "powerpcspe")         return "linux-powerpc";
+    if (arch == "uclibc-linux-armel") return "linux-arm";
+    if (arch == "uclinux-armel")      return "uclinux-arm";
+
     return (arch.find("-") != string::npos) ? arch : "linux-" + arch;
 }
                                                                        /*}}}*/