merged lp:~donkult/apt/sid

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 174a263a9f7a716b07e08d181b736c1613055324..54e47957daa43b84a6dffe04d4455c396a7df53f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 apt (0.8.5) UNRELEASED; urgency=low
 
+  [ Michael Vogt ]
+  * merged lp:~mvo/apt/conflicts-on-virtuals to better deal with
+    conflicts/breaks against virtual packages (LP: #614993)
+  
   [ David Kalnischkies ]
   * apt-pkg/policy.cc:
     - support 100-pinning in Release file with ButAutomaticUpgrades