diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt-utils.links | 1 | ||||
| -rw-r--r-- | debian/changelog | 86 |
2 files changed, 84 insertions, 3 deletions
diff --git a/debian/apt-utils.links b/debian/apt-utils.links deleted file mode 100644 index 5bf138c4a..000000000 --- a/debian/apt-utils.links +++ /dev/null @@ -1 +0,0 @@ -usr/bin/apt-internal-solver usr/lib/apt/solvers/apt diff --git a/debian/changelog b/debian/changelog index 0219084d6..fc638b2f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -apt (0.9.5.1ubuntu1) UNRELEASED; urgency=low +apt (0.9.6ubuntu1) UNRELEASED; urgency=low - * merged from debian, remaining changes: + * merged from Debian, remaining changes: - use ubuntu keyring and ubuntu archive keyring in apt-key - run update-apt-xapian-index in apt.cron - support apt-key net-update and verify keys against master-keyring @@ -8,10 +8,92 @@ apt (0.9.5.1ubuntu1) UNRELEASED; urgency=low - different example sources.list - APT::pkgPackageManager::MaxLoopCount set to 5000 - apport pkgfailure handling + - ubuntu changelog download handling - patch for apt cross-building, see http://bugs.debian.org/666772 -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 22 May 2012 15:57:26 +0200 +apt (0.9.6) unstable; urgency=low + + [ David Kalnischkies ] + * apt-pkg/cdrom.cc: + - fix regression from 0.9.3 which dumped the main configuration + _config instead of the cdrom settings (Cnf) as identified and + tested by Milan Kupcevic, thanks! (Closes: #674100) + * cmdline/apt-get.cc: + - do not show 'list of broken packages' header if no package + is broken as it happens e.g. for external resolver errors + - print URIs for all changelogs in case of --print-uris, + thanks to Daniel Hartwig for the patch! (Closes: #674897) + - show 'bzr branch' as 'bzr get' is deprecated (LP: #1011032) + - check build-dep candidate if install is forbidden + * debian/apt-utils.links: + - the internal resolver 'apt' is now directly installed in + /usr/lib/apt/solvers, so don't instruct dh to create a broken link + * doc/apt-verbatim.ent: + - APT doesn't belong to the product 'Linux', so use 'APT' instead + as after all APT is a big suite of applications + * doc/examples/sources.list: + - use the codename instead of 'stable' in the examples sources.list + as we do in the manpage and as the debian-installer does + * doc/apt-get.8.xml: + - use apt-utils as package example instead of libc6 + * apt-pkg/contrib/cmdline.cc: + - apply patch from Daniel Hartwig to fix a segfault in case + the LongOpt is empty (Closes: #676331) + - fix segfault with empty LongOpt in --no-* branch + * ftparchive/apt-ftparchive.cc: + - default to putting the Contents-* files below $(SECTION) as apt-file + expects them there - thanks Martin-Éric Racine! (Closes: #675827) + * apt-pkg/deb/deblistparser.cc: + - set pkgCacheGen::Essential to "all" again (Closes: #675449) + * apt-pkg/algorithms.cc: + - force install only for one essential package out of a group + * apt-pkg/aptconfiguration.cc: + - if APT::Languages=none save "none" in allCodes so that the detected + configuration is cached as intended (Closes: #674690, LP: #1004947) + * apt-pkg/cacheiterators.h: + - add an IsMultiArchImplicit() method for Dep- and PrvIterator + + [ Justin B Rye ] + * doc/apt-cdrom.8.xml: + - replace CDROM with the proper CD-ROM in text + - correct disc vs. disk issues + * doc/apt-extracttemplates.1.xml: + - debconf is not DebConf + * doc/apt-get.8.xml: + - move dselect-upgrade below dist-upgrade + - review and fix spelling issues + * doc/apt-ftparchive.8.xml, doc/apt-config.8.xml, + doc/apt-key.8.xml, doc/apt-mark.8.xml, + doc/apt_preferences.5.xml, doc/apt-secure.8.xml, + doc/apt-sortpkgs.1.xml, sources.list.5.xml: + - review and fix typo, grammar and style issues + * doc/apt.conf.5.xml: + - review and fix typo, grammar and style issues + - rephrase APT::Immediate-Configuration and many others + + [ Sebastian Heinlein ] + * cmdline/apt-key: + - do not hardcode /etc but use Dir::Etc instead + + [ Robert Luberda ] + * Polish manpage translation update (Closes: #675603) + * doc/apt-mark.8.xml: + - in hold, the option name is --file not --filename + + [ Christian Perrier ] + * French program and manpage translation update + * Danish program translation by Joe Hansen. Closes: #675605 + + [ Thibaut Girka ] + * cmdline/apt-get.cc: + - complain correctly about :any build-dep on M-A:none packages + * apt-pkg/deb/deblistparser.cc: + - add support for arch-specific qualifiers in dependencies + + -- Michael Vogt <mvo@debian.org> Mon, 11 Jun 2012 16:21:53 +0200 + apt (0.9.5.1) unstable; urgency=low [ David Kalnischkies ] |