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

1 files changed, 20 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 6296a98e5..d2b896369 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,29 @@
-apt (0.6.36ubuntu1) breezy; urgency=low
+apt (0.6.37) breezy; urgency=low
 
   * apt-cache show <virtualpkg> shows the available packages providing 
     the virtual pkg (thanks to otavio) (closes: #202493)
   * make pinning on the "component" work again (using the section of the 
     archive, we don't use per-section Release files anymore with apt-0.6)
     (closes ubuntu #9935)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 23 May 2005 23:02:50 +0200
+
+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
 
+>>>>>>> MERGE-SOURCE
 apt (0.6.36) experimental; urgency=low
 
   * Merge apt--mvo--0:
@@ -21,7 +35,11 @@ apt (0.6.36) experimental; urgency=low
     - apt-pkg/cdrom.cc:
       honor "Acquire::gpgv::Options" when verifying the signature (Ubuntu #8496)
  
+<<<<<<< TREE
  -- Michael Vogt <mvo@debian.org>  Fri,  6 May 2005 10:12:20 +0200
+=======
+ -- Michael Vogt <mvo@debian.org>  Thu, 31 Mar 2005 20:37:11 +0200
+>>>>>>> MERGE-SOURCE
 
 apt (0.6.35) hoary; urgency=low