merged from http://bzr.debian.org/bzr/apt/apt/debian-sid

diff --cc apt-pkg/acquire-item.cc
Simple merge

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

diff --cc apt-pkg/algorithms.h
index 050934b,99501be..86d5fbd
--- 1/apt-pkg/algorithms.h
--- 2/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@@ -108,10 -105,10 +108,13 @@@ class pkgProblemResolver                                                /*{{{*
  
     void MakeScores();
     bool DoUpgrade(pkgCache::PkgIterator Pkg);
 +
 +   bool ResolveInternal(bool const BrokenFix = false);
 +   bool ResolveByKeepInternal();
     
+    protected:
+    bool InstOrNewPolicyBroken(pkgCache::PkgIterator Pkg);
+ 
     public:
     
     inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protected; Cache.MarkProtected(Pkg);};

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

diff --cc apt-pkg/init.cc
index 66b0119,38a0814..8f20c31
--- 1/apt-pkg/init.cc
--- 2/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@@ -47,48 -48,49 +48,50 @@@ bool pkgInitConfig(Configuration &Cnf
     struct stat St;   
     if (stat("/var/lib/apt/.",&St) != 0 &&
         stat("/var/state/apt/.",&St) == 0)
-       Cnf.Set("Dir::State","var/state/apt/");
+       Cnf.CndSet("Dir::State","var/state/apt/");
         
-    Cnf.Set("Dir::State::lists","lists/");
-    Cnf.Set("Dir::State::cdroms","cdroms.list");
-    Cnf.Set("Dir::State::mirrors","mirrors/");
+    Cnf.CndSet("Dir::State::lists","lists/");
+    Cnf.CndSet("Dir::State::cdroms","cdroms.list");
+    Cnf.CndSet("Dir::State::mirrors","mirrors/");
  
     // Cache
-    Cnf.Set("Dir::Cache","var/cache/apt/");
-    Cnf.Set("Dir::Cache::archives","archives/");
-    Cnf.Set("Dir::Cache::srcpkgcache","srcpkgcache.bin");
-    Cnf.Set("Dir::Cache::pkgcache","pkgcache.bin");
+    Cnf.CndSet("Dir::Cache","var/cache/apt/");
+    Cnf.CndSet("Dir::Cache::archives","archives/");
+    Cnf.CndSet("Dir::Cache::srcpkgcache","srcpkgcache.bin");
+    Cnf.CndSet("Dir::Cache::pkgcache","pkgcache.bin");
     
     // Configuration
-    Cnf.Set("Dir::Etc","etc/apt/");
-    Cnf.Set("Dir::Etc::sourcelist","sources.list");
-    Cnf.Set("Dir::Etc::sourceparts","sources.list.d");
-    Cnf.Set("Dir::Etc::vendorlist","vendors.list");
-    Cnf.Set("Dir::Etc::vendorparts","vendors.list.d");
-    Cnf.Set("Dir::Etc::main","apt.conf");
-    Cnf.Set("Dir::Etc::netrc", "auth.conf");
-    Cnf.Set("Dir::Etc::parts","apt.conf.d");
-    Cnf.Set("Dir::Etc::preferences","preferences");
-    Cnf.Set("Dir::Etc::preferencesparts","preferences.d");
-    Cnf.Set("Dir::Etc::trusted", "trusted.gpg");
-    Cnf.Set("Dir::Etc::trustedparts","trusted.gpg.d");
- 
-    Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
-    Cnf.Set("Dir::Bin::solvers::","/usr/lib/apt/solvers");
-    Cnf.Set("Dir::Media::MountPath","/media/apt");
+    Cnf.CndSet("Dir::Etc","etc/apt/");
+    Cnf.CndSet("Dir::Etc::sourcelist","sources.list");
+    Cnf.CndSet("Dir::Etc::sourceparts","sources.list.d");
+    Cnf.CndSet("Dir::Etc::vendorlist","vendors.list");
+    Cnf.CndSet("Dir::Etc::vendorparts","vendors.list.d");
+    Cnf.CndSet("Dir::Etc::main","apt.conf");
+    Cnf.CndSet("Dir::Etc::netrc", "auth.conf");
+    Cnf.CndSet("Dir::Etc::parts","apt.conf.d");
+    Cnf.CndSet("Dir::Etc::preferences","preferences");
+    Cnf.CndSet("Dir::Etc::preferencesparts","preferences.d");
+    Cnf.CndSet("Dir::Etc::trusted", "trusted.gpg");
+    Cnf.CndSet("Dir::Etc::trustedparts","trusted.gpg.d");
+    Cnf.CndSet("Dir::Bin::methods","/usr/lib/apt/methods");
++   Cnf.CndSet("Dir::Bin::solvers::","/usr/lib/apt/solvers");
+    Cnf.CndSet("Dir::Media::MountPath","/media/apt");
  
     // State   
-    Cnf.Set("Dir::Log","var/log/apt");
-    Cnf.Set("Dir::Log::Terminal","term.log");
-    Cnf.Set("Dir::Log::History","history.log");
+    Cnf.CndSet("Dir::Log","var/log/apt");
+    Cnf.CndSet("Dir::Log::Terminal","term.log");
+    Cnf.CndSet("Dir::Log::History","history.log");
  
-    Cnf.Set("Dir::Ignore-Files-Silently::", "~$");
-    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$");
-    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$");
-    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
+    if (Cnf.Exists("Dir::Ignore-Files-Silently") == false)
+    {
+       Cnf.Set("Dir::Ignore-Files-Silently::", "~$");
+       Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$");
+       Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$");
+       Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
+    }
  
     // Default cdrom mount point
-    Cnf.Set("Acquire::cdrom::mount", "/media/cdrom/");
+    Cnf.CndSet("Acquire::cdrom::mount", "/media/cdrom/");
  
     bool Res = true;
     

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

diff --cc cmdline/apt-get.cc
Simple merge

diff --cc debian/changelog
index d226d91,2e22e64..4d7f06f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,68 -1,11 +1,75 @@@
- apt (0.8.15.2) unstable; urgency=low
 +apt (0.8.16~exp3) UNRELEASEDexperimental; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/pkgcache.h:
 +    - readd All{Foreign,Allowed} as suggested by Julian to
 +      remain strictly API compatible
 +  * apt-pkg/acquire*.{cc,h}:
 +    - try even harder to support really big files in the fetcher by
 +      converting (hopefully) everything to 'long long' (Closes: #632271)
 +  * ftparchive/writer.cc:
 +    - generate all checksums in one run over the file for Release
 +  * cmdline/apt-get.cc:
 +    - add an --assume-no option for testing to say 'no' to everything
 +  * apt-pkg/deb/debmetaindex.cc:
 +    - add trusted=yes option to mark unsigned (local) repository as trusted
 +      based on a patch from Ansgar Burchardt, thanks a lot! (Closes: #596498)
 +
 +  [ Michael Vogt ]
 +  * merge fixes from the debian/unstable upload
 +  * merge lp:~mvo/apt/sha512-template to get fixes for the 
 +    sha1/md5 verifiation (closes: #632520)
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 14 Jul 2011 20:56:45 +0200
 +
 +apt (0.8.16~exp2) experimental; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * [ABI-Break] Implement EDSP in libapt-pkg so that all front-ends which
 +    use the internal resolver can now be used also with external
 +    ones as the usage is hidden in between the old API
 +  * provide two edsp solvers in apt-utils:
 +    - 'dump' to quickly output a complete scenario and
 +    - 'apt' to use the internal as an external resolver
 +  * apt-pkg/pkgcache.h:
 +    - clean up mess with the "all" handling in MultiArch to
 +      fix LP: #733741 cleanly for everyone now
 +  * apt-pkg/depcache.cc:
 +    - use a boolean instead of an int for Add/Remove in AddStates
 +      similar to how it works with AddSizes
 +    - let the Mark methods return if their marking was successful
 +    - if a Breaks can't be upgraded, remove it. If it or a Conflict
 +      can't be removed the installation of the breaker fails.
 +  * cmdline/apt-get.cc:
 +    - do not discard the error messages from the resolver and instead
 +      only show the general 'Broken packages' message if nothing else
 +
 +  [ Stefano Zacchiroli ]
 +  * doc/external-dependency-solver-protocol.txt:
 +    - describe EDSP and the configuration interface around it
 +  
 +  [ Michael Vogt ]
 +  * [ABI-Break] merge lp:~mvo/apt/sha512-template to add support for sha512
 +  * [ABI-Break] merge lp:~mvo/apt/dpointer to support easier extending
 +    without breaking the ABI
 +  * increase ABI version and update package names
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 29 Jun 2011 13:57:28 +0200
 +
 +apt (0.8.16~exp1) experimental; urgency=low
 +
 +  * merged with the debian/unstable upload
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 29 Jun 2011 12:40:31 +0200
 +
+ apt (0.8.15.3) UNRELEASED; urgency=low
+ 
+   [ Michael Vogt ]
+   * apt-pkg/acquire-item.cc:
+     - improve error message for a expired Release file
+   * apt-pkg/algorithms.cc:
+     - Hold back packages that would enter "policy-broken" state on upgrade
+       when doing a "apt-get upgrade"
  
    [ David Kalnischkies ]
    * apt-pkg/pkgcachegen.cc:

diff --cc debian/rules
Simple merge