From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 14 Sep 2010 17:05:30 +0000 (+0200)
Subject: merge with debian-sid to get final 0.8.4
X-Git-Tag: 0.8.5~2^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/58d9e6e0f9bf93724637c8a5687fe22058fc75a1

merge with debian-sid to get final 0.8.4
---

58d9e6e0f9bf93724637c8a5687fe22058fc75a1
diff --cc debian/changelog
index 269113ad3,1e98b4d83..174a263a9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,4 +1,15 @@@
 +apt (0.8.5) UNRELEASED; urgency=low
 +
 +  [ 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
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 14 Sep 2010 18:56:23 +0200
 +
- apt (0.8.4) UNRELEASED; urgency=low
+ apt (0.8.4) unstable; urgency=low
  
    [ Michael vogt ]
    * ftparchive/writer.cc: