Merge remote-tracking branch 'donkult/debian/sid' into debian/sid

Conflicts:
	debian/changelog

diff --cc apt-pkg/algorithms.cc
Simple merge

diff --cc apt-pkg/depcache.cc
Simple merge

diff --cc debian/changelog
index 70046aa657c1ac1d842aedea71beb73cabaaec96,bd25df1e26f6e4a68ee3f2a2f67fd8922cd2e0ff..4baa4d18d780aa63b7292a1feae35d1c0d7e14b2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,28 +1,32 @@@
 -apt (0.9.8.3) UNRELEASED; urgency=low
 +apt (0.9.9) unstable; urgency=low
 +
 +  [ Michael Vogt ]
 +  * improve debug output for the Debug::pkgProblemResolver and
 +    Debug::pkgDepCache::AutoInstall
  
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 02 Jul 2013 08:26:17 +0200
+   [ David Kalnischkies ]
+   * build the en manpages in subdirectory doc/en
+   * remove -ldl from cdrom and -lutil from apt-get linkage
+   * rewrite pkgOrderList::DepRemove to stop incorrect immediate setting
+     (Closes: 645713)
+   * prefer Essentials over Removals in ordering score
+   * fix priority sorting by prefering higher in MarkInstall
+   * try all providers in order if uninstallable in MarkInstall
+   * do unpacks before configures in SmartConfigure (Closes: #707578)
+   * fix support for multiple patterns in apt-cache search (Closes: #691453)
+   * set Fail flag in FileFd on all errors consistently
+   * don't explicitly init ExtractTar InFd with invalid fd
+   * OpenDescriptor should autoclose fd always on error (Closes: #704608)
+   * fail in CopyFile if the FileFds have error flag set
+   * ensure state-dir exists before coyping cdrom files
+   * fix file location for configure-index.gz in apt.conf(5) (Closes: #711921)
+   * handle missing "Description" in apt-cache show (Closes: #712435)
+   * try defaults if auto-detection failed in apt-cdrom (Closes: #712433)
+   * support \n and \r\n line endings in ReadMessages
+   * do not redownload unchanged InRelease files
+   * trigger NODATA error for invalid InRelease files (Closes: #712486)
+ 
+  -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 09 Jun 2013 15:06:24 +0200
  
  apt (0.9.8.2) unstable; urgency=low
  
@@@ -25,12 -43,6 +47,11 @@@
    * Fix crash when the "mirror" method does not find any entry
      (closes: #699303)
  
- 
 +  [ Johan Kiviniemi ]
 +  * cmdline/apt-key:
 +    - Create new keyrings with mode 0644 instead of 0600.
 +    - Accept a nonexistent --keyring file with the adv subcommand as well.
 +
   -- Michael Vogt <mvo@debian.org>  Thu, 06 Jun 2013 19:15:14 +0200
  
  apt (0.9.8.1) unstable; urgency=low