merge with debian-sid

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index da8b0271bfae79d84f9e6efb8e6b7e9da35009a7..1b3bfd6ae492c77deff4ea208403d3081f9e4f90 100644 (file)
--- 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 739f1b425634764f6efaa153e77771ac4e532585..9126e9dc38b1bffc252799af9fc8b6b9736b91c8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,7 +26,13 @@ apt (0.8.7) UNRELEASED; urgency=low
       uncompressed data. This fixes cache building progress going way
       over 100%.
 
- -- Christian Perrier <bubulle@debian.org>  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 <kalnischkies@gmail.com>  Thu, 07 Oct 2010 14:46:59 +0200
 
 apt (0.8.6) unstable; urgency=low