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

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 70aa273651f07f873aee50a758c467ddbdbf1ed0..d2b89636932347a7e16e3ae67c1adc6b19586f4a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,68 @@
-apt (0.6.34) UNRELEASED; 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:
+    - apt-pkg/acquire-item.cc:
+      added "Acquire::BrokenProxy" that will force apt to always 
+      re-get the Release.gpg file (for broken proxies)
+    - debian/apt.cron.daily:
+      MinAge is defaulting to 2 days now to prevent over-aggresive removal 
+    - 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
+
+  * Merge apt--mvo--0 (incorporates 0.6.34ubuntu1):
+    - Implement MaxSize and MaxAge in apt.cron.daily, to prevent the cache
+      from growing too large (Ubuntu #6761)
+    - some comments about the pkgAcqMetaSig::Custom600Headers() added
+    - use gpg --with-colons
+    - commented the ftp no_proxy unseting in methods/ftp.cc
+    - added support for "Acquire::gpgv::options" in methods/gpgv.cc
+  * Merge bubulle@debian.org--2005/apt--main--0
+    - Make capitalization more consistent
+    - Un-fuzzy translations resulting from capitalization changes
+    - Italian translation update
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Mon,  7 Mar 2005 20:08:33 -0800
+
+apt (0.6.34) hoary; urgency=low
 
   * Add missing semicolon to configure-index (Closes: #295773)
   * Update build-depends on gettext to 0.12 (Closes: #295077)
+  * Merge from bubulle@debian.org--2005/apt--main--0 to get
+    translation updates
 
  -- Matt Zimmerman <mdz@ubuntu.com>  Fri,  4 Mar 2005 16:13:15 -0800