From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 15 Sep 2010 17:54:27 +0000 (+0200)
Subject: merged lp:~mvo/apt/conflicts-on-virtuals to better deal with
X-Git-Tag: 0.8.5~3
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/8877870768f3525ae72dc13a438100e90260f4e2

merged lp:~mvo/apt/conflicts-on-virtuals to better deal with
conflicts/breaks against virtual packages (LP: #614993)
---

8877870768f3525ae72dc13a438100e90260f4e2
diff --cc apt-pkg/algorithms.cc
index 3c8711b74,a298be493..961f5c2fa
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@@ -1069,22 -1086,14 +1086,14 @@@ bool pkgProblemResolver::Resolve(bool B
  	       }
  	       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;
diff --cc debian/changelog
index 1e98b4d83,e37a5504f..9adf730c5
--- a/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