diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-07-15 09:53:38 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-07-15 09:53:38 +0200 |
| commit | 6db194289ece36e62cb8dab0aa178209b46c59f2 (patch) | |
| tree | 6e1970919929dd3d2d03d343e4ec40ccad22ad66 /debian | |
| parent | 35555c1826da5df9f2c06a74f2e91be843ad8142 (diff) | |
| parent | 1d08f27046533e36849a63c084f51809be484d8c (diff) | |
merged from http://bzr.debian.org/bzr/apt/apt/debian-sid
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 26 | ||||
| -rwxr-xr-x | debian/rules | 3 |
2 files changed, 24 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index d226d91c4..4d7f06fea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -62,7 +62,14 @@ apt (0.8.16~exp1) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Wed, 29 Jun 2011 12:40:31 +0200 -apt (0.8.15.2) unstable; urgency=low +apt (0.8.15.3) UNRELEASED; urgency=low + + [ Michael Vogt ] + * apt-pkg/acquire-item.cc: + - improve error message for a expired Release file + * apt-pkg/algorithms.cc: + - Hold back packages that would enter "policy-broken" state on upgrade + when doing a "apt-get upgrade" [ David Kalnischkies ] * apt-pkg/pkgcachegen.cc: @@ -70,8 +77,23 @@ apt (0.8.15.2) unstable; urgency=low told us the opposite before (e.g. in fakeroot 1.16) (Closes: #630591) * doc/sources.list.5.xml: - document available [options] for sources.list entries (Closes: 632441) + * doc/apt.conf.5.xml: + - document APT::Architectures list (Closes: #612102) + * cmdline/apt-get.cc: + - restore all important dependencies for garbage packages (LP: #806274) + * apt-pkg/init.cc: + - use CndSet in pkgInitConfig (Closes: #629617) + * apt-pkg/depcache.cc: + - change default of APT::AutoRemove::SuggestsImportant to true + + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 15 Jul 2011 09:29:37 +0200 + +apt (0.8.15.2) unstable; urgency=high + + * fix from David Kalnischkies for the InRelease gpg verification + code (LP: #784473) - -- David Kalnischkies <kalnischkies@gmail.com> Tue, 05 Jul 2011 15:12:21 +0200 + -- Michael Vogt <mvo@debian.org> Tue, 12 Jul 2011 11:54:47 +0200 apt (0.8.15.1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index ef30568d5..1446a039e 100755 --- a/debian/rules +++ b/debian/rules @@ -124,9 +124,6 @@ libapt-pkg-doc: build-doc # # libapt-pkg-doc install # - # remove doxygen's embedded jquery as we don't use it anyway (#622147) - rm -f $(BLD)/doc/doxygen/html/jquery.js - dh_installdocs -p$@ $(BLD)/docs/design* \ $(BLD)/docs/dpkg-tech* \ $(BLD)/docs/files* \ |