* merged from main

Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-106
   Restore lost changelog entries

 * apt@packages.debian.org/apt--main--0--patch-107
   Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0

 * apt@packages.debian.org/apt--main--0--patch-108
   Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0

 * apt@packages.debian.org/apt--main--0--patch-109
   Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0

 * apt@packages.debian.org/apt--main--0--patch-110
   Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0

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

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-85

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-1
   * inital proof of concept code, understands what dpkg tells it already

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-2
   * progress reporting works now

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-3
   * added "APT::Status-Fd" variable

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-4
   * do i18n now too

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-5
   * define N_(x) if it is not defined already

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-6
   * PackageManager::DoInstall(int status_fd) added (does not break the ABI)

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-7
   * merged with apt--fixes--0 to make it build again

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-8
   * added support for "error" and "conffile-prompt" messages from dpkg

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-9
   merge with main

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-10
   * use sizeof() for all snprintf() uses; fix a potential line break problem in the status reading code; changed the N_() to _() calls

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-11
   * added APT::KeepFDs configuration list for file descriptors that apt should leave open (needed for various frontends like debconf, synaptic)

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-12
   * fixed a API breakage

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-13
   * doc added, should be releasable now

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-14
   * merged with apt--main--0

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-15
   * more source comments, added Debug::DpkgPM debug code to inspect the dpkg<->apt communication, broke the abi (ok with matt)

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-16
   * the progress reporting has it's own "Debug::pkgDPkgProgressReporting" debug variable now

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-17
   * merged PackageOps and TranslatedPackageOps into a single Map with the new DpkgState struct

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-18
   * clear the APT::Keep-Fds configuration when it's no longer needed

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-19
   * rewrote the reading from dpkg so that it never blocks

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-20
   * merged the two status arrays into one

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-21
   * added support for download progress reporting too (for Kamion and base-config)

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-22
   * ABI break; added Configuration::Clear(string List, {int,string} value) added (to remove a single Value from a list); test/conf_clear.cc added

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-23
   * remvoed a debug string

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-24
   * soname changed, fixed a bug in the parsing code when dpkg send the same state more than once (at the end)

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-25
   * merged with apt@packages.debian.org/apt--main--0, added changelog entry for the 0.6.40.1 upload

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-26
   * fix a bug when out-of-order states are send from dpkg 

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-27
   * changelog update

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-28
   * a real changelog entry now

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-29
   * changelog finalized

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-30
   * propper (and sane) support for pmerror and pmconffile added

2 files changed, 254 insertions, 1 deletions

diff --git a/debian/apt-doc.docs b/debian/apt-doc.docs
new file mode 100644
index 000000000..a7507f4e7
--- /dev/null
+++ b/debian/apt-doc.docs
@@ -0,0 +1 @@
+README.progress-reporting
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 78b400954..614041acf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+apt (0.6.40.2) unstable; urgency=low
+
+  * improved the support for "error" and "conffile" reporting from
+    dpkg, added the format to README.progress-reporting
+  * added README.progress-reporting to the apt-doc package
+
+ --
+
+apt (0.6.40.1) unstable; urgency=low
+
+  * bugfix in the parsing code for the apt<->dpkg communication. apt 
+    crashed when dpkg sends the same state more than once under certain
+    conditions
+  * 0.6.40 breaks the ABI but I accidentally didn't change the soname :/
+
+ -- Michael Vogt <mvo@debian.org>  Fri,  5 Aug 2005 13:24:58 +0200
+
 apt (0.6.40) unstable; urgency=low
 
   * Patch from Jordi Mallach to mark some additional strings for translation
@@ -5,8 +22,13 @@ apt (0.6.40) unstable; urgency=low
   * Merge from bubulle@debian.org--2005/apt--main--0:
     - Update pot and merge with *.po
     - Updated French translation, including apt-key.fr.8
+  * Restore changelog entries from the 0.6.x series that went to Debian
+    experimental
+  * Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0
+    - Provide an interface for progress reporting which can be used by
+      (e.g.) base-config
 
- -- Matt Zimmerman <mdz@ubuntu.com>  Thu, 28 Jul 2005 11:57:32 -0700
+ -- Matt Zimmerman <mdz@debian.org>  Thu, 28 Jul 2005 11:57:32 -0700
 
 apt (0.6.39) unstable; urgency=low
 
@@ -213,6 +235,236 @@ apt (0.6.27) hoary; urgency=low
 
  -- Matt Zimmerman <mdz@canonical.com>  Mon, 13 Dec 2004 01:03:11 -0800
 
+apt (0.6.25) experimental; urgency=low
+
+  * Fix handling of two-part sources for sources.list deb-src entries in
+    the same way that deb entries were fixed
+
+ -- Matt Zimmerman <mdz@debian.org>  Wed,  9 Jun 2004 05:29:50 -0700
+
+apt (0.6.24) experimental; urgency=low
+
+  * YnPrompt fixes were inadvertently left out, include them (Closes:
+    #249251)
+
+ -- Matt Zimmerman <mdz@debian.org>  Sun, 16 May 2004 14:18:53 -0700
+
+apt (0.6.23) experimental; urgency=low
+
+  * Remove obsolete pkgIterator::TargetVer() (Closes: #230159)
+  * Reverse test in CheckAuth to match new prompt (Closes: #248211)
+
+ -- Matt Zimmerman <mdz@debian.org>  Sun,  9 May 2004 21:01:58 -0700
+
+apt (0.6.22) experimental; urgency=low
+
+  * Merge 0.5.25
+  * Make the unauthenticated packages prompt more intuitive (yes to
+    continue, default no), but require --force-yes in addition to
+    --assume-yes in order to override
+
+ -- Matt Zimmerman <mdz@debian.org>  Fri, 19 Mar 2004 13:55:35 -0800
+
+apt (0.6.21) experimental; urgency=low
+
+  * Merge 0.5.24
+
+ -- Matt Zimmerman <mdz@debian.org>  Tue, 16 Mar 2004 22:52:34 -0800
+
+apt (0.6.20) experimental; urgency=low
+
+  * Merge 0.5.23
+
+ -- Matt Zimmerman <mdz@debian.org>  Thu, 26 Feb 2004 17:17:02 -0800
+
+apt (0.6.19) experimental; urgency=low
+
+  * Merge 0.5.22
+  * Convert apt-key(8) to docbook XML
+
+ -- Matt Zimmerman <mdz@debian.org>  Mon,  9 Feb 2004 15:44:49 -0800
+
+apt (0.6.18) experimental; urgency=low
+
+  * Add new Debian Archive Automatic Signing Key to the default keyring
+    (existing keyrings are not updated; do that yourself)
+
+ -- Matt Zimmerman <mdz@debian.org>  Sat, 17 Jan 2004 17:04:30 -0800
+
+apt (0.6.17) experimental; urgency=low
+
+  * Merge 0.5.21
+  * Handle more IMS stuff correctly
+
+ -- Matt Zimmerman <mdz@debian.org>  Fri, 16 Jan 2004 10:54:25 -0800
+
+apt (0.6.16) experimental; urgency=low
+
+  * Fix some cases where the .gpg file could be left in place when it is
+    invalid
+
+ -- Matt Zimmerman <mdz@debian.org>  Fri,  9 Jan 2004 09:22:15 -0800
+
+apt (0.6.15) experimental; urgency=low
+
+  * s/Debug::Acquire::gpg/&v/
+  * Honor the [vendor] syntax in sources.list again (though it is not
+    presently used for anything)
+  * Don't ship vendors.list(5) since it isn't used yet
+  * Revert change from 0.6.10; it was right in the first place and the
+    problem was apparently something else.  Archive = Suite.
+
+ -- Matt Zimmerman <mdz@debian.org>  Mon,  5 Jan 2004 17:43:01 -0800
+
+apt (0.6.14) experimental; urgency=low
+
+  * Merge 0.5.20
+
+ -- Matt Zimmerman <mdz@debian.org>  Sun,  4 Jan 2004 11:09:21 -0800
+
+apt (0.6.13) experimental; urgency=low
+
+  * Merge 0.5.19
+
+ -- Matt Zimmerman <mdz@debian.org>  Sat,  3 Jan 2004 16:22:31 -0800
+
+apt (0.6.12) experimental; urgency=low
+
+  * Have pkgAcquireIndex calculate an MD5 sum if one is not provided by
+    the method (as with file: and copy:).  Local repositories
+  * Fix warning about dist name mismatch to actually print what it was
+    expecting
+  * Don't expect any particular distribution name for two-part
+    sources.list entries
+  * Merge 0.5.18
+
+ -- Matt Zimmerman <mdz@debian.org>  Fri,  2 Jan 2004 13:59:00 -0800
+
+apt (0.6.11) experimental; urgency=low
+
+  * Support IMS requests of Release.gpg and Release
+  * This required API changes, bump the libapt-pkg version
+  * Copy local Release files into Dir::State::Lists
+  * Set IndexFile attribute when retrieving Release and Release.gpg so
+    that the appropriate Cache-Control headers are sent
+
+ -- Matt Zimmerman <mdz@debian.org>  Fri,  2 Jan 2004 10:46:17 -0800
+
+apt (0.6.10) experimental; urgency=low
+
+  * Use "Codename" (woody, sarge, etc.) to supply the value of the
+    "Archive" package file attribute, used to match "release a=" type
+    pins, rather than "Suite" (stable, testing, etc.)
+
+ -- Matt Zimmerman <mdz@debian.org>  Thu,  1 Jan 2004 16:56:47 -0800
+
+apt (0.6.9) experimental; urgency=low
+
+  * Another tagfile workaround
+
+ -- Matt Zimmerman <mdz@debian.org>  Thu,  1 Jan 2004 13:56:08 -0800
+
+apt (0.6.8) experimental; urgency=low
+
+  * Add a config option and corresponding command line option
+    (--allow-unauthenticated) to apt-get, to make buildd operators happy
+    (Closes: #225648)
+
+ -- Matt Zimmerman <mdz@debian.org>  Wed, 31 Dec 2003 08:28:04 -0800
+
+apt (0.6.7) experimental; urgency=low
+
+  * Forgot to revert part of the changes to tagfile in 0.6.4.  Hopefully
+    will fix segfaults for some folks.
+
+ -- Matt Zimmerman <mdz@debian.org>  Wed, 31 Dec 2003 08:01:28 -0800
+
+apt (0.6.6) experimental; urgency=low
+
+  * Restore the ugly hack I removed from indexRecords::Load which set the
+    pkgTagFile buffer size to (file size)+256.  This is concealing a bug,
+    but I can't fix it right now.  This should fix the segfaults that
+    folks are seeing with 0.6.[45].
+
+ -- Matt Zimmerman <mdz@debian.org>  Mon, 29 Dec 2003 18:11:13 -0800
+
+apt (0.6.5) experimental; urgency=low
+
+  * Move the authentication check into a separate function in apt-get
+  * Fix display of unauthenticated packages when they are in the cache
+    (Closes: #225336)
+
+ -- Matt Zimmerman <mdz@debian.org>  Sun, 28 Dec 2003 16:47:57 -0800
+
+apt (0.6.4) experimental; urgency=low
+
+  * Use the top-level Release file in LoadReleaseInfo, rather than looking
+    for the per-section ones (which aren't downloaded anymore).  This
+    unbreaks release pinning, including the NotAutomatic bit used by
+    project/experimental
+  * Use FileFd::Size() rather than a separate stat() call in
+    LoadReleaseInfo
+  * Fix pkgTagFile to leave a little extra room at the end of the buffer
+    to append the record separator if it isn't present
+  * Change LoadReleaseInfo to use "Suite" rather than "Archive", to match
+    the Debian archive's dist-level Release files
+
+ -- Matt Zimmerman <mdz@debian.org>  Sun, 28 Dec 2003 15:55:55 -0800
+
+apt (0.6.3) experimental; urgency=low
+
+  * Fix MetaIndexURI for flat ("foo/") sources
+
+ -- Matt Zimmerman <mdz@debian.org>  Sun, 28 Dec 2003 12:11:56 -0800
+
+apt (0.6.2) experimental; urgency=low
+
+  * Add space between package names when multiple unauthenticated packages
+    are being installed (Closes: #225212)
+  * Provide apt-key with a secret keyring and a trustdb, even though we
+    would never use them, because it blows up if it doesn't have them
+  * Fix typo in apt-key(8) (standard input is '-', not '/')
+
+ -- Matt Zimmerman <mdz@debian.org>  Sat, 27 Dec 2003 13:01:40 -0800
+
+apt (0.6.1) experimental; urgency=low
+
+  * Merge apt 0.5.17
+  * Rearrange Release file authentication code to be more clear
+  * If Release is present, but Release.gpg is not, don't forget to still
+    queue Packages files
+  * Convert distribution "../project/experimental" to "experimental" for
+    comparison purposes
+  * Make a number of Release file errors into warnings; for now, it is OK
+    not to have a codename, for example.  We mostly care about checksums
+    for now
+
+ -- Matt Zimmerman <mdz@debian.org>  Fri, 26 Dec 2003 15:12:47 -0800
+
+apt (0.6.0) experimental; urgency=low
+
+  * Signature verification support patch ("apt-secure") from Colin Walters
+    <walters@debian.org> and Isaac Jones <ijones@syntaxpolice.org>.  This
+    implements:
+     - Release signature verification (Release.gpg)
+     - Packages, Sources md5sum verification against Release
+     - Closes: #203741
+  * Make some modifications to signature verification support:
+    - Release.gpg is always retrieved and verified if present, rather than
+      requiring that sources be configured as secure
+    - Print a hint about installing gnupg if exec(gpgv) fails
+    - Remove obsolete pkgAcqIndexRel
+    - Move vendors.list stuff into a separate module (vendorlist.{h,cc})
+    - If any files about to be retrieved are not authenticated, issue a
+      warning to the user and require confirmation
+    - Fix a heap corruption bug in pkgSrcRecords::pkgSrcRecords()
+  * Suggests: gnupg
+  * Install a keyring in /usr/share/apt/debian-archive.gpg containing an
+    initial set of Debian archive signing keys to seed /etc/apt/trusted.gpg
+  * Add a new tool, apt-key(8) used to manage the keyring
+
+ -- Matt Zimmerman <mdz@debian.org>  Fri, 26 Dec 2003 08:27:19 -0800
+
 apt (0.5.32) hoary; urgency=low
 
   * Call setlocale in the methods, so that the messages are properly