* merged with apt--main and apt--fixes

Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-80
   Merge michael.vogt@ubuntu.com--2005/apt--fixes--0

 * apt@packages.debian.org/apt--main--0--patch-81
   Open 0.6.37

 * apt@packages.debian.org/apt--main--0--patch-82
   merge bubulle@debian.org--2005/apt--main--0

 * apt@packages.debian.org/apt--main--0--patch-83
   Update changelog

 * apt@packages.debian.org/apt--main--0--patch-84
   Fix build of French man pages (now using XML, not SGML)

 * apt@packages.debian.org/apt--main--0--patch-85
   Merge patch from Philippe Batailler for French man page build

 * apt@packages.debian.org/apt--main--0--patch-86
   add Welsh translations from Dafydd Harries

 * apt@packages.debian.org/apt--main--0--patch-87
   Update changelog

 * apt@packages.debian.org/apt--main--0--patch-88
   Change debian/bugscript to use #!/bin/bash (Closes: #313402)

 * 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

 * bubulle@debian.org--2005/apt--main--0--patch-66
   Italian translation complete

 * bubulle@debian.org--2005/apt--main--0--patch-67
   Sync with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-68
   Sync with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-69
   Sync with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-70
   Re-generate the POT and PO files from sources

 * bubulle@debian.org--2005/apt--main--0--patch-71
   Update French translation

 * bubulle@debian.org--2005/apt--main--0--patch-72
   Merge with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-73
   Basque translation update

 * bubulle@debian.org--2005/apt--main--0--patch-74
   Hebres translation update

 * bubulle@debian.org--2005/apt--main--0--patch-75
   Merge with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-76
   Correct the Hebrew translation for #306658

 * bubulle@debian.org--2005/apt--main--0--patch-77
   Update French man pages translations

 * bubulle@debian.org--2005/apt--main--0--patch-78
   Merge with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-79
   Correct syntax errors in Hebrew translation

 * bubulle@debian.org--2005/apt--main--0--patch-80
   Revert changes to debian/changelog and debian/apt.cron.daily

 * bubulle@debian.org--2005/apt--main--0--patch-81
   Portuguese translation update

 * daf@muse.19inch.net--2005/apt--main--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-85

 * daf@muse.19inch.net--2005/apt--main--0--patch-1
   add Welsh translation

 * 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

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-5
   * merged with apt--main--0

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6
   * build fix for apt--main--0

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-7
   * fixed incorrect man-page example

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-8
   * changelog udpate

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-9
   * we only need to check once for xmlto

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-26
   * fix the cache-control header generation 

 * 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.

 * philippe.batailler@free.fr--2005/apt--mainBubulle--0.1--patch-1
   Passage sous arch

 * philippe.batailler@free.fr--2005/apt--mainMatt--0--patch-1
   fix xml error 

6 files changed, 13 insertions, 5 deletions

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;