From 3b9c5cc2bdf1584525792aafe4e8f15d09951583 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Thu, 7 Oct 2010 14:50:25 +0200 Subject: * apt-pkg/deb/deblistparser.cc: - support ArmHardFloat port in CompleteArch, thanks to Sebastian Andrzej Siewior for the patch! --- apt-pkg/deb/deblistparser.cc | 1 + debian/changelog | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index da8b0271b..1b3bfd6ae 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -481,6 +481,7 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op) */ static string CompleteArch(std::string& arch) { if (arch == "armel") return "linux-arm"; + if (arch == "armhf") return "linux-arm"; if (arch == "lpia") return "linux-i386"; if (arch == "powerpcspe") return "linux-powerpc"; if (arch == "uclibc-linux-armel") return "linux-arm"; diff --git a/debian/changelog b/debian/changelog index e7d784eb8..c7aead5bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,13 @@ apt (0.8.7) UNRELEASED; urgency=low * Wrong translation for "showauto" fixed. Thanks to Raphaël Hertzog Closes: #599265 - -- Christian Perrier Tue, 05 Oct 2010 05:35:58 +0200 + [ David Kalnischkies ] + * apt-pkg/deb/deblistparser.cc: + - support ArmHardFloat port in CompleteArch, thanks to Sebastian + Andrzej Siewior for the patch! + + + -- David Kalnischkies Thu, 07 Oct 2010 14:46:59 +0200 apt (0.8.6) unstable; urgency=low -- cgit v1.2.3