merged lp:~mvo/apt/conflicts-on-virtuals to better deal with

conflicts/breaks against virtual packages (LP: #614993)

diff --combined apt-pkg/algorithms.cc
index 3c8711b7443bdaa497f00e9bafe83815db50c3a6,a298be4933a74411614b9aa8b1e64d55f0029d9a..961f5c2fa1bfee4ff172c3efe16b9a280ae674b9
--- 1/apt-pkg/algorithms.cc
--- 2/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@@ -987,6 -987,23 +987,23 @@@ bool pkgProblemResolver::Resolve(bool B
               pkgCache::VerIterator Ver(Cache,*V);
               pkgCache::PkgIterator Pkg = Ver.ParentPkg();
  
+                /* This is a conflicts, and the version we are looking
+                   at is not the currently selected version of the 
+                   package, which means it is not necessary to 
+                   remove/keep */
+                if (Cache[Pkg].InstallVer != Ver &&
+                    (Start->Type == pkgCache::Dep::Conflicts ||
+                     Start->Type == pkgCache::Dep::DpkgBreaks ||
+                     Start->Type == pkgCache::Dep::Obsoletes)) 
+                {
+                   if (Debug) 
+                      clog << "  Conflicts//Breaks against version " 
+                           << Ver.VerStr() << " for " << Pkg.Name() 
+                           << " but that is not InstVer, ignoring"
+                           << endl;
+                   continue;
+                }
+ 
               if (Debug == true)
                  clog << "  Considering " << Pkg.FullName(false) << ' ' << (int)Scores[Pkg->ID] <<
                  " as a solution to " << I.FullName(false) << ' ' << (int)Scores[I->ID] << endl;
@@@ -1069,22 -1086,14 +1086,14 @@@
               }
               else
               {
-                 /* This is a conflicts, and the version we are looking
-                    at is not the currently selected version of the 
-                    package, which means it is not necessary to 
-                    remove/keep */
-                 if (Cache[Pkg].InstallVer != Ver &&
-                     (Start->Type == pkgCache::Dep::Conflicts ||
-                      Start->Type == pkgCache::Dep::Obsoletes))
-                    continue;
- 
                  if (Start->Type == pkgCache::Dep::DpkgBreaks)
                  {
 -                   // first, try upgrading the package, if that
 +                   // first, try upgradring the package, if that
                     // does not help, the breaks goes onto the
                     // kill list
+                      //
                     // FIXME: use DoUpgrade(Pkg) instead?
-                    if (Cache[End] & pkgDepCache::DepGCVer) 
+                    if (Cache[End] & pkgDepCache::DepGCVer)
                     {
                        if (Debug)
                           clog << "  Upgrading " << Pkg.FullName(false) << " due to Breaks field in " << I.FullName(false) << endl;
@@@ -1105,6 -1114,7 +1114,6 @@@
                  LEnd++;
                  
                  if (Start->Type != pkgCache::Dep::Conflicts &&
 -                      Start->Type != pkgCache::Dep::DpkgBreaks &&
                      Start->Type != pkgCache::Dep::Obsoletes)
                     break;
               }

diff --combined debian/changelog
index 1e98b4d83e560e4287aac4bc6d118eaa01b26fb5,e37a5504fd3649030eced151b11064f86c00e9cc..9adf730c51e5128da39016b15bc8ca1031c4d24a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,72 -1,4 +1,79 @@@
 -apt (0.8.1) UNRELEASED; urgency=low
++apt (0.8.5) UNRELEASED; urgency=low
++
++  * merged lp:~mvo/apt/conflicts-on-virtuals to better deal with
++    conflicts/breaks against virtual packages (LP: #614993)
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 15 Sep 2010 19:53:46 +0200
++
 +apt (0.8.4) unstable; urgency=low
 +
 +  [ Michael vogt ]
 +  * ftparchive/writer.cc:
 +    - write out {Files,Checksum-Sha1,Checksum-Sha256} only if
 +      available LP: #633967. Thanks to Colin Watson
 +  * apt-pkg/contrib/cdromutl.cc:
 +    - if apt-cdrom is used on writable media (like usb-sticks), do
 +      not use the root directory to identify the medium (as all 
 +      changes there change the ident id). Use the .disk directory 
 +      instead 
 +
 +  [ David Kalnischkies ]
 +  * ftparchive/writer.cc:
 +    - null the valid string instead of the date if Valid-Until is not set
 +  * apt-pkg/acquire-item.cc:
 +    - use also unsigned Release files again (Closes: #596189)
 +
 +  [ Christian Perrier ]
 +  * Fix missing space after dot in a message from apt-pkg
 +    Translations unfuzzied. Thanks to Holger Wansing.
 +
 + -- Michael Vogt <mvo@debian.org>  Fri, 10 Sep 2010 20:45:15 +0200
 +
 +apt (0.8.3) unstable; urgency=low
 +
 +  [ Programs translations ]
 +  * German (Holger Wansing). Closes: #596141
 +
 +  [ Manpages translations ]
 +  * Japanese (KURASAWA Nozomu). Closes: #595862
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/indexcopy.cc:
 +    - only use trusted.gpg.d directory if it exists
 +    - do not replace /dev/null when running in APT::CDROM::NoAct
 +      mode (LP: #612666), thanks to Colin Watson
 +
 +  [ David Kalnischkies ]
 +  * ftparchive/apt-ftparchive.cc:
 +    - ensure that BinDirectory as well as Tree settings get
 +      the correct default FileMode setting (Closes: #595922)
 +
 + -- Michael Vogt <mvo@debian.org>  Tue, 07 Sep 2010 15:28:41 +0200
 +
 +apt (0.8.2) unstable; urgency=low
 +
 +  [ Manpages translations ]
 +  * Spanish (Omar Campagne). Closes: #595557
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/versionmatch.cc:
 +    - do not accept 'Pin: origin "' (missing closing ") as a valid
 +      way to pin a local archive: either "" or none…
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - create Dir::Log if needed to support /var/log as tmpfs or similar,
 +      inspired by Thomas Bechtold, thanks! (Closes: #523919, LP: #220239)
 +  * apt-pkg/indexcopy.cc:
 +    - support really still the APT::GPGV::TrustedKeyring setting,
 +      as it breaks d-i badly otherwise (Closes: #595428)
 +  * cmdline/apt-key:
 +    - support also Dir::Etc::Trusted so that apt-key works in the same
 +      way as the library part which works with the trusted files
 +  * methods/{gzip,bzip2}.cc:
 +    - empty files can never be valid archives (Closes: #595691)
 +
 + -- Michael Vogt <mvo@debian.org>  Mon, 06 Sep 2010 18:10:06 +0200
 +
 +apt (0.8.1) unstable; urgency=low
  
    [ Programs translations ]
    * Thai (Theppitak Karoonboonyanan). Closes: #592695
@@@ -80,9 -12,6 +87,9 @@@
    * Bulgarian (Damyan Ivanov). Closes: #594627
    * Portuguese (Miguel Figueiredo). Closes: #594668
    * Korean (Changwoo Ryu). Closes: #594809
 +  * Norwegian Bokmål (Hans Nordhaug). Closes: #595182
 +  * Danish (Joe Hansen). Closes: #595176
 +  * Catalan (Agustí Grau). Closes: #595234
  
    [ Christian Perrier ]
    * Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki
@@@ -112,7 -41,7 +119,7 @@@
        which means "" are optional and pinning a local archive does
        work - even if it is a non-flat archive (Closes: #594435)
  
 - -- Michael Vogt <mvo@debian.org>  Mon, 30 Aug 2010 11:53:30 +0200
 + -- Michael Vogt <mvo@debian.org>  Fri, 03 Sep 2010 18:36:11 +0200
  
  apt (0.8.0) unstable; urgency=low