diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-05-22 17:01:03 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-05-22 17:01:03 +0200 |
| commit | 4fc6b7570c3e97b65c118b58cdf6729fa94c9b03 (patch) | |
| tree | f952bb728b9c23f1eebc8f1a87f527ed7c9b0b36 /debian | |
| parent | 6bf93605fdb8e858d3f0a79a124c1d39f760094d (diff) | |
| parent | 65759e00eff0513c34f584b99420b72fe0e5073e (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/pkgcache.h
debian/changelog
methods/https.cc
methods/server.cc
test/integration/test-apt-download-progress
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index b0d518b17..7414b5c61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -234,6 +234,16 @@ apt (1.1~exp1) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 19 Jun 2014 12:01:48 +0200 +apt (1.0.9.9) unstable; urgency=medium + + [ David Kalnischkies ] + * parse specific-arch dependencies correctly on single-arch systems + (Closes: 777760) + * remove "first package seen is native package" assumption. + Thanks to Axel Beckert for testing (Closes: 782777) + + -- David Kalnischkies <david@kalnischkies.de> Tue, 28 Apr 2015 16:11:27 +0200 + apt (1.0.9.8) unstable; urgency=medium [ David Kalnischkies ] |