From 50c409c42a971c6e8a25cb32a87992474247834b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 4 Sep 2009 19:32:45 +0200 Subject: add a helper to easily get a vector of strings from the configuration --- apt-pkg/contrib/configuration.cc | 19 +++++++++++++++++++ apt-pkg/contrib/configuration.h | 3 +++ debian/changelog | 2 ++ 3 files changed, 24 insertions(+) diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 48a5f0bff..b83ece3e4 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -223,6 +223,25 @@ string Configuration::FindDir(const char *Name,const char *Default) const return Res; } /*}}}*/ +// Configuration::FindVector - Find a vector of values /*{{{*/ +// --------------------------------------------------------------------- +/* Returns a vector of config values under the given item */ +vector Configuration::FindVector(const char *Name) const +{ + vector Vec; + const Item *Top = Lookup(Name); + if (Top == NULL) + return Vec; + + Item *I = Top->Child; + while(I != NULL) + { + Vec.push_back(I->Value); + I = I->Next; + } + return Vec; +} + /*}}}*/ // Configuration::FindI - Find an integer value /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index 2534692a3..e2da83f5b 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -31,6 +31,7 @@ #include +#include #include using std::string; @@ -70,6 +71,8 @@ class Configuration string Find(const string Name,const char *Default = 0) const {return Find(Name.c_str(),Default);}; string FindFile(const char *Name,const char *Default = 0) const; string FindDir(const char *Name,const char *Default = 0) const; + std::vector FindVector(const string &Name) const; + std::vector FindVector(const char *Name) const; int FindI(const char *Name,int Default = 0) const; int FindI(const string Name,int Default = 0) const {return FindI(Name.c_str(),Default);}; bool FindB(const char *Name,bool Default = false) const; diff --git a/debian/changelog b/debian/changelog index 550addc92..349c95038 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ apt (0.7.24) UNRELEASED; urgency=low - activate DOT_MULTI_TARGETS, it is default on since doxygen 1.5.9 * buildlib/po4a_manpage.mak, doc/makefile, configure: - simplify the makefiles needed for po4a manpages + * apt-pkg/contrib/configuration.cc: + - add a helper to easily get a vector of strings from the config -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 -- cgit v1.2.3-70-g09d2 From c914647fb05653878a14ae391f52b5e94cc73b26 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 7 Sep 2009 14:59:19 +0200 Subject: reintroduce #clear and #include in the config files, they there broken since 0.7.21 with the introduction of #-comments --- apt-pkg/contrib/configuration.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index b83ece3e4..4e8586e83 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -601,9 +601,11 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional, InQuote = !InQuote; if (InQuote == true) continue; - - if ((*I == '/' && I + 1 != End && I[1] == '/') || *I == '#') - { + + if ((*I == '/' && I + 1 != End && I[1] == '/') || + (*I == '#' && strcmp(string(I,I+6).c_str(),"#clear") != 0 && + strcmp(string(I,I+8).c_str(),"#include") != 0)) + { End = I; break; } -- cgit v1.2.3-70-g09d2 From 1f99b6d338186efe80e314268db44600d3c94a1e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Sep 2009 09:47:12 +0200 Subject: replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208) instead of ignoring the returncode and truncating the string on error --- apt-pkg/contrib/strutl.cc | 15 +++++++++++++-- debian/changelog | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 1683868c8..4c05f2df8 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -67,9 +67,20 @@ bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest) outbuf = new char[insize+1]; outptr = outbuf; - iconv(cd, &inptr, &insize, &outptr, &outsize); - *outptr = '\0'; + while (insize != 0) + { + size_t const err = iconv(cd, &inptr, &insize, &outptr, &outsize); + if (err == (size_t)(-1)) + { + insize--; + outsize++; + inptr++; + *outptr = '?'; + outptr++; + } + } + *outptr = '\0'; *dest = outbuf; delete[] outbuf; diff --git a/debian/changelog b/debian/changelog index 349c95038..34691b1fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ apt (0.7.24) UNRELEASED; urgency=low - simplify the makefiles needed for po4a manpages * apt-pkg/contrib/configuration.cc: - add a helper to easily get a vector of strings from the config + * apt-pkg/contrib/strutl.cc: + - replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208) -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 -- cgit v1.2.3-70-g09d2 From 6da747804c63f103f431706af80f793b86c41993 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Sep 2009 14:27:17 +0200 Subject: doc/apt-get.8.xml: fix two little typos in the --simulate description. (half-closes #545059) --- debian/changelog | 2 ++ doc/apt-get.8.xml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 34691b1fb..3d8dc292a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ apt (0.7.24) UNRELEASED; urgency=low - add a helper to easily get a vector of strings from the config * apt-pkg/contrib/strutl.cc: - replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208) + * doc/apt-get.8.xml: + - fix two little typos in the --simulate description. -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index b87e17247..3a1292198 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -384,9 +384,9 @@ Configuration Item: APT::Get::Simulate. Simulation run as user will deactivate locking (Debug::NoLocking) - automatical. Also a notice will be displayed indicating that this is only a simulation, - if the option APT::Get::Show-User-Simulation-Note is set (Default: true) - Neigther NoLocking nor the notice will be triggered if run as root (root should know what + automatic. Also a notice will be displayed indicating that this is only a simulation, + if the option APT::Get::Show-User-Simulation-Note is set (Default: true). + Neither NoLocking nor the notice will be triggered if run as root (root should know what he is doing without further warnings by apt-get). Simulate prints out -- cgit v1.2.3-70-g09d2 From 8bd02d8bd6bc46bc38924635afc09fdde50b6bf5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Sep 2009 15:02:15 +0200 Subject: Rework the CompressionTypes system by adding an Order subgroup to simplify customisation of the order and improve the documentation about this setting group. --- apt-pkg/aptconfiguration.cc | 56 +++++++++++++++++++++++++++----------------- debian/changelog | 3 +++ doc/apt.conf.5.xml | 32 ++++++++++++++++++------- doc/examples/configure-index | 9 +++++++ 4 files changed, 69 insertions(+), 31 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 1a8e8262f..45ae9bed5 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -14,6 +14,7 @@ #include #include +#include /*}}}*/ namespace APT { // getCompressionTypes - Return Vector of usbale compressiontypes /*{{{*/ @@ -29,41 +30,52 @@ const Configuration::getCompressionTypes(bool const &Cached) { types.clear(); } + // setup the defaults for the compressiontypes => method mapping + _config->CndSet("Acquire::CompressionTypes::bz2","bzip2"); + _config->CndSet("Acquire::CompressionTypes::lzma","lzma"); + _config->CndSet("Acquire::CompressionTypes::gz","gzip"); + // Set default application paths to check for optional compression types _config->CndSet("Dir::Bin::lzma", "/usr/bin/lzma"); _config->CndSet("Dir::Bin::bzip2", "/bin/bzip2"); - ::Configuration::Item const *Opts = _config->Tree("Acquire::CompressionTypes"); - if (Opts != 0) - Opts = Opts->Child; + // accept non-list order as override setting for config settings on commandline + std::string const overrideOrder = _config->Find("Acquire::CompressionTypes::Order",""); + if (overrideOrder.empty() == false) + types.push_back(overrideOrder); - // at first, move over the options to setup at least the default options - bool foundLzma=false, foundBzip2=false, foundGzip=false; - for (; Opts != 0; Opts = Opts->Next) { - if (Opts->Value == "lzma") - foundLzma = true; - else if (Opts->Value == "bz2") - foundBzip2 = true; - else if (Opts->Value == "gz") - foundGzip = true; + // load the order setting into our vector + std::vector const order = _config->FindVector("Acquire::CompressionTypes::Order"); + for (std::vector::const_iterator o = order.begin(); + o != order.end(); o++) { + if ((*o).empty() == true) + continue; + // ignore types we have no method ready to use + if (_config->Exists(string("Acquire::CompressionTypes::").append(*o)) == false) + continue; + // ignore types we have no app ready to use + string const appsetting = string("Dir::Bin::").append(*o); + if (_config->Exists(appsetting) == true) { + std::string const app = _config->FindFile(appsetting.c_str(), ""); + if (app.empty() == false && FileExists(app) == false) + continue; + } + types.push_back(*o); } - // setup the defaults now - if (!foundBzip2) - _config->Set("Acquire::CompressionTypes::bz2","bzip2"); - if (!foundLzma) - _config->Set("Acquire::CompressionTypes::lzma","lzma"); - if (!foundGzip) - _config->Set("Acquire::CompressionTypes::gz","gzip"); - - // move again over the option tree to finially calculate our result + // move again over the option tree to add all missing compression types ::Configuration::Item const *Types = _config->Tree("Acquire::CompressionTypes"); if (Types != 0) Types = Types->Child; for (; Types != 0; Types = Types->Next) { + if (Types->Tag == "Order" || Types->Tag.empty() == true) + continue; + // ignore types we already have in the vector + if (std::find(types.begin(),types.end(),Types->Tag) != types.end()) + continue; + // ignore types we have no app ready to use string const appsetting = string("Dir::Bin::").append(Types->Value); - // ignore compression types we have no app ready to use if (appsetting.empty() == false && _config->Exists(appsetting) == true) { std::string const app = _config->FindFile(appsetting.c_str(), ""); if (app.empty() == false && FileExists(app) == false) diff --git a/debian/changelog b/debian/changelog index 3d8dc292a..5ddd84117 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,9 @@ apt (0.7.24) UNRELEASED; urgency=low - replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208) * doc/apt-get.8.xml: - fix two little typos in the --simulate description. + * apt-pkg/aptconfiguration.cc, doc/apt.conf.5.xml: + - add an order subgroup to the compression types to simplify reordering + a bit and improve the documentation for this option group. -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index e0ce0db40..92ac5ec04 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -90,7 +90,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; #include will include the given file, unless the filename ends in a slash, then the whole directory is included. #clear is used to erase a part of the configuration tree. The - specified element and all its descendents are erased. + specified element and all its descendants are erased. All of the APT tools take a -o option which allows an arbitrary configuration directive to be specified on the command line. The syntax is a full option @@ -312,16 +312,30 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; CompressionTypes List of compression types which are understood by the acquire methods. Files like Packages can be available in various compression formats. - This list defines in which order the acquire methods will try to download these files. - Per default bzip2 compressed files will be prefered over - lzma, gzip and uncompressed files. The syntax for - the configuration fileentry is + Per default the acquire methods can decompress bzip2, lzma + and gzip compressed files, with this setting more formats can be added + on the fly or the used method can be changed. The syntax for this is: Acquire::CompressionTypes::FileExtension "Methodname"; - e.g. Acquire::CompressionTypes::bz2 "bzip2"; - Note that at runtime the Dir::Bin::Methodname will + Also the Order subgroup can be used to define in which order + the acquire system will try to download the compressed files. The acquire system will try the first + and proceed with the next compression type in this list on error, so to prefer one over the other type + simple add the preferred type at first - not already added default types will be added at run time + to the end of the list, so e.g. Acquire::CompressionTypes::Order:: "gz"; can + be used to prefer gzip compressed files over bzip2 and lzma. + If lzma should be preferred over gzip and bzip2 the + configure setting should look like this Acquire::CompressionTypes::Order { "lzma"; "gz"; }; + It is not needed to add bz2 explicit to the list as it will be added automatic. + Note that at run time the Dir::Bin::Methodname will be checked: If this setting exists the method will only be used if this file exists, e.g. for - the bzip2 method above (the inbuilt) setting is Dir::Bin::bzip2 "/bin/bzip2"; - + the bzip2 method (the inbuilt) setting is Dir::Bin::bzip2 "/bin/bzip2"; + Note also that list entries specified on the commandline will be added at the end of the list + specified in the configuration files, but before the default entries. To prefer a type in this case + over the ones specified in in the configuration files you can set the option direct - not in list style. + This will not override the defined list, it will only prefix the list with this type. + While it is possible to add an empty compression type to the order list, but APT in its current + version doesn't understand it correctly and will display many warnings about not downloaded files - + these warnings are most of the time false negatives. Future versions will maybe include a way to + really prefer uncompressed files to support the usage of local mirrors. diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 5dc7b5246..8025fa4b4 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -246,6 +246,15 @@ Acquire { Options {"--ignore-time-conflict";} // not very useful on a normal system }; + + CompressionTypes + { + bz2 "bzip2"; + lzma "lzma"; + gz "gzip"; + + Order { "gz"; "lzma"; "bz2"; }; + }; }; // Directory layout -- cgit v1.2.3-70-g09d2 From 1221c3a38f9962ea7ac866eb507fdd798481b5d4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Sep 2009 17:43:47 +0200 Subject: doc/apt.ent: move the description of files to globally usable entities --- debian/changelog | 2 ++ doc/apt-cache.8.xml | 17 ++------------ doc/apt-get.8.xml | 49 +++++----------------------------------- doc/apt.conf.5.xml | 10 +-------- doc/apt.ent | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+), 68 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5ddd84117..c5a786919 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ apt (0.7.24) UNRELEASED; urgency=low * apt-pkg/aptconfiguration.cc, doc/apt.conf.5.xml: - add an order subgroup to the compression types to simplify reordering a bit and improve the documentation for this option group. + * doc/apt.ent, all man pages: + - move the description of files to globally usable entities -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 8b76f55b9..26d55a519 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -357,21 +357,8 @@ Reverse Provides: Files - /etc/apt/sources.list - Locations to fetch packages from. - Configuration Item: Dir::Etc::SourceList. - - - &statedir;/lists/ - Storage area for state information for each package resource specified in - &sources-list; - Configuration Item: Dir::State::Lists. - - - &statedir;/lists/partial/ - Storage area for state information in transit. - Configuration Item: Dir::State::Lists (implicit partial). - + &file-sourceslist; + &file-statelists; diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 3a1292198..ec773edeb 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -558,50 +558,11 @@ Files - /etc/apt/sources.list - Locations to fetch packages from. - Configuration Item: Dir::Etc::SourceList. - - - /etc/apt/apt.conf - APT configuration file. - Configuration Item: Dir::Etc::Main. - - - /etc/apt/apt.conf.d/ - APT configuration file fragments. - Configuration Item: Dir::Etc::Parts. - - - /etc/apt/preferences - Version preferences file. - This is where you would specify "pinning", - i.e. a preference to get certain packages - from a separate source - or from a different version of a distribution. - Configuration Item: Dir::Etc::Preferences. - - - &cachedir;/archives/ - Storage area for retrieved package files. - Configuration Item: Dir::Cache::Archives. - - - &cachedir;/archives/partial/ - Storage area for package files in transit. - Configuration Item: Dir::Cache::Archives (implicit partial). - - - &statedir;/lists/ - Storage area for state information for each package resource specified in - &sources-list; - Configuration Item: Dir::State::Lists. - - - &statedir;/lists/partial/ - Storage area for state information in transit. - Configuration Item: Dir::State::Lists (implicit partial). - + &file-sourceslist; + &file-aptconf; + &file-preferences; + &file-cachearchives; + &file-statelists; diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 92ac5ec04..81be753f9 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -858,15 +858,7 @@ is commented. Files - /etc/apt/apt.conf - APT configuration file. - Configuration Item: Dir::Etc::Main. - - - /etc/apt/apt.conf.d/ - APT configuration file fragments. - Configuration Item: Dir::Etc::Parts. - + &file-aptconf; diff --git a/doc/apt.ent b/doc/apt.ent index 43ac2f8e5..9a4c17bcd 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -289,3 +289,67 @@ "> +/etc/apt/apt.conf + APT configuration file. + Configuration Item: Dir::Etc::Main. + + + /etc/apt/apt.conf.d/ + APT configuration file fragments. + Configuration Item: Dir::Etc::Parts. + +"> + +&cachedir;/archives/ + Storage area for retrieved package files. + Configuration Item: Dir::Cache::Archives. + + + &cachedir;/archives/partial/ + Storage area for package files in transit. + Configuration Item: Dir::Cache::Archives (implicit partial). + +"> + +/etc/apt/preferences + Version preferences file. + This is where you would specify "pinning", + i.e. a preference to get certain packages + from a separate source + or from a different version of a distribution. + Configuration Item: Dir::Etc::Preferences. + + + /etc/apt/preferences.d/ + File fragments for the version preferences. + Configuration Item: Dir::Etc::PreferencesParts. + +"> + +/etc/apt/sources.list + Locations to fetch packages from. + Configuration Item: Dir::Etc::SourceList. + + + /etc/apt/sources.list.d/ + File fragments for locations to fetch packages from. + Configuration Item: Dir::Etc::SourceParts. + +"> + +&statedir;/lists/ + Storage area for state information for each package resource specified in + &sources-list; + Configuration Item: Dir::State::Lists. + + + &statedir;/lists/partial/ + Storage area for state information in transit. + Configuration Item: Dir::State::Lists (implicit partial). + +"> -- cgit v1.2.3-70-g09d2 From daa4aa525a9d0de9a9a64be59615fc4be044bb83 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Sep 2009 17:47:59 +0200 Subject: document the new preferences.d folder in apt_preferences(Closes: #544017) --- debian/changelog | 2 ++ doc/apt_preferences.5.xml | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c5a786919..eebef40ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,8 @@ apt (0.7.24) UNRELEASED; urgency=low a bit and improve the documentation for this option group. * doc/apt.ent, all man pages: - move the description of files to globally usable entities + * doc/apt_preferences.5.xml: + - document the new preferences.d folder (Closes: #544017) -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 12ea606b7..159d61f2b 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -32,7 +32,8 @@ Description The APT preferences file /etc/apt/preferences -can be used to control which versions of packages will be selected +and the fragment files in the /etc/apt/preferences.d/ +folder can be used to control which versions of packages will be selected for installation. Several versions of a package may be available for installation when @@ -610,6 +611,13 @@ apt-get install package/sid + +Files + + &file-preferences; + + + See Also &apt-get; &apt-cache; &apt-conf; &sources-list; -- cgit v1.2.3-70-g09d2 From ebf2e25b204195892b6c4866b1517755efb590b4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Sep 2009 23:11:11 +0200 Subject: add text at the top without failing in rred (Closes: #545694) Patch from Bernhard R. Link, thanks! --- debian/changelog | 2 ++ methods/rred.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index eebef40ff..9aa1f6860 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,8 @@ apt (0.7.24) UNRELEASED; urgency=low - move the description of files to globally usable entities * doc/apt_preferences.5.xml: - document the new preferences.d folder (Closes: #544017) + * methods/rred.cc: + - add at the top without failing (by Bernhard R. Link, Closes: #545694) -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/methods/rred.cc b/methods/rred.cc index 6fa57f3a6..27d95bdde 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -174,7 +174,7 @@ int RredMethod::ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, hash); /* read the rest from infile */ - if (result > 0) { + if (result >= 0) { while (fgets(buffer, BUF_SIZE, in_file) != NULL) { written = fwrite(buffer, 1, strlen(buffer), out_file); hash->Add((unsigned char*)buffer, written); -- cgit v1.2.3-70-g09d2 From 453c7548fefd3c13927cb8a10e16cca121eb144b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Sep 2009 14:08:40 +0200 Subject: add amd64 for cross building (by Mikhail Gusarov, Closes: #513058) --- buildlib/sizetable | 3 ++- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/buildlib/sizetable b/buildlib/sizetable index b5782360c..372ddd091 100644 --- a/buildlib/sizetable +++ b/buildlib/sizetable @@ -11,6 +11,7 @@ # The format is:- # CPU endian sizeof: char, int, short, long i386 little 1 4 2 4 +amd64 little 1 4 2 8 armeb big 1 4 2 4 arm little 1 4 2 4 alpha little 1 4 2 8 @@ -21,4 +22,4 @@ m68k big 1 4 2 4 powerpc big 1 4 2 4 mips big 1 4 2 4 hppa big 1 4 2 4 -m32r big 1 4 2 4 \ No newline at end of file +m32r big 1 4 2 4 diff --git a/debian/changelog b/debian/changelog index 9aa1f6860..c308c05aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ apt (0.7.24) UNRELEASED; urgency=low - document the new preferences.d folder (Closes: #544017) * methods/rred.cc: - add at the top without failing (by Bernhard R. Link, Closes: #545694) + * buildlib/sizetable: + - add amd64 for cross building (by Mikhail Gusarov, Closes: #513058) -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 -- cgit v1.2.3-70-g09d2 From 159cf2bd7513b4bfa4e8da0526f3562f8610db67 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Sep 2009 14:15:33 +0200 Subject: debian/prerm: remove file as nobody will upgrade from 0.4.10 anymore --- debian/changelog | 2 ++ debian/prerm | 15 --------------- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100755 debian/prerm diff --git a/debian/changelog b/debian/changelog index c308c05aa..6b4b41478 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,8 @@ apt (0.7.24) UNRELEASED; urgency=low - add at the top without failing (by Bernhard R. Link, Closes: #545694) * buildlib/sizetable: - add amd64 for cross building (by Mikhail Gusarov, Closes: #513058) + * debian/prerm: + - remove file as nobody will upgrade from 0.4.10 anymore -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/debian/prerm b/debian/prerm deleted file mode 100755 index 4a8d47782..000000000 --- a/debian/prerm +++ /dev/null @@ -1,15 +0,0 @@ -#! /bin/sh - -set -e - -#DEBHELPER# - -if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ] && - dpkg --compare-versions "$2" "<<" 0.4.10 -then - if [ ! -d /var/state/apt/ ]; then - ln -s /var/lib/apt /var/state/apt - touch /var/lib/apt/lists/partial/.delete-me-later - fi -fi - -- cgit v1.2.3-70-g09d2 From c9e62a0147445b816d4cb1009fbd6fcc7de29f68 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Sep 2009 15:25:21 +0200 Subject: add the fr generated .xml files to the ignore list --- .bzrignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.bzrignore b/.bzrignore index bad8837c6..d004d22f0 100644 --- a/.bzrignore +++ b/.bzrignore @@ -22,6 +22,7 @@ doc/*/apt.ent # older translation methods translate in this files # so we can not ignore it for all translations now doc/ja/*.xml +doc/fr/*.xml # FIXME: files generated by deprecated sgml man pages doc/es/manpage.links -- cgit v1.2.3-70-g09d2 From 388b9071a956d0a5fbf6ffa4fdef8c3bb1f755cd Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Sep 2009 15:26:11 +0200 Subject: remove the suggestion on gnome-apt as it was removed from debian see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=414526 --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b5cedbe2e..41620d3cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,8 @@ apt (0.7.24) UNRELEASED; urgency=low - add amd64 for cross building (by Mikhail Gusarov, Closes: #513058) * debian/prerm: - remove file as nobody will upgrade from 0.4.10 anymore + * debian/control: + - remove gnome-apt suggestion as it was removed from debian [ Christian Perrier ] * doc/fr/*, doc/po/fr.po: diff --git a/debian/control b/debian/control index bcf89da9b..a9c82f9e8 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Depends: ${shlibs:Depends}, debian-archive-keyring Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} -Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt +Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Section: admin Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. -- cgit v1.2.3-70-g09d2 From bcf91c1bf65a69f67f723f6428e2fc57e0366f17 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Sep 2009 18:33:09 +0200 Subject: use only one xsl file (and therefore utf-8) for all languages --- buildlib/po4a_manpage.mak | 2 +- doc/fr/style.fr.xsl | 9 - doc/ja/style.ja.xsl | 9 - doc/manpage-style.xsl | 9 + doc/po/apt-doc.pot | 2075 +++++++++++++++------------ doc/po/fr.po | 3496 +++++++++++++++++++++++++-------------------- doc/po/ja.po | 2359 +++++++++++++++++------------- po/apt-all.pot | 34 +- 8 files changed, 4461 insertions(+), 3532 deletions(-) delete mode 100644 doc/fr/style.fr.xsl delete mode 100644 doc/ja/style.ja.xsl create mode 100644 doc/manpage-style.xsl diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 3ea4e2cb5..538859b6e 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -16,7 +16,7 @@ INCLUDES = apt.ent # Do not use XMLTO, build the manpages directly with XSLTPROC ifdef XSLTPROC -STYLESHEET=./style.$(LC).xsl +STYLESHEET=../manpage-style.xsl LOCAL := po4a-manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(SOURCE) diff --git a/doc/fr/style.fr.xsl b/doc/fr/style.fr.xsl deleted file mode 100644 index 11593bb42..000000000 --- a/doc/fr/style.fr.xsl +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/doc/ja/style.ja.xsl b/doc/ja/style.ja.xsl deleted file mode 100644 index c102f1366..000000000 --- a/doc/ja/style.ja.xsl +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/doc/manpage-style.xsl b/doc/manpage-style.xsl new file mode 100644 index 000000000..f1024c4f4 --- /dev/null +++ b/doc/manpage-style.xsl @@ -0,0 +1,9 @@ + + + + + + + diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index ff42c7ee9..338ff4d53 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-07-30 22:55+0900\n" +"POT-Creation-Date: 2009-09-09 14:58+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -422,15 +422,17 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:165 +#: apt.ent:168 #, no-wrap msgid "" "\n" "\n" "
apt@packages.debian.org
\n" -" Jason " -"Gunthorpe\n" +" \n" +" Jason Gunthorpe\n" +" \n" +" \n" " 1998-2001 Jason " "Gunthorpe\n" " 28 October 2008\n" @@ -438,7 +440,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:168 +#: apt.ent:171 #, no-wrap msgid "" " \n" @@ -446,7 +448,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:174 apt.ent:204 +#: apt.ent:177 #, no-wrap msgid "" "\n" " Jason\n" " Gunthorpe\n" +" \n" " \n" "\">\n" msgstr "" #. type: Plain text -#: apt.ent:188 +#: apt.ent:193 #, no-wrap msgid "" "\n" " Mike\n" " O'Connor\n" +" \n" " \n" "\">\n" msgstr "" #. type: Plain text -#: apt.ent:194 apt.ent:217 +#: apt.ent:200 #, no-wrap msgid "" "\n" " APT team\n" +" \n" " \n" "\">\n" msgstr "" #. type: Plain text -#: apt.ent:198 apt.ent:228 +#: apt.ent:204 apt.ent:215 #, no-wrap msgid "" "\n" @@ -541,7 +546,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:253 +#: apt.ent:240 #, no-wrap msgid "" "\n" @@ -555,7 +560,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:263 +#: apt.ent:250 #, no-wrap msgid "" "\n" +#| "\n" +#| "
apt@packages.debian.org
\n" +#| " Jason Gunthorpe\n" +#| " 1998-2001 Jason Gunthorpe\n" +#| " 28 October 2008\n" +#| " Linux\n" msgid "" "\n" "\n" "
apt@packages.debian.org
\n" -" Jason Gunthorpe\n" +" \n" +" Jason Gunthorpe\n" +" \n" +" \n" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" @@ -581,7 +599,7 @@ msgstr "" " Linux\n" #. type: Plain text -#: apt.ent:168 +#: apt.ent:171 #, no-wrap msgid "" " \n" @@ -591,7 +609,7 @@ msgstr "" "\"> \n" #. type: Plain text -#: apt.ent:174 apt.ent:204 +#: apt.ent:177 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:181 apt.ent:211 -#, no-wrap +#: apt.ent:185 +#, fuzzy, no-wrap +#| msgid "" +#| "\n" +#| " Jason\n" +#| " Gunthorpe\n" +#| " \n" +#| "\">\n" msgid "" "\n" " Jason\n" " Gunthorpe\n" +" \n" " \n" "\">\n" msgstr "" @@ -625,13 +651,21 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:188 -#, no-wrap +#: apt.ent:193 +#, fuzzy, no-wrap +#| msgid "" +#| "\n" +#| " Mike\n" +#| " O'Connor\n" +#| " \n" +#| "\">\n" msgid "" "\n" " Mike\n" " O'Connor\n" +" \n" " \n" "\">\n" msgstr "" @@ -643,12 +677,19 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:194 apt.ent:217 -#, no-wrap +#: apt.ent:200 +#, fuzzy, no-wrap +#| msgid "" +#| "\n" +#| " APT team\n" +#| " \n" +#| "\">\n" msgid "" "\n" " APT team\n" +" \n" " \n" "\">\n" msgstr "" @@ -659,7 +700,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:198 apt.ent:228 +#: apt.ent:204 apt.ent:215 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:224 +#: apt.ent:211 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:221 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:245 +#: apt.ent:232 #, no-wrap msgid "" "\n" @@ -731,7 +772,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:253 +#: apt.ent:240 #, no-wrap msgid "" "\n" @@ -751,7 +792,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:263 +#: apt.ent:250 #, no-wrap msgid "" "\n" +#| "\n" +#| "
apt@packages.debian.org
\n" +#| " Jason Gunthorpe\n" +#| " 1998-2001 Jason Gunthorpe\n" +#| " 28 October 2008\n" +#| " Linux\n" msgid "" "\n" "\n" "
apt@packages.debian.org
\n" -" Jason Gunthorpe\n" +" \n" +" Jason Gunthorpe\n" +" \n" +" \n" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" @@ -600,7 +612,7 @@ msgstr "" " Linux\n" #. type: Plain text -#: apt.ent:168 +#: apt.ent:171 #, no-wrap msgid "" " \n" @@ -610,7 +622,7 @@ msgstr "" "\"> \n" #. type: Plain text -#: apt.ent:174 apt.ent:204 +#: apt.ent:177 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:181 apt.ent:211 -#, no-wrap +#: apt.ent:185 +#, fuzzy, no-wrap +#| msgid "" +#| "\n" +#| " Jason\n" +#| " Gunthorpe\n" +#| " \n" +#| "\">\n" msgid "" "\n" " Jason\n" " Gunthorpe\n" +" \n" " \n" "\">\n" msgstr "" @@ -644,13 +664,21 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:188 -#, no-wrap +#: apt.ent:193 +#, fuzzy, no-wrap +#| msgid "" +#| "\n" +#| " Mike\n" +#| " O'Connor\n" +#| " \n" +#| "\">\n" msgid "" "\n" " Mike\n" " O'Connor\n" +" \n" " \n" "\">\n" msgstr "" @@ -662,12 +690,19 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:194 apt.ent:217 -#, no-wrap +#: apt.ent:200 +#, fuzzy, no-wrap +#| msgid "" +#| "\n" +#| " APT team\n" +#| " \n" +#| "\">\n" msgid "" "\n" " APT team\n" +" \n" " \n" "\">\n" msgstr "" @@ -678,7 +713,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:198 apt.ent:228 +#: apt.ent:204 apt.ent:215 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:224 +#: apt.ent:211 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:221 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:245 +#: apt.ent:232 #, no-wrap msgid "" "\n" @@ -750,7 +785,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:253 +#: apt.ent:240 #, no-wrap msgid "" "\n" @@ -770,7 +805,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:263 +#: apt.ent:250 #, no-wrap msgid "" " - 10 December 2008 + 18 September 2009 @@ -484,8 +484,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; DPkg::NoTriggers "true"; PackageManager::Configure "smart"; DPkg::ConfigurePending "true"; -DPkg::TriggersPending "true"; -OrderList::Score::Immediate 100; +DPkg::TriggersPending "true"; DPkg::NoTriggers @@ -520,13 +519,6 @@ OrderList::Score::Immediate 100; currently which is a dealbreaker for Pre-Dependencies (see debbugs #526774). Note that this will process all triggers, not only the triggers needed to configure this package. - Dpkg::NoConfTriggers - DPkg currently will ignore the --triggers or --no-triggers flag if the trigger - is already pending. This option therefore has no real effect as long as dpkg doesn't change - his behavior. The option is automatical activated if DPkg::NoTriggers is - activated. You should use DPkg::TriggersPending to take care of these pending - triggers. - PackageManager::UnpackAll As the configuration can be deferred to be done at the end by dpkg it can be tried to order the unpack series only by critical needs, e.g. by Pre-Depends. Default is true diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 6a54450c4..ed27cecf8 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-09-15 22:56+0300\n" +"POT-Creation-Date: 2009-09-18 16:44+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1408,7 +1408,7 @@ msgid "&apt-commonoptions;" msgstr "" #. type: Content of: -#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:948 apt_preferences.5.xml:615 +#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:940 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@ -1418,7 +1418,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:954 apt_preferences.5.xml:622 sources.list.5.xml:221 +#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:946 apt_preferences.5.xml:622 sources.list.5.xml:221 msgid "See Also" msgstr "" @@ -2673,7 +2673,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:942 apt_preferences.5.xml:462 sources.list.5.xml:181 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:934 apt_preferences.5.xml:462 sources.list.5.xml:181 msgid "Examples" msgstr "" @@ -5015,8 +5015,7 @@ msgid "" "DPkg::NoTriggers \"true\";\n" "PackageManager::Configure \"smart\";\n" "DPkg::ConfigurePending \"true\";\n" -"DPkg::TriggersPending \"true\";\n" -"OrderList::Score::Immediate 100;" +"DPkg::TriggersPending \"true\";" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -5034,12 +5033,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:491 +#: apt.conf.5.xml:490 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:491 msgid "" "Add the no triggers flag to all dpkg calls (expect the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5051,12 +5050,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:499 +#: apt.conf.5.xml:498 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:500 +#: apt.conf.5.xml:499 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5073,12 +5072,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:510 +#: apt.conf.5.xml:509 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:510 msgid "" "If this option is set apt will call <command>dpkg --configure " "--pending</command> to let dpkg handle all required configurations and " @@ -5090,43 +5089,28 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:516 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:518 +#: apt.conf.5.xml:517 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " -"pending triggers is not considered as <literal>installed</literal> and dpkg " -"treats them as <literal>unpacked</literal> currently which is a dealbreaker " -"for Pre-Dependencies (see debbugs #526774). Note that this will process all " -"triggers, not only the triggers needed to configure this package." -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:523 -msgid "Dpkg::NoConfTriggers" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:524 -msgid "" -"DPkg currently will ignore the --triggers or --no-triggers flag if the " -"trigger is already pending. This option therefore has no real effect as long " -"as dpkg doesn't change his behavior. The option is automatical activated if " -"<literal>DPkg::NoTriggers</literal> is activated. You should use " -"<literal>DPkg::TriggersPending</literal> to take care of these pending " -"triggers." +"pending triggers is not considered as \"<literal>installed</literal>\" and " +"dpkg treats them as \"<literal>unpacked</literal>\" currently which is a " +"dealbreaker for Pre-Dependencies (see also debbugs #526774). Note that this " +"will process all triggers, not only the triggers needed to configure this " +"package." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:530 +#: apt.conf.5.xml:522 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:531 +#: apt.conf.5.xml:523 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by " @@ -5138,12 +5122,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:530 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:538 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5155,7 +5139,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:539 +#: apt.conf.5.xml:531 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5169,12 +5153,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:559 +#: apt.conf.5.xml:551 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:560 +#: apt.conf.5.xml:552 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5183,12 +5167,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:568 +#: apt.conf.5.xml:560 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:562 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5199,7 +5183,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:573 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@ -5207,7 +5191,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:581 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@ -5215,7 +5199,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:598 +#: apt.conf.5.xml:590 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5225,110 +5209,110 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:598 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:616 +#: apt.conf.5.xml:608 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:613 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:625 +#: apt.conf.5.xml:617 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:624 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:636 +#: apt.conf.5.xml:628 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:635 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:639 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:646 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:658 +#: apt.conf.5.xml:650 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:665 +#: apt.conf.5.xml:657 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:669 +#: apt.conf.5.xml:661 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:676 +#: apt.conf.5.xml:668 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:680 +#: apt.conf.5.xml:672 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:687 +#: apt.conf.5.xml:679 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:682 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:697 +#: apt.conf.5.xml:689 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:692 msgid "" "Output each cryptographic hash that is generated by the " "<literal>apt</literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:699 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:702 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5336,92 +5320,92 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:710 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:721 +#: apt.conf.5.xml:713 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:721 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:725 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:732 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:743 +#: apt.conf.5.xml:735 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:742 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:753 +#: apt.conf.5.xml:745 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:761 +#: apt.conf.5.xml:753 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:757 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:764 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:768 msgid "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:783 +#: apt.conf.5.xml:775 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:787 +#: apt.conf.5.xml:779 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:794 +#: apt.conf.5.xml:786 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:789 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@ -5431,12 +5415,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:800 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:811 +#: apt.conf.5.xml:803 msgid "" "Generate debug messages describing which package is marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@ -5454,90 +5438,90 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:822 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:833 +#: apt.conf.5.xml:825 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:840 +#: apt.conf.5.xml:832 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:843 +#: apt.conf.5.xml:835 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:843 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:854 +#: apt.conf.5.xml:846 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:861 +#: apt.conf.5.xml:853 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:865 +#: apt.conf.5.xml:857 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:865 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:877 +#: apt.conf.5.xml:869 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:884 +#: apt.conf.5.xml:876 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:888 +#: apt.conf.5.xml:880 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:886 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:898 +#: apt.conf.5.xml:890 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:906 +#: apt.conf.5.xml:898 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:901 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5545,32 +5529,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:917 +#: apt.conf.5.xml:909 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:921 +#: apt.conf.5.xml:913 msgid "" "Print information about the vendors read from " "<filename>/etc/apt/vendors.list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:943 +#: apt.conf.5.xml:935 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:950 +#: apt.conf.5.xml:942 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:947 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --git a/doc/po/fr.po b/doc/po/fr.po index 17ed328b1..e340b91c4 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2009-09-15 22:56+0300\n" +"POT-Creation-Date: 2009-09-18 16:44+0300\n" "PO-Revision-Date: 2009-09-04 20:23+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -1882,7 +1882,7 @@ msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:948 apt_preferences.5.xml:615 +#: apt.conf.5.xml:940 apt_preferences.5.xml:615 msgid "Files" msgstr "Fichiers" @@ -1895,7 +1895,7 @@ msgstr "" #: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 #: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:954 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:946 apt_preferences.5.xml:622 #: sources.list.5.xml:221 msgid "See Also" msgstr "Voir aussi" @@ -3481,7 +3481,7 @@ msgstr "" "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:942 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:934 apt_preferences.5.xml:462 #: sources.list.5.xml:181 msgid "Examples" msgstr "Exemples" @@ -6820,8 +6820,7 @@ msgid "" "DPkg::NoTriggers \"true\";\n" "PackageManager::Configure \"smart\";\n" "DPkg::ConfigurePending \"true\";\n" -"DPkg::TriggersPending \"true\";\n" -"OrderList::Score::Immediate 100;" +"DPkg::TriggersPending \"true\";" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -6839,12 +6838,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:491 +#: apt.conf.5.xml:490 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:491 msgid "" "Add the no triggers flag to all dpkg calls (expect the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -6856,14 +6855,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:499 +#: apt.conf.5.xml:498 #, fuzzy #| msgid "Packages::Compress" msgid "PackageManager::Configure" msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:500 +#: apt.conf.5.xml:499 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -6879,12 +6878,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:510 +#: apt.conf.5.xml:509 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:510 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -6895,43 +6894,28 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:516 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:518 +#: apt.conf.5.xml:517 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " -"pending triggers is not considered as <literal>installed</literal> and dpkg " -"treats them as <literal>unpacked</literal> currently which is a dealbreaker " -"for Pre-Dependencies (see debbugs #526774). Note that this will process all " -"triggers, not only the triggers needed to configure this package." -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:523 -msgid "Dpkg::NoConfTriggers" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:524 -msgid "" -"DPkg currently will ignore the --triggers or --no-triggers flag if the " -"trigger is already pending. This option therefore has no real effect as long " -"as dpkg doesn't change his behavior. The option is automatical activated if " -"<literal>DPkg::NoTriggers</literal> is activated. You should use " -"<literal>DPkg::TriggersPending</literal> to take care of these pending " -"triggers." +"pending triggers is not considered as \"<literal>installed</literal>\" and " +"dpkg treats them as \"<literal>unpacked</literal>\" currently which is a " +"dealbreaker for Pre-Dependencies (see also debbugs #526774). Note that this " +"will process all triggers, not only the triggers needed to configure this " +"package." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:530 +#: apt.conf.5.xml:522 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:531 +#: apt.conf.5.xml:523 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -6943,12 +6927,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:530 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:538 #, no-wrap msgid "" "OrderList::Score {\n" @@ -6960,7 +6944,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:539 +#: apt.conf.5.xml:531 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -6974,13 +6958,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:559 +#: apt.conf.5.xml:551 #, fuzzy msgid "Periodic and Archives options" msgstr "Options « Periodic » et « Archive »" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:560 +#: apt.conf.5.xml:552 #, fuzzy msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " @@ -6993,13 +6977,13 @@ msgstr "" "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:568 +#: apt.conf.5.xml:560 #, fuzzy msgid "Debug options" msgstr "Les options de débogage" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:562 #, fuzzy msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " @@ -7018,7 +7002,7 @@ msgstr "" "peuvent tout de même être utiles :" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:573 #, fuzzy msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " @@ -7030,7 +7014,7 @@ msgstr "" "upgrade, upgrade, install, remove et purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:581 #, fuzzy msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " @@ -7042,7 +7026,7 @@ msgstr "" "<literal>apt-get -s install</literal>) sans être « root »." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:598 +#: apt.conf.5.xml:590 #, fuzzy msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " @@ -7055,7 +7039,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:598 #, fuzzy msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " @@ -7065,71 +7049,71 @@ msgstr "" "type statfs dans les ID de cédérom." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:616 +#: apt.conf.5.xml:608 #, fuzzy msgid "A full list of debugging options to apt follows." msgstr "Voici une liste complète des options de débogage de APT." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:613 #, fuzzy msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "Debug::Acquire::cdrom" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:625 +#: apt.conf.5.xml:617 #, fuzzy msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "Affiche les informations concernant les sources de type cdrom://" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:624 #, fuzzy msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "Debug::Acquire::ftp" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:636 +#: apt.conf.5.xml:628 #, fuzzy msgid "Print information related to downloading packages using FTP." msgstr "" "Affiche les informations concernant le téléchargement de paquets par FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:635 #, fuzzy msgid "<literal>Debug::Acquire::http</literal>" msgstr "Debug::Acquire::http" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:639 #, fuzzy msgid "Print information related to downloading packages using HTTP." msgstr "" "Affiche les informations concernant le téléchargement de paquets par HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:646 #, fuzzy msgid "<literal>Debug::Acquire::https</literal>" msgstr "Debug::Acquire::https" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:658 +#: apt.conf.5.xml:650 #, fuzzy msgid "Print information related to downloading packages using HTTPS." msgstr "" "Affiche les informations concernant le téléchargement de paquets par HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:665 +#: apt.conf.5.xml:657 #, fuzzy msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "Debug::Acquire::gpgv" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:669 +#: apt.conf.5.xml:661 #, fuzzy msgid "" "Print information related to verifying cryptographic signatures using " @@ -7139,13 +7123,13 @@ msgstr "" "cryptographiques avec <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:676 +#: apt.conf.5.xml:668 #, fuzzy msgid "<literal>Debug::aptcdrom</literal>" msgstr "Debug::aptcdrom" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:680 +#: apt.conf.5.xml:672 #, fuzzy msgid "" "Output information about the process of accessing collections of packages " @@ -7155,13 +7139,13 @@ msgstr "" "stockées sur cédérom." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:687 +#: apt.conf.5.xml:679 #, fuzzy msgid "<literal>Debug::BuildDeps</literal>" msgstr "Debug::BuildDeps" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:682 #, fuzzy msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" @@ -7169,13 +7153,13 @@ msgstr "" "paquets source ( « build-dependencies » ) par &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:697 +#: apt.conf.5.xml:689 #, fuzzy msgid "<literal>Debug::Hashes</literal>" msgstr "Debug::Hashes" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:692 #, fuzzy msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" @@ -7185,13 +7169,13 @@ msgstr "" "librairies APT." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:699 #, fuzzy msgid "<literal>Debug::IdentCDROM</literal>" msgstr "Debug::IdentCdrom" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:702 #, fuzzy msgid "" "Do not include information from <literal>statfs</literal>, namely the number " @@ -7203,13 +7187,13 @@ msgstr "" "sur le système de fichier du cédérom." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:710 #, fuzzy msgid "<literal>Debug::NoLocking</literal>" msgstr "Debug::NoLocking" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:721 +#: apt.conf.5.xml:713 #, fuzzy msgid "" "Disable all file locking. For instance, this will allow two instances of " @@ -7219,13 +7203,13 @@ msgstr "" "deux instances de « apt-get update » en même temps." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:721 #, fuzzy msgid "<literal>Debug::pkgAcquire</literal>" msgstr "Debug::pkgAcquire" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:725 #, fuzzy msgid "Log when items are added to or removed from the global download queue." msgstr "" @@ -7233,13 +7217,13 @@ msgstr "" "téléchargement." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:732 #, fuzzy msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "Debug::pkgAcquire::Auth" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:743 +#: apt.conf.5.xml:735 #, fuzzy msgid "" "Output status messages and errors related to verifying checksums and " @@ -7250,13 +7234,13 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:742 #, fuzzy msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "Debug::pkgAcquire::Diffs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:753 +#: apt.conf.5.xml:745 #, fuzzy msgid "" "Output information about downloading and applying package index list diffs, " @@ -7267,13 +7251,13 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:761 +#: apt.conf.5.xml:753 #, fuzzy msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "Debug::pkgAcquire::RRed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:757 #, fuzzy msgid "" "Output information related to patching apt package lists when downloading " @@ -7284,13 +7268,13 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:764 #, fuzzy msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "Debug::pkgAcquire::Worker" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:768 #, fuzzy msgid "" "Log all interactions with the sub-processes that actually perform downloads." @@ -7299,13 +7283,13 @@ msgstr "" "effectivement des téléchargements." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:783 +#: apt.conf.5.xml:775 #, fuzzy msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "Debug::pkgAcquire::pkgAutoRemove" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:787 +#: apt.conf.5.xml:779 #, fuzzy msgid "" "Log events related to the automatically-installed status of packages and to " @@ -7315,13 +7299,13 @@ msgstr "" "automatiquement, et la suppression des paquets inutiles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:794 +#: apt.conf.5.xml:786 #, fuzzy msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "Debug::pkgDepCache::AutoInstall" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:789 #, fuzzy msgid "" "Generate debug messages describing which packages are being automatically " @@ -7337,13 +7321,13 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:800 #, fuzzy msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "Debug::pkgDepCache::AutoInstall" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:811 +#: apt.conf.5.xml:803 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7360,13 +7344,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:822 #, fuzzy msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "Debug::pkgInitConfig" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:833 +#: apt.conf.5.xml:825 #, fuzzy msgid "Dump the default configuration to standard error on startup." msgstr "" @@ -7374,13 +7358,13 @@ msgstr "" "standard." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:840 +#: apt.conf.5.xml:832 #, fuzzy msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "Debug::pkgDPkgPM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:843 +#: apt.conf.5.xml:835 #, fuzzy msgid "" "When invoking &dpkg;, output the precise command line with which it is being " @@ -7390,13 +7374,13 @@ msgstr "" "arguments sont séparés par des espaces." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:843 #, fuzzy msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "Debug::pkgDPkgProgressReporting" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:854 +#: apt.conf.5.xml:846 #, fuzzy msgid "" "Output all the data received from &dpkg; on the status file descriptor and " @@ -7407,13 +7391,13 @@ msgstr "" "fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:861 +#: apt.conf.5.xml:853 #, fuzzy msgid "<literal>Debug::pkgOrderList</literal>" msgstr "Debug::pkgOrderList" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:865 +#: apt.conf.5.xml:857 #, fuzzy msgid "" "Generate a trace of the algorithm that decides the order in which " @@ -7423,38 +7407,38 @@ msgstr "" "APT passe les paquets à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:865 #, fuzzy msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "Debug::pkgPackageManager" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:877 +#: apt.conf.5.xml:869 #, fuzzy msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:884 +#: apt.conf.5.xml:876 #, fuzzy msgid "<literal>Debug::pkgPolicy</literal>" msgstr "Debug::pkgPolicy" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:888 +#: apt.conf.5.xml:880 #, fuzzy msgid "Output the priority of each package list on startup." msgstr "Au lancement, affiche la priorité de chaque liste de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:886 #, fuzzy msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "Debug::pkgProblemResolver" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:898 +#: apt.conf.5.xml:890 #, fuzzy msgid "" "Trace the execution of the dependency resolver (this applies only to what " @@ -7464,13 +7448,13 @@ msgstr "" "concerne que les cas où un problème de dépendances complexe se présente)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:906 +#: apt.conf.5.xml:898 #, fuzzy msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "Debug::pkgProblemResolver" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:901 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7478,13 +7462,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:917 +#: apt.conf.5.xml:909 #, fuzzy msgid "<literal>Debug::sourceList</literal>" msgstr "Debug::sourceList" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:921 +#: apt.conf.5.xml:913 #, fuzzy msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." @@ -7494,7 +7478,7 @@ msgstr "" "list</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:943 +#: apt.conf.5.xml:935 #, fuzzy msgid "" "&configureindex; is a configuration file showing example values for all " @@ -7504,7 +7488,7 @@ msgstr "" "exemples pour toutes les options existantes." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:950 +#: apt.conf.5.xml:942 #, fuzzy #| msgid "&apt-conf;" msgid "&file-aptconf;" @@ -7512,7 +7496,7 @@ msgstr "&apt-conf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:947 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache; &apt-conf;" diff --git a/doc/po/ja.po b/doc/po/ja.po index 7cae35b6e..4802bd2dc 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-09-15 22:56+0300\n" +"POT-Creation-Date: 2009-09-18 16:44+0300\n" "PO-Revision-Date: 2009-07-30 22:55+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1928,7 +1928,7 @@ msgstr "&apt-commonoptions;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:948 apt_preferences.5.xml:615 +#: apt.conf.5.xml:940 apt_preferences.5.xml:615 msgid "Files" msgstr "ファイル" @@ -1942,7 +1942,7 @@ msgstr "" #: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 #: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:954 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:946 apt_preferences.5.xml:622 #: sources.list.5.xml:221 msgid "See Also" msgstr "関連項目" @@ -3630,7 +3630,7 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:942 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:934 apt_preferences.5.xml:462 #: sources.list.5.xml:181 msgid "Examples" msgstr "サンプル" @@ -6878,8 +6878,7 @@ msgid "" "DPkg::NoTriggers \"true\";\n" "PackageManager::Configure \"smart\";\n" "DPkg::ConfigurePending \"true\";\n" -"DPkg::TriggersPending \"true\";\n" -"OrderList::Score::Immediate 100;" +"DPkg::TriggersPending \"true\";" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -6897,12 +6896,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:491 +#: apt.conf.5.xml:490 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:491 msgid "" "Add the no triggers flag to all dpkg calls (expect the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -6915,14 +6914,14 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:499 +#: apt.conf.5.xml:498 #, fuzzy #| msgid "Packages::Compress" msgid "PackageManager::Configure" msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:500 +#: apt.conf.5.xml:499 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -6939,13 +6938,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:510 +#: apt.conf.5.xml:509 #, fuzzy msgid "DPkg::ConfigurePending" msgstr "ユーザの設定" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:510 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -6956,43 +6955,28 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:516 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:518 +#: apt.conf.5.xml:517 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " -"pending triggers is not considered as <literal>installed</literal> and dpkg " -"treats them as <literal>unpacked</literal> currently which is a dealbreaker " -"for Pre-Dependencies (see debbugs #526774). Note that this will process all " -"triggers, not only the triggers needed to configure this package." -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:523 -msgid "Dpkg::NoConfTriggers" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:524 -msgid "" -"DPkg currently will ignore the --triggers or --no-triggers flag if the " -"trigger is already pending. This option therefore has no real effect as long " -"as dpkg doesn't change his behavior. The option is automatical activated if " -"<literal>DPkg::NoTriggers</literal> is activated. You should use " -"<literal>DPkg::TriggersPending</literal> to take care of these pending " -"triggers." +"pending triggers is not considered as \"<literal>installed</literal>\" and " +"dpkg treats them as \"<literal>unpacked</literal>\" currently which is a " +"dealbreaker for Pre-Dependencies (see also debbugs #526774). Note that this " +"will process all triggers, not only the triggers needed to configure this " +"package." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:530 +#: apt.conf.5.xml:522 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:531 +#: apt.conf.5.xml:523 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -7004,12 +6988,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:530 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:538 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7021,7 +7005,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:539 +#: apt.conf.5.xml:531 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -7035,12 +7019,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:559 +#: apt.conf.5.xml:551 msgid "Periodic and Archives options" msgstr "Periodic オプションと Archives オプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:560 +#: apt.conf.5.xml:552 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7054,12 +7038,12 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:568 +#: apt.conf.5.xml:560 msgid "Debug options" msgstr "デバッグオプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:562 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7070,7 +7054,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:573 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7081,7 +7065,7 @@ msgstr "" "にします。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:581 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7092,7 +7076,7 @@ msgstr "" "literal>) を行う場合に使用します。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:598 +#: apt.conf.5.xml:590 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7102,66 +7086,66 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:598 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:616 +#: apt.conf.5.xml:608 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:613 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:625 +#: apt.conf.5.xml:617 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:624 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:636 +#: apt.conf.5.xml:628 msgid "Print information related to downloading packages using FTP." msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:635 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:639 msgid "Print information related to downloading packages using HTTP." msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:646 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:658 +#: apt.conf.5.xml:650 msgid "Print information related to downloading packages using HTTPS." msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:665 +#: apt.conf.5.xml:657 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:669 +#: apt.conf.5.xml:661 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7169,46 +7153,46 @@ msgstr "" "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:676 +#: apt.conf.5.xml:668 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:680 +#: apt.conf.5.xml:672 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:687 +#: apt.conf.5.xml:679 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:682 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:697 +#: apt.conf.5.xml:689 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:692 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:699 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:702 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7216,93 +7200,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:710 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:721 +#: apt.conf.5.xml:713 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:721 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:725 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:732 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:743 +#: apt.conf.5.xml:735 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:742 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:753 +#: apt.conf.5.xml:745 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:761 +#: apt.conf.5.xml:753 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:757 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:764 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:768 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:783 +#: apt.conf.5.xml:775 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:787 +#: apt.conf.5.xml:779 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:794 +#: apt.conf.5.xml:786 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:789 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7312,12 +7296,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:800 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:811 +#: apt.conf.5.xml:803 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7334,91 +7318,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:822 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:833 +#: apt.conf.5.xml:825 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:840 +#: apt.conf.5.xml:832 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:843 +#: apt.conf.5.xml:835 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:843 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:854 +#: apt.conf.5.xml:846 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:861 +#: apt.conf.5.xml:853 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:865 +#: apt.conf.5.xml:857 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:865 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:877 +#: apt.conf.5.xml:869 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:884 +#: apt.conf.5.xml:876 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:888 +#: apt.conf.5.xml:880 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:886 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:898 +#: apt.conf.5.xml:890 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:906 +#: apt.conf.5.xml:898 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:901 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7426,12 +7410,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:917 +#: apt.conf.5.xml:909 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:921 +#: apt.conf.5.xml:913 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7439,7 +7423,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:943 +#: apt.conf.5.xml:935 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7449,7 +7433,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:950 +#: apt.conf.5.xml:942 #, fuzzy #| msgid "&apt-conf;" msgid "&file-aptconf;" @@ -7458,7 +7442,7 @@ msgstr "&apt-conf;" # type: Content of: <refentry><refsect1><para> #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:947 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." -- cgit v1.2.3-70-g09d2