From: Michael Vogt Date: Sun, 1 Oct 2006 22:40:00 +0000 (+0200) Subject: * merged with unstable, prepared upload X-Git-Tag: 0.7.21~284^2~19 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/81884e2d8038d13a72555ed0febcfcdbadbda429?hp=-c * merged with unstable, prepared upload --- 81884e2d8038d13a72555ed0febcfcdbadbda429 diff --combined configure.in index 830fef82a,35d0ea5ee,35d0ea5ee..19828cc85 --- a/configure.in +++ b/configure.in @@@@ -18,7 -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) dnl -- SET THIS TO THE RELEASE VERSION -- - AC_DEFINE_UNQUOTED(VERSION,"0.6.45exp2") --AC_DEFINE_UNQUOTED(VERSION,"0.6.45.1") +++AC_DEFINE_UNQUOTED(VERSION,"0.6.46.1exp1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) @@@@ -175,21 -175,12 -175,12 +175,21 @@@@ dnl Check for debiando AC_PATH_PROG(DEBIANDOC_HTML,debiandoc2html) AC_PATH_PROG(DEBIANDOC_TEXT,debiandoc2text) ++dnl Check for doxygen ++AC_PATH_PROG(DOXYGEN, doxygen) ++ dnl Check for the SGML tools needed to build man pages AC_PATH_PROG(DOCBOOK2MAN,docbook2man) dnl Check for the XML tools needed to build man pages AC_PATH_PROG(XMLTO,xmlto) ++dnl Check for graphviz ++AC_CHECK_PROG([HAVE_DOT], [dot], [YES], [NO]) ++AC_PATH_PROG([DOT], [dot], []) ++DOTDIR=$(dirname $DOT) ++AC_SUBST(DOTDIR) ++ dnl Check for YODL dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","") @@@@ -201,7 -192,7 -192,7 +201,7 @@@@ ah_GCC3DE dnl It used to be that the user could select translations and that could get dnl passed to the makefiles, but now that can only work if you use special dnl gettext approved makefiles, so this feature is unsupported by this. - ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko nb nl nn pl pt_BR pt ro ru sk sl sv tl vi zn_CN zh_TW" + ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv tl vi zn_CN zh_TW" AM_GNU_GETTEXT(external) if test x"$USE_NLS" = "xyes"; then AC_DEFINE(USE_NLS) @@@@ -209,4 -200,4 -200,4 +209,4 @@@@ f AC_SUBST(USE_NLS) AC_PATH_PROG(BASH, bash) --AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make -s dirs) ++AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile,make -s dirs) diff --combined debian/changelog index 0c4ac04b5,88eb14871,db84bc65a..521650c93 --- a/debian/changelog +++ b/debian/changelog @@@@ -1,24 -1,63 -1,63 +1,70 @@@@ - apt (0.6.45exp2) experimental; urgency=low --apt (0.6.46.1) unstable; urgency=low -- +++apt (0.6.46.1exp1) experimental; urgency=low ++ ++ * merged "install-recommends" branch (ABI break): ++ - new "--install-recommends" ++ - install new recommends on "upgrade" if --install-recommends is ++ given ++ - new "--fix-policy" option to install all packages with unmet ++ important dependencies (usefull with --install-recommends to ++ see what not-installed recommends are on the system) ++ - fix of recommended packages display (only show CandidateVersion ++ fix or-group handling) - (closes: #42266, #281534, #257054) + * methods/gzip.cc: + - deal with empty files + * Applied patch from Daniel Schepler to make apt bin-NMU able. -- (closes: bug#359634) + * rebuild against current g++ because of: + http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29289 -- (closes: #390189) + * fix broken i18n in the dpkg progress reporting, thanks to + Frans Pop and Steinar Gunderson. (closes: #389261) + * Merged from Christian Perrier bzr branch: + * fi.po: Updated to 514t. Closes: #390149 + * eu.po: Updated to 514t. Closes: #389725 + * vi.po: Updated to 514t. Closes: #388555 + + -- - -- Michael Vogt Mon, 14 Aug 2006 17:47:25 +0200 + apt (0.6.46) unstable; urgency=low - apt (0.6.45exp1) experimental; urgency=low + * debian/control: + - switched to libdb4.4 for building (closes: #381019) + * cmdline/apt-get.cc: + - show only the recommends/suggests for the candidate-version, not for all + versions of the package (closes: #257054) + - properly handle recommends/suggests or-groups when printing the list of + suggested/recommends packages (closes: #311619) + * methods/http.cc: + - check more careful for incorrect proxy settings (closes: #378868) + * methods/gzip.cc: + - don't hang when /var is full (closes: #341537), thanks to + Luis Rodrigo Gallardo Cruz for the patch + * doc/examples/sources.list: + - removed non-us.debian.org from the example (closes: #380030,#316196) + * Merged from Christian Perrier bzr branch: + * ro.po: Updated to 514t. Closes: #388402 + * dz.po: Updated to 514t. Closes: #388184 + * it.po: Fixed typos. Closes: #387812 + * ku.po: New kurdish translation. Closes: #387766 + * sk.po: Updated to 514t. Closes: #386851 + * ja.po: Updated to 514t. Closes: #386537 + * gl.po: Updated to 514t. Closes: #386397 + * fr.po: Updated to 516t. + * fi.po: Updated to 512t. Closes: #382702 + * share/archive-archive.gpg: + - removed the outdated amd64 and debian-2004 keys + * apt-pkg/tagfile.cc: + - applied patch from Jeroen van Wolffelaar to make the tags + caseinsensitive (closes: #384182) + - reverted MMap use in the tagfile because it does not work + across pipes (closes: #383487) + + -- Michael Vogt Thu, 21 Sep 2006 10:25:03 +0200 + + apt (0.6.45) unstable; urgency=low * apt-pkg/contrib/sha256.cc: - fixed the sha256 generation (closes: #378183) * ftparchive/cachedb.cc: -- - applied patch from Anthony Towns to fix Clean() function ++ - applied patch from ajt to fix Clean() function (closes: #379576) * doc/apt-get.8.xml: - fix path to the apt user build (Closes: #375640) @@@@ -36,6 -75,9 -75,9 +82,6 @@@@ - fix for string mangling, closes: #373864 * apt-pkg/acquire-item.cc: - check for bzip2 in /bin (closes: #377391) -- * apt-pkg/tagfile.cc: -- - make it work on non-mapable files again, thanks -- to James Troup for confirming the fix (closes: #376777) * Merged from Christian Perrier bzr branch: * ko.po: Updated to 512t. Closes: #378901 * hu.po: Updated to 512t. Closes: #376330 @@@@ -46,42 -88,26 -88,26 +92,42 @@@@ * dz.po: New Dzongkha translation: 512t * ro.po: Updated to 512t * eu.po: Updated ++ * eu.po: Updated ++ * fix apt-get dist-upgrade ++ * fix warning if no /var/lib/apt/extended_states is present ++ * don't download Translations for deb-src sources.list lines ++ * apt-pkg/tagfile.cc: ++ - support not-mmapable files again -- -- Michael Vogt Thu, 27 Jul 2006 00:52:05 +0200 ++ -- Michael Vogt Tue, 25 Jul 2006 11:55:22 +0200 --apt (0.6.44.2) unstable; urgency=low -- -- * apt-pkg/depcache.cc: -- - added Debug::pkgDepCache::AutoInstall (thanks to infinity) -- * apt-pkg/acquire-item.cc: -- - fix missing chmod() in the new aquire code -- (thanks to Bastian Blank, Closes: #367425) -- * merged from -- http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: -- * sk.po: Completed to 512t -- * eu.po: Completed to 512t -- * fr.po: Completed to 512t -- * sv.po: Completed to 512t -- * Update all PO and the POT. Gives 506t6f for formerly -- complete translations -- -- -- Michael Vogt Wed, 14 Jun 2006 12:00:57 +0200 ++apt (0.6.44.2exp1) experimental; urgency=low ++ ++ * added support for i18n of the package descriptions ++ * added support for aptitude like auto-install tracking (a HUGE ++ HUGE thanks to Daniel Burrows who made this possible) ++ * synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch ++ * build from http://people.debian.org/~mvo/bzr/apt/debian-experimental ++ ++ -- Michael Vogt Mon, 3 Jul 2006 21:50:31 +0200 ++ ++apt (0.6.44.2) unstable; urgency=low ++ ++ * apt-pkg/depcache.cc: ++ - added Debug::pkgDepCache::AutoInstall (thanks to infinity) ++ * apt-pkg/acquire-item.cc: ++ - fix missing chmod() in the new aquire code ++ (thanks to Bastian Blank, Closes: #367425) ++ * merged from ++ http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: ++ * sk.po: Completed to 512t ++ * eu.po: Completed to 512t ++ * fr.po: Completed to 512t ++ * sv.po: Completed to 512t ++ * Update all PO and the POT. Gives 506t6f for formerly ++ complete translations ++ ++ -- Michael Vogt Wed, 14 Jun 2006 12:00:57 +0200 apt (0.6.44.1-0.1) unstable; urgency=low @@@@ -93,32 -119,32 -119,22 +139,32 @@@@ apt (0.6.44.1) unstable; urgency=low + * apt-pkg/acquire-item.cc: + - fix reversed logic of the "Acquire::PDiffs" option * merged from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: - po/LINGUAS: added "bg" Closes: #360262 - po/gl.po: Galician translation update. Closes: #366849 - po/hu.po: Hungarian translation update. Closes: #365448 - po/cs.po: Czech translation updated. Closes: #367244 + * apt-pkg/contrib/sha256.cc: + - applied patch to fix unaligned access problem. Closes: #367417 + (thanks to David Mosberger) -- Michael Vogt Tue, 16 May 2006 21:51:16 +0200 apt (0.6.44) unstable; urgency=low * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large + * apt-pkg/contrib/sha256.{cc,h},hashes.{cc,h}: support for sha256 + (thanks to Anthony Towns) + * ftparchive/cachedb.{cc,h},writer.{cc,h}: optimizations + (thanks to Anthony Towns) + * apt pdiff support from experimental merged + * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman) * apt-pkg/deb/dpkgpm.cc: - wording fixes (thanks to Matt Zimmerman) - - fix error in dpkg interaction (closes: #364513, - thanks to Martin Dickopp) + - fix error in dpkg interaction (closes: #364513, thanks to Martin Dickopp) * apt-pkg/tagfile.{cc,h}: - use MMap to read the entries (thanks to Zephaniah E. Hull for the patch) Closes: #350025 @@@@ -313,7 -339,7 -329,7 +359,7 @@@@ apt (0.6.42) unstable; urgency=lo * cmdline/apt-cdrom.cc: - fix some missing gettext() calls (closes: #334539) * doc/apt-cache.8.xml: fix typo (closes: #334714) -- ++ -- Michael Vogt Wed, 19 Oct 2005 22:02:09 +0200 apt (0.6.41) unstable; urgency=low @@@@ -413,7 -439,6 -429,6 +459,7 @@@@ apt (0.6.37) breezy; urgency=lo * Add Welsh translation from Dafydd Harries (daf@muse.19inch.net--2005/apt--main--0--patch-1) * Change debian/bugscript to use #!/bin/bash (Closes: #313402) ++ * Fix a incorrect example in the man-page (closes: #282918) -- Matt Zimmerman Tue, 24 May 2005 14:38:25 -0700 diff --combined debian/rules index 044f742d0,02ee734bb,02ee734bb..c9bd1f34a --- a/debian/rules +++ b/debian/rules @@@@ -38,7 -38,7 -38,7 +38,7 @@@@ build PKG=apt DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS) - APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p') + APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' -e 's/\+.*$$//') APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in) APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g') @@@@ -338,4 -338,4 -338,4 +338,4 @@@@ arch-build mkdir -p debian/arch-build/apt-$(APT_DEBVER) tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(APT_DEBVER);tar xf -) $(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc -- (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG)) ++ (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes) diff --combined doc/examples/configure-index index b4d42e123,ac2f2997d,0f0abc30c..831e276c7 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@@@ -24,15 -24,11 -24,11 +24,15 @@@@ AP { Architecture "i386"; Build-Essential "build-essential"; -- ++ ++ NeverAutoRemove { "linux-kernel.*"; }; // packages that should never ++ // considered for autoRemove ++ // Options for apt-get Get { Arch-Only "false"; ++ AutomaticRemove "false"; Download-Only "false"; Simulate "false"; Assume-Yes "false"; @@@@ -94,10 -90,6 -90,6 +94,10 @@@@ Cache-Limit "4194304"; Default-Release ""; ++ // consider Recommends, Suggests as important dependencies that should ++ // be installed by default ++ APT::Install-Recommends "false"; ++ APT::Install-Suggests "false"; // Write progress messages on this fd (for stuff like base-config) Status-Fd "-1"; @@@@ -112,8 -104,8 -104,6 +112,8 @@@@ Acquir Queue-Mode "host"; // host|access Retries "0"; Source-Symlinks "true"; + + PDiffs "true"; // try to get the IndexFile diffs // HTTP method configuration http @@@@ -261,8 -253,8 -251,8 +261,8 @@@@ Debu pkgDPkgPM "false"; pkgDPkgProgressReporting "false"; pkgOrderList "false"; ++ pkgAutoRemove "false"; // show information about automatic removes - + BuildDeps "false"; -- pkgInitialize "false"; // This one will dump the configuration space NoLocking "false"; Acquire::Ftp "false"; // Show ftp command traffic