From: Michael Vogt Date: Mon, 11 Jun 2012 12:56:11 +0000 (+0200) Subject: merged from donkult X-Git-Tag: 0.9.6~1 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/cb6a5776bfb5f74d94f32db55f2de148c27a5d10 merged from donkult --- cb6a5776bfb5f74d94f32db55f2de148c27a5d10 diff --cc configure.in index 486b7a773,486b7a773..c1cdd3d5f --- a/configure.in +++ b/configure.in @@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" --PACKAGE_VERSION="0.9.5.1" ++PACKAGE_VERSION="0.9.5.2~20120611" PACKAGE_MAIL="APT Development Team " AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --cc debian/changelog index 432032b1e,a89f78de9..f5a764185 --- a/debian/changelog +++ b/debian/changelog @@@ -1,18 -1,79 +1,83 @@@ apt (0.9.5.2) UNRELEASED; urgency=low - [ Translation of manpages ] - * Polish updated by Robert Luberda. Closes: #675603 - * French updated by Christian Perrier - - [ Translation of programs ] - * Danish by Joe Hansen. Closes: #675605 - * French updated by Christian Perrier - + [ 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 + - -- Christian Perrier Sat, 02 Jun 2012 18:25:18 +0200 + [ 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 + + -- David Kalnischkies Wed, 06 Jun 2012 23:54:01 +0200 apt (0.9.5.1) unstable; urgency=low diff --cc doc/apt-verbatim.ent index ff37f4ae7,32ed2f678..9aec81e04 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@@ -202,9 -208,13 +208,13 @@@ "> Linux + APT + &apt-product-version; "> + - ++ + diff --cc doc/po/apt-doc.pot index a723feb8e,905bbb997..292b01971 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: apt-doc 0.9.5.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" - "POT-Creation-Date: 2012-05-24 17:24+0300\n" -"POT-Creation-Date: 2012-06-09 23:05+0300\n" ++"POT-Creation-Date: 2012-06-11 14:45+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"