summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-09-15 19:56:50 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-09-15 19:56:50 +0200
commit3b3a681c79d3e5c32fcd6ccb87e74e5ca6e234b4 (patch)
tree325ff730ac56ff7313f4044d2406f47600d27b35 /debian
parent8877870768f3525ae72dc13a438100e90260f4e2 (diff)
parent58d9e6e0f9bf93724637c8a5687fe22058fc75a1 (diff)
merged lp:~donkult/apt/sid
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog10
1 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 9adf730c5..54e47957d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
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
+ as requested by the backports crew (Closes: #596097)
+ * apt-pkg/deb/deblistparser.cc:
+ - overrule NotAutomatic in case of ButAutomaticUpgrades
- -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 15 Sep 2010 19:53:46 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com> Tue, 14 Sep 2010 18:56:23 +0200
apt (0.8.4) unstable; urgency=low