+apt (0.6.39ubuntu4) breezy; urgency=low
+
+ * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this
+ before...)
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Wed, 29 Jun 2005 08:39:17 -0700
+
+apt (0.6.39ubuntu3) breezy; urgency=low
+
+ * Fix keyring locations for Ubuntu in apt-key too.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 14:45:36 +0100
+
+apt (0.6.39ubuntu2) breezy; urgency=low
+
+ * Install ubuntu-archive.gpg rather than debian-archive.gpg as
+ /etc/apt/trusted.gpg.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 11:53:34 +0100
+
+apt (0.6.39ubuntu1) breezy; urgency=low
+
+ * Michael Vogt
+ - Change debian/bugscript to use #!/bin/bash (Closes: #313402)
+ - Fix a incorrect example in the man-page (closes: #282918)
+ - Support architecture-specific extra overrides
+ (closes: #225947). Thanks to Anthony Towns for idea and
+ the patch, thanks to Colin Watson for testing it.
+ - better report network timeouts from the methods to the acuire code,
+ only timeout once per sources.list line
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Tue, 28 Jun 2005 11:52:24 -0700
+
+apt (0.6.39) unstable; urgency=low
+
+ * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6
+ * Merge mvo's changes from 0.6.36ubuntu1:
+ michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32
+ * Merge aggregated translation updates:
+ bubulle@debian.org--2005/apt--main--0
+ * Update priority of apt-utils to important, to match the override file
+ * Install only one keyring on each branch (Closes: #316119)
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Tue, 28 Jun 2005 11:35:21 -0700
+
+apt (0.6.38ubuntu1) breezy; urgency=low
+
+ * First release from Ubuntu branch
+ * Merge with --main--0, switch back to Ubuntu keyring
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Sat, 25 Jun 2005 16:52:41 -0700
+
+apt (0.6.38) unstable; urgency=low
+
+ * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround
+ for the French man pages' failure to build
+ * Branch Debian and Ubuntu
+ - apt.postinst, apt-key: use the appropriate keyring
+ - debian/rules: install all keyrings
+ * Add the current Debian archive signing key (4F368D5D) to
+ debian-archive.gpg
+ * 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)
+
+ -- Matt Zimmerman <mdz@debian.org> Sat, 25 Jun 2005 09:51:00 -0700
+=======
+ -- Matt Zimmerman <mdz@ubuntu.com> Tue, 28 Jun 2005 11:51:09 -0700
+>>>>>>> MERGE-SOURCE
+
+apt (0.6.38) unstable; urgency=low
+
+ * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround
+ for the French man pages' failure to build
+ * Branch Debian and Ubuntu
+ - apt.postinst, apt-key: use the appropriate keyring
+ - debian/rules: install all keyrings
+ * Add the current Debian archive signing key (4F368D5D) to
+ debian-archive.gpg
+ * 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)
+
+ -- Matt Zimmerman <mdz@debian.org> Sat, 25 Jun 2005 09:51:00 -0700
+
+>>>>>>> MERGE-SOURCE
+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)
+ * Change debian/bugscript to use #!/bin/bash (Closes: #313402)
+
+ -- 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:
+ - 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)
+
+ -- Michael Vogt <mvo@debian.org> Thu, 31 Mar 2005 20:37:11 +0200
+
+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
+
+apt (0.6.33) hoary; urgency=low
+
+ * Merge michael.vogt@ubuntu.com--2005/apt--mvo--0 (through patch-6)
+ - patch-1: cosmetic changes (whitespace, "Apt::GPGV->APT::GPGV")
+ - patch-2: (doc) documentation for gpgv
+ - patch-3: (doc) new config variables added configure-index
+ - patch-4: pkgAcquire::Run() pulse intervall can be configured
+ - patch-5: fix for apt-get update removing Release.gpg files (#6865)
+ - patch-6: change the path scoring in apt-cdrom, prefer pathes without
+ symlinks
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Sat, 26 Feb 2005 15:21:17 -0800
+
+apt (0.6.32) hoary; urgency=low
+
+ * Merge michael.vogt@ubuntu.com--2005/apt--mvo--0 (patch-1)
+ - Implement Acquire::gpgv::options (Ubuntu bug#6283)
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Tue, 8 Feb 2005 19:31:15 -0800
+
+apt (0.6.31) hoary; urgency=low
+
+ * Matt Zimmerman
+ - Remove debugging output from apt.cron.daily (no one noticed?)
+ - Apply patch from Anthony Towns to allow SHA1Summation to process a file
+ descriptor until EOF, rather than requiring that the length of input be
+ specified (Closes: #291338)
+ - Fix build/install of Polish offline documentation, based on patch from
+ Christian Perrier (Closes: #270404)
+ * Michael Vogt
+ - apt-cdrom.cc seperated into frontend (cmdline/apt-cdrom.cc and library
+ apt-pkg/cdrom.{cc,h}) (Ubuntu #5668)
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Fri, 4 Feb 2005 10:23:01 -0800
+
+apt (0.6.30) unstable; urgency=low
+
+ * Add ppc64 to buildlib/archtable
+ * Merge michael.vogt@canonical.com--2004/apt--status-fd--0
+ - Support preserving dpkg status file descriptor, to support
+ better integration with synaptic
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Wed, 19 Jan 2005 00:26:01 -0800
+
+apt (0.6.29) hoary; urgency=low
+
+ * Merge apt--mvo--0 (0.6.27ubuntu4)
+
+
+ -- Matt Zimmerman <mdz@canonical.com> Tue, 28 Dec 2004 17:18:02 -0800
+
+apt (0.6.28) hoary; urgency=low
+
+ * Merge apt--mvo--0
+ * Rebuild source to get rid of arch metadata and temporary files in
+ 0.6.27ubuntu3
+
+ -- Matt Zimmerman <mdz@canonical.com> Thu, 23 Dec 2004 18:53:16 -0800
+
apt (0.6.27ubuntu4) hoary; urgency=low
- * if a sign-file download fails, delete the the partial downloaded
- file in "partial/"
+ * remove old sig-file in partial/ before starting to fetch a new sig-file
+ (see ubuntu #4769 for the rational)
* added apt-key update method (uses ubuntu-keyring)
* documented the "--allow-unauthenticated" switch
* added DEB_BUILD_PROG_OPTS to debian/rules (additonal options can be