* merged with my apt--fixes--0 branch

Patches applied:

 * apt@packages.debian.org/apt--misc-abi-changes--0--patch-4
   Merge from mainline

 * apt@packages.debian.org/apt--misc-abi-changes--0--patch-5
   Merge from mainline

 * apt@packages.debian.org/apt--misc-abi-changes--0--patch-6
   Collapse both pkgAcquire::Run() methods into one, with a default value

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-79

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-1
   * merged obvious fixes into the tree to make it easy for matt to merge

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-2
   * more merges from otavio that looks good/uncritical

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-3
   * merged Matts misc-abi-changes tree

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-4
   * finalized the changelog for a ubuntu build

 * otavio@debian.org--2005/apt--fixes--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-71

 * otavio@debian.org--2005/apt--fixes--0--patch-1
   Fix comments about the need of xmlto

 * otavio@debian.org--2005/apt--fixes--0--patch-2
   Fix a compile warning

 * otavio@debian.org--2005/apt--fixes--0--patch-3
   Sync with apt--main--0--patch-76

 * otavio@debian.org--2005/apt--fixes--0--patch-4
   Sync with apt--main--0--patch-78

 * otavio@debian.org--2005/apt--fixes--0--patch-5
   Add fixes that was wrongly included on DDTP changes.

 * otavio@debian.org--2005/apt--fixes--0--patch-8
   Add information about the other fixes include on this branch now.

 * otavio@debian.org--2005/apt--fixes--0--patch-9
   Merge last changes from apt--main--0.

 * otavio@debian.org--2005/apt--fixes--0--patch-10
   Fix warnings about min/max change in gcc-4.0

 * otavio@debian.org--2005/apt--fixes--0--patch-11
   Fix remaning warnings while compiling gcc-4.0

 * otavio@debian.org--2005/apt--fixes--0--patch-12
   Add changelog entry about the fixes for warnings while compiling using GCC 4.0 compiler.

10 files changed, 17 insertions, 7 deletions

diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 3e338b220..27bb3d363 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -100,8 +100,7 @@ class pkgAcquire
 
    enum RunResult {Continue,Failed,Cancelled};
 
-   RunResult Run() { return Run(500000); }; // Binary compatibility
-   RunResult Run(int PulseIntervall);
+   RunResult Run(int PulseIntervall=500000);
    void Shutdown();
    
    // Simple iteration mechanism
diff --git a/apt-pkg/clean.h b/apt-pkg/clean.h
index ee65fcb61..43164e250 100644
--- a/apt-pkg/clean.h
+++ b/apt-pkg/clean.h
@@ -25,6 +25,7 @@ class pkgArchiveCleaner
    public:   
    
    bool Go(string Dir,pkgCache &Cache);
+   virtual ~pkgArchiveCleaner() {};
 };
 
 #endif
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index af741b672..b17b94319 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -30,8 +30,8 @@ bool Hashes::AddFD(int Fd,unsigned long Size)
    int Res = 0;
    while (Size != 0)
    {
-      Res = read(Fd,Buf,MIN(Size,sizeof(Buf)));
-      if (Res < 0 || (unsigned)Res != MIN(Size,sizeof(Buf)))
+      Res = read(Fd,Buf,min(Size,(unsigned long)sizeof(Buf)));
+      if (Res < 0 || (unsigned)Res != min(Size,(unsigned long)sizeof(Buf)))
 	 return false;
       Size -= Res;
       MD5.Add(Buf,Res);
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 481ea88f8..40bbe00a0 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -20,6 +20,10 @@
 #include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>
 
+#include <algorithm>
+
+using std::min;
+
 class Hashes
 {
    public:
diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index 2bd745153..fded5c864 100644
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -299,8 +299,8 @@ bool MD5Summation::AddFD(int Fd,unsigned long Size)
    int Res = 0;
    while (Size != 0)
    {
-      Res = read(Fd,Buf,MIN(Size,sizeof(Buf)));
-      if (Res < 0 || (unsigned)Res != MIN(Size,sizeof(Buf)))
+      Res = read(Fd,Buf,min(Size,(unsigned long)sizeof(Buf)));
+      if (Res < 0 || (unsigned)Res != min(Size,(unsigned long)sizeof(Buf)))
 	 return false;
       Size -= Res;
       Add(Buf,Res);
diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 47c6a7cec..9e20f7cef 100644
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -28,8 +28,10 @@
 #endif 
 
 #include <string>
+#include <algorithm>
 
 using std::string;
+using std::min;
 
 class MD5Summation;
 
diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc
index 9b402c523..72eafd4ca 100644
--- a/apt-pkg/contrib/sha1.cc
+++ b/apt-pkg/contrib/sha1.cc
@@ -347,7 +347,7 @@ bool SHA1Summation::AddFD(int Fd,unsigned long Size)
    while (Size != 0 || ToEOF)
    {
       unsigned n = sizeof(Buf);
-      if (!ToEOF) n = MIN(Size,n);
+      if (!ToEOF) n = min(Size,(unsigned long)n);
       Res = read(Fd,Buf,n);
       if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
 	 return false;
diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index 7d25ceb0d..db8ca7893 100644
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -19,8 +19,10 @@
 #endif 
 
 #include <string>
+#include <algorithm>
 
 using std::string;
+using std::min;
 
 class SHA1Summation;
 
diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index fa8e9c156..4dcb2b46d 100644
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -43,6 +43,7 @@ class IndexCopy
 
    bool CopyPackages(string CDROM,string Name,vector<string> &List,
 		     pkgCdromStatus *log);
+   virtual ~IndexCopy() {};
 };
 
 class PackageCopy : public IndexCopy
diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index be02669fa..61049f4bd 100644
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -55,6 +55,7 @@ class pkgIndexFile
 
       virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator /*File*/) const {return 0;};
       Type();
+      virtual ~Type() {};
    };
 
    virtual const Type *GetType() const = 0;