From 5b28c8040795b53a4df54f33e57976720558ed32 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Wed, 1 Aug 2007 19:51:20 -0300
Subject: * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix wrong
   directory downloading on non-linux architectures (closes: #435597)

---
 ftparchive/apt-ftparchive.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ftparchive')

diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index 290326ec3..3b1e80631 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -544,8 +544,8 @@ void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
 /* */
 bool ShowHelp(CommandLine &CmdL)
 {
-   ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
-	    COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+	    COMMON_ARCH,__DATE__,__TIME__);
    if (_config->FindB("version") == true)
       return true;
 
-- 
cgit v1.2.3


From 4f333a8bea2c8431df2ec92001981355623818e8 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 10 Sep 2007 16:03:07 +0200
Subject: * make apt build with g++ 4.3

---
 ftparchive/writer.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ftparchive')

diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 59107e02b..9d248ab86 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -28,6 +28,7 @@
 #include <ftw.h>
 #include <fnmatch.h>
 #include <iostream>
+#include <memory>
     
 #include "cachedb.h"
 #include "apt-ftparchive.h"
-- 
cgit v1.2.3