* merged with otavios branch

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--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--mvo--0--patch-26
   * fix the cache-control header generation 

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-18
   Revert changes did by mistake on translation files.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-19
   Merge last changes did from upstream side.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-20
   Sync with apt--main--0--patch-87

 * 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 

1 files changed, 33 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 4cf7ea40a..63a98f470 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,38 @@ apt (0.6.36os1) unstable; urgency=low
 
  -- Otavio Salvador <otavio@debian.org>  Thu,  7 Apr 2005 21:16:46 -0300
 
+apt (0.6.37) breezy; urgency=low
+
+  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81
+    - patch-66: Italian update
+    - patch-71: French update
+    - patch-73: Basque update
+    - patch-74: Hebrew update
+    - patch-76: Correct Hebrew translation (Closes: #306658)
+    - patch-77: French man page update
+    - patch-79: Correct syntax errors in Hebrew translation
+    - patch-81: Portuguese update
+  * Fix build of French man pages (now using XML, not SGML)
+  * Add Welsh translation from Dafydd Harries
+    (daf@muse.19inch.net--2005/apt--main--0--patch-1)
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Tue, 24 May 2005 14:38:25 -0700
+
+apt (0.6.36ubuntu1) breezy; urgency=low
+
+  * make it possible to write a cache-control: no-cache header even if
+    no proxy is set to support transparent proxies (closes ubuntu: #10773)
+
+  * Merge otavio@debian.org--2005/apt--fixes--0.6:
+    - Fix comment about the need of xmlto while building from Arch;
+    - Fix StatStore struct on cachedb.h to use time_t and then fix a compile
+      warning;
+    - Lock database at start of DoInstall routine to avoid concurrent
+      runs of install/remove and update commands (Closes: #194467)
+    - Fix warnings while compiling with GCC 4.0 compiler  
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 23 May 2005 11:57:53 +0200
+
 apt (0.6.36) experimental; urgency=low
 
   * Merge apt--mvo--0:
@@ -17,7 +49,7 @@ apt (0.6.36) experimental; urgency=low
     - apt-pkg/cdrom.cc:
       honor "Acquire::gpgv::Options" when verifying the signature (Ubuntu #8496)
  
- -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 31 Mar 2005 20:37:11 +0200
+ -- Michael Vogt <mvo@debian.org>  Thu, 31 Mar 2005 20:37:11 +0200
 
 apt (0.6.35) hoary; urgency=low