summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 174a263a9..54e47957d 100644
--- 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