From 168e1e4e4e763f7b3442909eb8fa25ea40f2e0ee Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 26 Apr 2006 13:18:00 +0200 Subject: * merged documentation patch (debian #307756) --- doc/apt-ftparchive.1.xml | 4 ++-- doc/examples/apt-ftparchive.conf | 6 +++--- doc/fr/apt-ftparchive.fr.1.xml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'doc') diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 7c1ae9432..8cfbc72e9 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -407,10 +407,10 @@ for i in Sections do Sets the Packages file output. - SrcPackages + Sources Sets the Sources file output. At least one of - Packages or SrcPackages is required. + Packages or Sources is required. Contents diff --git a/doc/examples/apt-ftparchive.conf b/doc/examples/apt-ftparchive.conf index 657ec5440..c9d352ab6 100644 --- a/doc/examples/apt-ftparchive.conf +++ b/doc/examples/apt-ftparchive.conf @@ -20,21 +20,21 @@ Default { // Contents file for these in the main section of the sid release BinDirectory "pool/main" { Packages "dists/sid/main/binary-i386/Packages"; - SrcPackages "dists/sid/main/source/Sources"; + Sources "dists/sid/main/source/Sources"; Contents "dists/sid/Contents-i386"; } // This is the same for the contrib section BinDirectory "pool/contrib" { Packages "dists/sid/contrib/binary-i386/Packages"; - SrcPackages "dists/sid/contrib/source/Sources"; + Sources "dists/sid/contrib/source/Sources"; Contents "dists/sid/Contents-i386"; } // This is the same for the non-free section BinDirectory "pool/non-free" { Packages "dists/sid/non-free/binary-i386/Packages"; - SrcPackages "dists/sid/non-free/source/Sources"; + Sources "dists/sid/non-free/source/Sources"; Contents "dists/sid/Contents-i386"; }; diff --git a/doc/fr/apt-ftparchive.fr.1.xml b/doc/fr/apt-ftparchive.fr.1.xml index 61cdfa2ec..9ae6506fc 100644 --- a/doc/fr/apt-ftparchive.fr.1.xml +++ b/doc/fr/apt-ftparchive.fr.1.xml @@ -451,10 +451,10 @@ Indique le fichier -SrcPackages +Sources Indique le fichier « Sources » créé. L'un des deux fichiers, -Packages ou SrcPackages est nécessaire. +Packages ou Sources est nécessaire. @@ -628,4 +628,4 @@ d &manbugs; &traducteur; - \ No newline at end of file + -- cgit v1.2.3-70-g09d2 From 6db56565ecbaf9612791453b7225e9fcce1ecdd4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 19 May 2006 00:19:09 +0200 Subject: * doc/sources.list.5.xml: - fix typo --- doc/sources.list.5.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 9762005b0..e47418b27 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -204,7 +204,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/ Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US directory, and uses only files found under - unstable/binary-i3866 on i386 machines, + unstable/binary-i386 on i386 machines, unstable/binary-m68k on m68k, and so forth for other supported architectures. [Note this example only illustrates how to use the substitution variable; non-us is no longer -- cgit v1.2.3-70-g09d2 From d4c5f11f8ef619ec56ae1e532416bb3817442b1c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 27 May 2006 14:13:31 +0200 Subject: * added Debug::pkgDepCache::AutoInstall debug option --- apt-pkg/depcache.cc | 7 ++++++- configure.in | 2 +- doc/examples/configure-index | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index dd1c794c9..58d1d25e5 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -16,7 +16,8 @@ #include #include #include - +#include + #include /*}}}*/ @@ -712,6 +713,10 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, if (InstPkg.end() == false) { + if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true) + std::clog << "Installing " << InstPkg.Name() + << " as dep of " << Pkg.Name() + << std::endl; MarkInstall(InstPkg,true,Depth + 1); // Set the autoflag, after MarkInstall because MarkInstall unsets it diff --git a/configure.in b/configure.in index f24400ed7..96adad597 100644 --- a/configure.in +++ b/configure.in @@ -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.44") +AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 9e851d753..b87e85030 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -244,6 +244,7 @@ DPkg Debug { pkgProblemResolver "false"; + pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies pkgAcquire "false"; pkgAcquire::Worker "false"; pkgDPkgPM "false"; -- cgit v1.2.3-70-g09d2